zyps 0.5.1 → 0.5.2

data/bin/zyps

@@ -46,6 +46,7 @@ class Application
 		
 		#Create a window, and set GTK up to quit when it is closed.
 		window = Gtk::Window.new
+		window.resizable = false
 		window.signal_connect("delete_event") {false}
 		window.signal_connect("destroy") {Gtk.main_quit}
 		
@@ -77,6 +78,9 @@ class Application
 		
 		#Keep all objects under a certain speed.
 		@environment.environmental_factors << SpeedLimit.new(100)
+		
+		#Set up a creature generator.
+		@generator = CreatureGenerator.new(@environment)
 
 		#Create thread to update environment.
 		thread = Thread.new do
@@ -126,65 +130,34 @@ class Application
 		#Add view to interface.
 		@view = TrailsView.new(width, height)
 		interface.pack_start(@view.canvas, expand, fill, padding)
-		#Get mouse events on view.
+		
+		#When mouse button pressed, record location for use in release event handler.
 		@view.canvas.add_events(Gdk::Event::BUTTON_PRESS_MASK)
 		@view.canvas.signal_connect("button-press-event") do |canvas, event|
 			@press_location = Location.new(event.x, event.y)
 		end
+		
+		#Create a creature on button release.
 		@view.canvas.add_events(Gdk::Event::BUTTON_RELEASE_MASK)
 		@view.canvas.signal_connect("button-release-event") do |canvas, event|
 			@release_location = Location.new(event.x, event.y)
-			creature = Creature.new(
-				'',
-				@release_location,
-				Color.new(@red_slider.value, @green_slider.value, @blue_slider.value),
-				Vector.new(
-					Utility.find_distance(@press_location, @release_location) * 2, #Use distance dragged as speed.
-					Utility.find_angle(@press_location, @release_location) #Move in direction of drag.
-				),
-				0,
-				1
+			@generator.create_creature(
+				:x => event.x,
+				:y => event.y,
+				:speed => Utility.find_distance(@press_location, @release_location) * 2, #Use distance dragged as speed.
+				:pitch => Utility.find_angle(@press_location, @release_location), #Move in direction of drag.
+				:accelerate => @accelerate_flag.active?,
+				:turn => @turn_flag.active?,
+				:approach => @approach_flag.active?,
+				:flee => @flee_flag.active?,
+				:push => @push_flag.active?,
+				:pull => @pull_flag.active?,
+				:eat => @eat_flag.active?
 			)
-			behavior = Behavior.new
-			behavior.conditions << ProximityCondition.new(200)
-			behavior.actions << AccelerateAction.new(1) if @accelerate_flag.active?
-			behavior.actions << TurnAction.new(90) if @turn_flag.active?
-			behavior.actions << ApproachAction.new(creature.vector, 720) if @approach_flag.active?
-			behavior.actions << FleeAction.new(creature.vector) if @flee_flag.active?
-			behavior.actions << PushAction.new(1000) if @push_flag.active?
-			behavior.actions << PullAction.new(1000) if @pull_flag.active?
-			behavior.actions << BlendAction.new(creature.color) if @paint_flag.active?
-			creature.behaviors << behavior
-			if @eat_flag.active?
-				behavior = Behavior.new
-				behavior.actions << EatAction.new(@environment)
-				behavior.conditions << ProximityCondition.new(10)
-				creature.behaviors << behavior
-			end
-			@environment.objects << creature
 		end
 		
 		#Create a VBox for all controls.
 		control_panel = Gtk::VBox.new(homogeneous, spacing)
-	
-		#Create a group for the new object's attributes.
-		attribute_controls = Gtk::VBox.new(homogeneous, spacing)
-		
-		#Add sliders for the color components.
-		attribute_controls.pack_start(Gtk::Label.new("Color"), expand, fill, padding)
-		attribute_controls.pack_start(Gtk::Label.new("R"), expand, fill, padding)
-		@red_slider = Gtk::HScale.new(0, 1, 0.1)
-		attribute_controls.pack_start(@red_slider, expand, fill, padding)
-		attribute_controls.pack_start(Gtk::Label.new("G"), expand, fill, padding)
-		@green_slider = Gtk::HScale.new(0, 1, 0.1)
-		attribute_controls.pack_start(@green_slider, expand, fill, padding)
-		attribute_controls.pack_start(Gtk::Label.new("B"), expand, fill, padding)
-		@blue_slider = Gtk::HScale.new(0, 1, 0.1)
-		attribute_controls.pack_start(@blue_slider, expand, fill, padding)
-		@red_slider.value, @green_slider.value, @blue_slider.value = 1, 1, 1
-				
-		#Add the attribute controls to the panel.
-		control_panel.pack_start(attribute_controls, expand, fill, padding)
 		
 		#Create a group for the actions.
 		action_controls = Gtk::VBox.new(homogeneous, spacing)
@@ -203,8 +176,6 @@ class Application
 		action_controls.pack_start(@pull_flag, expand, fill, padding)
 		@eat_flag = Gtk::CheckButton.new("Eat")
 		action_controls.pack_start(@eat_flag, expand, fill, padding)
-		@paint_flag = Gtk::CheckButton.new("Paint")
-		action_controls.pack_start(@paint_flag, expand, fill, padding)
 		#Add the action controls to the panel.
 		control_panel.pack_start(action_controls, expand, fill, padding)
 		
@@ -219,6 +190,121 @@ class Application
 end
 
 
+
+class CreatureGenerator
+	
+	#Environment creatures will be added to.
+	attr_accessor :environment
+	#Default required proximity for actions.
+	attr_accessor :action_proximity
+	#Speed of new AccelerateActions.
+	attr_accessor :acceleration_rate
+	#Rate of new TurnActions.
+	attr_accessor :turn_rate
+	#Turn rate of new ApproachActions.
+	attr_accessor :approach_turn_rate
+	#Turn rate of new FleeActions.
+	attr_accessor :flee_turn_rate
+	#Strength of new PullActions.
+	attr_accessor :pull_strength
+	#Strength of new PushActions.
+	attr_accessor :push_strength
+	
+	def initialize(environment)
+	
+		@environment = environment
+		
+		#Set up defaults for attributes.
+		@action_proximity = 200
+		@acceleration_rate = 1
+		@turn_rate = 90
+		@approach_turn_rate = 720
+		@flee_turn_rate = @approach_turn_rate
+		@pull_strength = 1000
+		@push_strength = @pull_strength
+		
+	end
+
+
+	#Create a creature and add it to the environment.
+	def create_creature(options = {})
+	
+		{
+			:x => 0,
+			:y => 0,
+			:speed => 1,
+			:pitch => 0,
+			:action_proximity => @action_proximity,
+			:accelerate => false,
+			:turn => false,
+			:approach => false,
+			:flee => false,
+			:push => false,
+			:pull => false,
+			:eat => false,
+		}.merge!(options)
+		
+		#Set up the creature's vector.
+		vector = Vector.new(options[:speed], options[:pitch])
+		
+		#Set up actions and merge colors according to selected behaviors.
+		behavior = Behavior.new
+		behavior.conditions << ProximityCondition.new(@action_proximity)
+		color = Color.new(0.25, 0.25, 0.25)
+		if options[:accelerate]
+			color.red += 0.25
+			color.green += 0.25
+			color.blue += 0.25
+			behavior.actions << AccelerateAction.new(@acceleration_rate)
+		end
+		if options[:turn]
+			color.blue += 1
+			behavior.actions << TurnAction.new(@turn_rate)
+		end
+		if options[:approach]
+			color.red += 1
+			behavior.actions << ApproachAction.new(vector, @approach_turn_rate)
+		end
+		if options[:flee]
+			color.red += 0.5; color.green += 0.5 #Yellow.
+			behavior.actions << FleeAction.new(vector, @flee_turn_rate)
+		end
+		if options[:push]
+			color.red += 0.5; color.blue += 0.5 #Purple.
+			behavior.actions << PushAction.new(@push_strength)
+		end
+		if options[:pull]
+			color.blue += 0.75; color.green += 0.75 #Aqua.
+			behavior.actions << PullAction.new(@pull_strength)
+		end
+		
+		#Create a creature.
+		creature = Creature.new(
+			'',
+			Location.new(options[:x], options[:y]),
+			color,
+			vector,
+			0,
+			5
+		)
+		creature.behaviors << behavior
+		
+		#Special handling for eat action, which needs a CollisionCondition.
+		if options[:eat]
+			creature.color.green += 1
+			behavior = Behavior.new
+			behavior.actions << EatAction.new(@environment)
+			behavior.conditions << CollisionCondition.new
+			creature.behaviors << behavior
+		end
+		
+		@environment.objects << creature
+		
+	end
+end
+
+
+
 begin
 	#The view width.
 	WIDTH = 500

data/lib/zyps/conditions.rb

@@ -26,7 +26,7 @@ class TagCondition < Condition
 		self.tag = tag
 	end
 	#True if the target has the assigned tag.
-	def test(actor, target)
+	def met?(actor, target)
 		target.tags.include?(@tag)
 	end
 end
@@ -40,7 +40,7 @@ class AgeCondition < Condition
 		self.age = age
 	end
 	#True if the target is older than the assigned age.
-	def test(actor, target)
+	def met?(actor, target)
 		target.age > @age
 	end
 end
@@ -54,7 +54,7 @@ class ProximityCondition < Condition
 		self.distance = distance
 	end
 	#True if the actor and target are equal to or closer than the given distance.
-	def test(actor, target)
+	def met?(actor, target)
 		Utility.find_distance(actor.location, target.location) <= @distance
 	end
 end
@@ -63,7 +63,7 @@ end
 #True only if collided with target.
 class CollisionCondition < Condition
 	#True if the objects have collided.
-	def test(actor, target)
+	def met?(actor, target)
 		Utility.collided?(actor, target)
 	end
 end

data/lib/zyps.rb

@@ -229,7 +229,7 @@ class Behavior
 		#Select a target that matches all conditions.
 		def select_target(actor, targets)
 			#If a target is already active, still present in the environment, and all conditions are true for it, simply re-select it.
-			if @active_target and targets.include?(@active_target) and conditions.all?{|condition| condition.test(actor, @active_target)}
+			if @active_target and targets.include?(@active_target) and conditions.all?{|condition| condition.met?(actor, @active_target)}
 				return @active_target 
 			end
 			#For each object in environment:
@@ -237,7 +237,7 @@ class Behavior
 				#Don't let actor target itself.
 				next if target == actor
 				#If all conditions match (or there are no conditions), select the object.
-				if conditions.all?{|condition| condition.test(actor, target)}
+				if conditions.all?{|condition| condition.met?(actor, target)}
 					@active_target = target
 					return target
 				end

data/test/test_zyps.rb

@@ -196,7 +196,7 @@ class TestEnvironment < Test::Unit::TestCase
 	
 	#A condition that is false unless actor and target have specific names.
 	class NameCondition < Condition
-		def test(actor, target)
+		def met?(actor, target)
 			return true if actor.name == '1' and target.name == '2'
 		end
 	end
@@ -478,13 +478,13 @@ class TestBehavior < Test::Unit::TestCase
 
 	#Always true.
 	class TrueCondition < Condition
-		def test(actor, target)
+		def met?(actor, target)
 			true
 		end
 	end
 	#Always false.
 	class FalseCondition < Condition
-		def test(actor, target)
+		def met?(actor, target)
 			false
 		end
 	end

data/test/zyps/test_actions.rb

@@ -21,6 +21,10 @@ require 'zyps/actions'
 require 'test/unit'
 
 
+#Allowed deviation for assert_in_delta.
+REQUIRED_ACCURACY = 0.001
+
+
 #Redefine Clock to return a predictable time.
 class Clock
 	def elapsed_time; 0.1; end
@@ -53,7 +57,7 @@ class TestActions < Test::Unit::TestCase
 	def test_face_action
 		add_action(FaceAction.new, @actor)
 		@environment.interact
-		assert_equal(45, @actor.vector.pitch)
+		assert_in_delta(45, @actor.vector.pitch, REQUIRED_ACCURACY)
 	end
 	
 	
@@ -63,7 +67,7 @@ class TestActions < Test::Unit::TestCase
 		add_action(AccelerateAction.new(1), @actor)
 		@environment.interact
 		#Clock always returns 0.1 seconds, so actor should be moving 0.1 unit/second faster.
-		assert_equal(0.1, @actor.vector.speed)
+		assert_in_delta(0.1, @actor.vector.speed, REQUIRED_ACCURACY)
 	end
 	
 	
@@ -73,7 +77,7 @@ class TestActions < Test::Unit::TestCase
 		add_action(TurnAction.new(1), @actor)
 		@environment.interact
 		#Clock always returns 0.1 seconds, so actor should be turned 0.1 degrees.
-		assert_equal(0.1, @actor.vector.pitch)
+		assert_in_delta(0.1, @actor.vector.pitch, REQUIRED_ACCURACY)
 	end
 	
 	
@@ -87,11 +91,11 @@ class TestActions < Test::Unit::TestCase
 		#Act.
 		@environment.interact
 		#Ensure action's thrust vector is correct for 0.1 seconds.
-		assert_equal(1.0, action.heading.speed)
-		assert_equal(4.0, action.heading.pitch)
+		assert_in_delta(1.0, action.heading.speed, REQUIRED_ACCURACY)
+		assert_in_delta(4.0, action.heading.pitch, REQUIRED_ACCURACY)
 		#Ensure actor's resulting vector is correct.
-		assert_in_delta(0.997, @actor.vector.x, 0.001)
-		assert_in_delta(0.069, @actor.vector.y, 0.001)
+		assert_in_delta(0.997, @actor.vector.x, REQUIRED_ACCURACY)
+		assert_in_delta(0.069, @actor.vector.y, REQUIRED_ACCURACY)
 
 	end
 	
@@ -107,11 +111,11 @@ class TestActions < Test::Unit::TestCase
 		@environment.interact
 
 		#Ensure actor is approaching target directly.
-		assert_equal(1.0, action.heading.speed)
-		assert_equal(45, action.heading.pitch)
+		assert_in_delta(1.0, action.heading.speed, REQUIRED_ACCURACY)
+		assert_in_delta(45, action.heading.pitch, REQUIRED_ACCURACY)
 		#Ensure actor's resulting vector is correct.
-		assert_in_delta(0.707, @actor.vector.x, 0.001)
-		assert_in_delta(0.707, @actor.vector.y, 0.001)
+		assert_in_delta(0.707, @actor.vector.x, REQUIRED_ACCURACY)
+		assert_in_delta(0.707, @actor.vector.y, REQUIRED_ACCURACY)
 		
 	end
 	
@@ -126,11 +130,11 @@ class TestActions < Test::Unit::TestCase
 		#Act.
 		@environment.interact
 		#Ensure action's thrust vector is correct for 0.1 seconds.
-		assert_equal(1.0, action.heading.speed)
-		assert_equal(356.0, action.heading.pitch) #Should be heading away.
+		assert_in_delta(1.0, action.heading.speed, REQUIRED_ACCURACY)
+		assert_in_delta(356.0, action.heading.pitch, REQUIRED_ACCURACY) #Should be heading away.
 		#Ensure actor's resulting vector is correct.
-		assert_in_delta(0.997, @actor.vector.x, 0.001)
-		assert_in_delta(-0.069, @actor.vector.y, 0.001)
+		assert_in_delta(0.997, @actor.vector.x, REQUIRED_ACCURACY)
+		assert_in_delta(-0.069, @actor.vector.y, REQUIRED_ACCURACY)
 	end
 	
 	#Ensure flee action doesn't oversteer.
@@ -144,11 +148,11 @@ class TestActions < Test::Unit::TestCase
 		#Act.
 		@environment.interact
 		#Ensure actor is fleeing directly away from target.
-		assert_equal(1.0, action.heading.speed)
-		assert_equal(225, action.heading.pitch)
+		assert_in_delta(1.0, action.heading.speed, REQUIRED_ACCURACY)
+		assert_in_delta(225, action.heading.pitch, REQUIRED_ACCURACY)
 		#Ensure actor's resulting vector is correct.
-		assert_in_delta(-0.707, @actor.vector.x, 0.001)
-		assert_in_delta(-0.707, @actor.vector.y, 0.001)
+		assert_in_delta(-0.707, @actor.vector.x, REQUIRED_ACCURACY)
+		assert_in_delta(-0.707, @actor.vector.y, REQUIRED_ACCURACY)
 		
 	end
 	
@@ -181,7 +185,7 @@ class TestActions < Test::Unit::TestCase
 		#Verify target is removed from environment.
 		assert(! @environment.objects.include?(@target1))
 		#Verify creature has grown by the appropriate amount.
-		assert_equal(2, @actor.size)
+		assert_in_delta(2, @actor.size, REQUIRED_ACCURACY)
 	end
 	
 	
@@ -204,9 +208,9 @@ class TestActions < Test::Unit::TestCase
 		#Act.
 		@environment.interact
 		#Verify the target's new color.
-		assert_equal(0.25, @target1.color.red)
-		assert_equal(0.25, @target1.color.green)
-		assert_equal(0.25, @target1.color.blue)
+		assert_in_delta(0.25, @target1.color.red, REQUIRED_ACCURACY)
+		assert_in_delta(0.25, @target1.color.green, REQUIRED_ACCURACY)
+		assert_in_delta(0.25, @target1.color.blue, REQUIRED_ACCURACY)
 	end
 		
 	#Test shifting colors toward white.
@@ -218,9 +222,9 @@ class TestActions < Test::Unit::TestCase
 		#Act.
 		@environment.interact
 		#Verify the target's new color.
-		assert_equal(0.75, @target1.color.red)
-		assert_equal(0.75, @target1.color.green)
-		assert_equal(0.75, @target1.color.blue)
+		assert_in_delta(0.75, @target1.color.red, REQUIRED_ACCURACY)
+		assert_in_delta(0.75, @target1.color.green, REQUIRED_ACCURACY)
+		assert_in_delta(0.75, @target1.color.blue, REQUIRED_ACCURACY)
 	end
 	
 	
@@ -230,8 +234,8 @@ class TestActions < Test::Unit::TestCase
 		add_action(PushAction.new(1), @actor)
 		@environment.interact
 		#Verify target's speed and direction are correct.
-		assert_equal(0.1, @target1.vector.speed, "@target1 should have been pushed away from @actor.")
-		assert_equal(45.0, @target1.vector.pitch, "@target1's angle should be facing away from @actor.")
+		assert_in_delta(0.1, @target1.vector.speed, REQUIRED_ACCURACY, "@target1 should have been pushed away from @actor.")
+		assert_in_delta(45.0, @target1.vector.pitch, REQUIRED_ACCURACY, "@target1's angle should be facing away from @actor.")
 	end
 
 	
@@ -241,8 +245,8 @@ class TestActions < Test::Unit::TestCase
 		add_action(PullAction.new(1), @actor)
 		@environment.interact
 		#Verify target's speed and direction are correct.
-		assert_equal(0.1, @target1.vector.speed, "@target1 should have been pulled toward @actor.")
-		assert_equal(225.0, @target1.vector.pitch, "@target1's angle should be facing toward @actor.")
+		assert_in_delta(0.1, @target1.vector.speed, REQUIRED_ACCURACY, "@target1 should have been pulled toward @actor.")
+		assert_in_delta(225.0, @target1.vector.pitch, REQUIRED_ACCURACY, "@target1's angle should be facing toward @actor.")
 	end
 	
 end

data/test/zyps/test_conditions.rb

@@ -39,10 +39,10 @@ class TestConditions < Test::Unit::TestCase
 	def test_tag_condition
 		condition = TagCondition.new("tag")
 		#Test for falsehood.
-		assert(! condition.test(@actor, @target))
+		assert(! condition.met?(@actor, @target))
 		#Test for truth.
 		@target.tags << "tag"
-		assert(condition.test(@actor, @target))
+		assert(condition.met?(@actor, @target))
 	end
 	
 	
@@ -50,22 +50,22 @@ class TestConditions < Test::Unit::TestCase
 		condition = AgeCondition.new(0.2)
 		#Test for falsehood.
 		@target.age = 0.1
-		assert(! condition.test(@actor, @target))
+		assert(! condition.met?(@actor, @target))
 		#Test for truth.
 		@target.age = 0.2
-		assert(condition.test(@actor, @target))
+		assert(condition.met?(@actor, @target))
 		@target.age = 0.3
-		assert(condition.test(@actor, @target))
+		assert(condition.met?(@actor, @target))
 	end
 	
 	
 	def test_proximity_condition
 		condition = ProximityCondition.new(1)
 		#Test for falsehood.
-		assert(! condition.test(@actor, @target))
+		assert(! condition.met?(@actor, @target))
 		#Test for truth.
 		@target.location = Location.new(0.5, 0.5)
-		assert(condition.test(@actor, @target))
+		assert(condition.met?(@actor, @target))
 	end
 	
 	
@@ -73,10 +73,10 @@ class TestConditions < Test::Unit::TestCase
 		condition = CollisionCondition.new
 		#Test for falsehood.
 		@actor.size, @target.size = 0.196, 0.196 #Radius = 0.25
-		assert(! condition.test(@actor, @target))
+		assert(! condition.met?(@actor, @target))
 		#Test for truth.
 		@actor.size, @target.size = 1.766, 1.766 #Radius = 0.75
-		assert(condition.test(@actor, @target))
+		assert(condition.met?(@actor, @target))
 	end
 	
 	

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: zyps
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
-date: 2007-09-23 00:00:00 -07:00
+  version: 0.5.2
+date: 2007-09-24 00:00:00 -07:00
 summary: A game library for Ruby
 require_paths: 
 - lib