zyps 0.7.4 → 0.7.5

data/bin/zyps

@@ -164,6 +164,14 @@ class Application < Wx::App
 		evt_timer(timer_id) {on_timer}
 		timer.start(milliseconds_per_frame)
 		
+		
+		if @options[:uri]
+			@log.debug "Start a network service at #{@options[:uri]}."
+			server = EnvironmentServer.new(@environment, @options[:uri])
+			server.start
+			$SAFE = 1
+		end
+		
 		@log.debug "Display GUI."
 		frame.send_size_event
 		frame.show
@@ -181,7 +189,12 @@ class Application < Wx::App
 			@enclosure.right = @drawing_area.size.width
 		end
 		#Update environment.
-		@environment.interact
+		begin
+			@environment.interact
+		rescue Exception => exception
+			puts exception, exception.backtrace
+			raise
+		end
 		#If there are no Creatures, show instructions on creating them.
 		if @environment.objects.empty?
 			@view.canvas.buffer.draw do |dc|
@@ -711,9 +724,7 @@ class CreatureGenerator
 		if options[:turn]
 			color.blue += 1
 			creature.behaviors << Behavior.new(
-				:actions => [TurnAction.new(@turn_rate, @turn_angle)],
-				:conditions => [ProximityCondition.new(options[:action_proximity] * 2)],
-				:condition_frequency => 20
+				:actions => [TurnAction.new(@turn_rate, @turn_angle)]
 			)
 		end
 		if options[:approach]

data/lib/zyps/actions.rb

@@ -66,6 +66,7 @@ end
 class FaceAction < Action
 	#Set the actor's heading to point directly at first target.
 	def do(actor, targets)
+		return if targets.empty?
 		actor.vector.pitch = Utility.find_angle(actor.location, targets[0].location)
 	end
 end
@@ -104,6 +105,7 @@ end
 class ApproachAction < TimedAction
 	#Accelerate toward the first target, but limited by rate.
 	def do(actor, targets)
+		return if targets.empty?
 		#Apply thrust to the creature's movement vector, adjusted by elapsed time.
 		actor.vector += Vector.new(
 			delta,
@@ -117,6 +119,7 @@ end
 class FleeAction < TimedAction
 	#Accelerate away from the first target, but limited by turn rate.
 	def do(actor, targets)
+		return if targets.empty?
 		#Apply thrust to the creature's movement vector, adjusted by elapsed time.
 		actor.vector += Vector.new(
 			delta,

data/lib/zyps/environmental_factors.rb

@@ -71,6 +71,52 @@ class Enclosure < EnvironmentalFactor
 end
 
 
+#When an object crosses its boundary, warps object to opposite boundary.
+class WrapAround < EnvironmentalFactor
+	
+	#X coordinate of left boundary.
+	attr_accessor :left
+	#Y coordinate of top boundary.
+	attr_accessor :top
+	#X coordinate of right boundary.
+	attr_accessor :right
+	#Y coordinate of bottom boundary.
+	attr_accessor :bottom
+	
+	#Takes a hash with these keys and defaults:
+	#	:left => 0
+	#	:top => 0
+	#	:right => 0
+	#	:bottom => 0
+	def initialize(options = {})
+		options = {
+			:left => 0,
+			:top => 0,
+			:right => 0,
+			:bottom => 0
+		}.merge(options)
+		self.left, self.top, self.right, self.bottom = options[:left], options[:top], options[:right], options[:bottom]
+	end
+	
+	#If object is beyond a boundary, set its position to that of opposite boundary.
+	def act(environment)
+		environment.objects.each do |object|
+			if (object.location.x < @left) then
+				object.location.x = @right
+			elsif (object.location.x > @right) then
+				object.location.x = @left
+			end
+			if (object.location.y > @top) then
+				object.location.y = @bottom
+			elsif (object.location.y < @bottom) then
+				object.location.y = @top
+			end
+		end
+	end
+	
+end
+
+
 #Keeps all objects at/under the assigned speed.
 class SpeedLimit < EnvironmentalFactor
 	

data/lib/zyps.rb

@@ -358,6 +358,7 @@ class Behavior
 	#Calls select(actor, targets) on each Condition, each time discarding targets that fail.
 	#Then on each Action, calls Action#start(actor, targets) (if not already started) followed by Action#do(actor, targets).
 	#If no matching targets are found, calls Action#stop(actor, targets) on each Action.
+	#If there are no conditions, actions will occur regardless of targets.
 	def perform(actor, targets)
 		
 		if condition_evaluation_turn?
@@ -365,11 +366,11 @@ class Behavior
 			conditions.each {|condition| @current_targets = condition.select(actor, @current_targets)}
 		end
 		actions.each do |action|
-			if ! @current_targets.empty?
+			if @current_targets.empty? and ! @conditions.empty?
+				action.stop(actor, targets) #Not @current_targets; that array is empty.
+			else
 				action.start(actor, @current_targets) unless action.started?
 				action.do(actor, @current_targets)
-			else
-				action.stop(actor, targets) #Not @current_targets; that array is empty.
 			end
 		end
 		

data/test/test_zyps.rb

@@ -574,5 +574,26 @@ class TestBehavior < Test::Unit::TestCase
 		assert_not_same(original.conditions[0], copy.conditions[0], "Conditions in list should not be same objects.")
 	end
 	
+	def test_no_conditions
+		#Set up a behavior with no conditions.
+		action = MockAction.new
+		behavior = Behavior.new(:conditions => [], :actions => [action])
+		#Perform the behavior with no targets.
+		behavior.perform(@actor, [])
+		assert_equal(1, action.start_count, "start() should have been called on the mock action.")
+		assert_equal(1, action.do_count, "do() should have been called.")
+		assert_equal(0, action.stop_count, "stop() should NOT have been called.")
+		#Add a true condition.
+		behavior.conditions << TrueCondition.new
+		#Perform the behavior with no targets.
+		behavior.perform(@actor, [])
+		assert_equal(1, action.stop_count, "stop() should have been called.")
+		#Perform the behavior WITH targets.
+		behavior.perform(@actor, @targets)
+		assert_equal(2, action.start_count, "start() should have been called.")
+		assert_equal(2, action.do_count, "do() should have been called.")
+		assert_equal(1, action.stop_count, "stop() should NOT have been called.")
+	end
+	
 	
 end

data/test/zyps/test_environmental_factors.rb

@@ -89,6 +89,55 @@ end
 
 
 
+class TestWrapAround < Test::Unit::TestCase
+
+	def test_wrap_around
+	
+		creature = Creature.new
+		environment = Environment.new(:objects => [creature])
+		
+		#Create a WrapAround.
+		wrapper = WrapAround.new(
+			:left => 1,
+			:top => 3,
+			:right => 3,
+			:bottom => 1
+		)
+		
+		#Place creature outside the walls, and act on it.
+		#Ensure it's moved inside on opposite side.
+		creature.location = Location.new(0, 2) #Too far left.
+		wrapper.act(environment)
+		assert_equal(3, creature.location.x)
+		assert_equal(2, creature.location.y)
+		
+		creature.location = Location.new(4, 2) #Too far right.
+		wrapper.act(environment)
+		assert_equal(1, creature.location.x)
+		assert_equal(2, creature.location.y)
+		
+		creature.location = Location.new(2, 0) #Too far down.
+		wrapper.act(environment)
+		assert_equal(2, creature.location.x)
+		assert_equal(3, creature.location.y)
+		
+		creature.location = Location.new(2, 4) #Too far up.
+		wrapper.act(environment)
+		assert_equal(2, creature.location.x)
+		assert_equal(1, creature.location.y)
+		
+		#Place creature inside the walls, and ensure it's unaffected.
+		creature.location = Location.new(2, 2) #Inside.
+		wrapper.act(environment)
+		assert_equal(2, creature.location.x)
+		assert_equal(2, creature.location.y)
+		
+	end
+	
+end
+
+
+
 class TestSpeedLimit < Test::Unit::TestCase
 
 	def test_speed_limit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zyps
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Jay McGavren
@@ -9,7 +9,7 @@ autorequire: zyps
 bindir: bin
 cert_chain: []
 
-date: 2008-02-05 00:00:00 -07:00
+date: 2008-02-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,24 +36,24 @@ files:
 - COPYING.txt
 - README_windows.txt
 - README.txt
-- bin/zyps
 - bin/zyps_demo
+- bin/zyps
 - lib/zyps
 - lib/zyps/views
 - lib/zyps/views/canvas
 - lib/zyps/views/canvas/wx.rb
 - lib/zyps/views/trails.rb
-- lib/zyps/actions.rb
-- lib/zyps/environmental_factors.rb
 - lib/zyps/conditions.rb
 - lib/zyps/remote.rb
+- lib/zyps/actions.rb
+- lib/zyps/environmental_factors.rb
 - lib/zyps.rb
 - test/zyps
 - test/zyps/test_behaviors.rb
 - test/zyps/test_actions.rb
-- test/zyps/test_environmental_factors.rb
 - test/zyps/test_conditions.rb
 - test/zyps/test_remote.rb
+- test/zyps/test_environmental_factors.rb
 - test/test_zyps.rb
 has_rdoc: true
 homepage: http://jay.mcgavren.com/zyps/
@@ -85,4 +85,9 @@ signing_key:
 specification_version: 2
 summary: A game library for Ruby
 test_files: 
+- test/zyps/test_behaviors.rb
+- test/zyps/test_actions.rb
+- test/zyps/test_conditions.rb
+- test/zyps/test_remote.rb
+- test/zyps/test_environmental_factors.rb
 - test/test_zyps.rb