zyps 0.3.1 → 0.4.1

data/lib/zyps/conditions.rb

@@ -0,0 +1,69 @@
+# Copyright 2007 Jay McGavren, jay@mcgavren.com.
+# 
+# This file is part of Zyps.
+# 
+# Zyps is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'zyps'
+
+
+#Act only on objects with the correct tag.
+class TagCondition < Condition
+	#The tag to look for on the target.
+	attr_accessor :tag
+	def initialize(tag)
+		self.tag = tag
+	end
+	#True if the target has the assigned tag.
+	def test(actor, target)
+		target.tags.include?(@tag)
+	end
+end
+
+
+#Act only on objects older than the given age.
+class AgeCondition < Condition
+	#The minimum age in seconds.
+	attr_accessor :age
+	def initialize(age)
+		self.age = age
+	end
+	#True if the target is older than the assigned age.
+	def test(actor, target)
+		target.age > @age
+	end
+end
+
+
+#Act only on objects closer than the given distance.
+class ProximityCondition < Condition
+	#The maximum number of units away the target can be.
+	attr_accessor :distance
+	def initialize(distance)
+		self.distance = distance
+	end
+	#True if the actor and target are equal to or closer than the given distance.
+	def test(actor, target)
+		Utility.find_distance(actor.location, target.location) <= @distance
+	end
+end
+
+
+#True only if collided with target.
+class CollisionCondition < Condition
+	#True if the objects have collided.
+	def test(actor, target)
+		Utility.collided?(actor, target)
+	end
+end

data/lib/zyps/environmental_factors.rb

@@ -0,0 +1,55 @@
+# Copyright 2007 Jay McGavren, jay@mcgavren.com.
+# 
+# This file is part of Zyps.
+# 
+# Zyps is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'zyps'
+
+
+#Keeps all objects within a set of walls.
+class Enclosure < 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
+	def initialize(left = 0, top = 0, right = 0, bottom = 0)
+		self.left, self.top, self.right, self.bottom = left, top, right, bottom
+	end
+	#If object is beyond a boundary, set its position equal to the boundary and reflect it.
+	def act(object)
+		if (object.location.x < @left) then
+			object.location.x = @left
+			object.vector.pitch = Utility.find_reflection_angle(90, object.vector.pitch)
+		elsif (object.location.x > @right) then
+			object.location.x = @right
+			object.vector.pitch = Utility.find_reflection_angle(270, object.vector.pitch)
+		end
+		if (object.location.y > @top) then
+			object.location.y = @top
+			object.vector.pitch = Utility.find_reflection_angle(0, object.vector.pitch)
+		elsif (object.location.y < @bottom) then
+			object.location.y = @bottom
+			object.vector.pitch = Utility.find_reflection_angle(180, object.vector.pitch)
+		end
+	end
+end
+
+
+

data/lib/zyps/views/trails.rb

@@ -28,12 +28,10 @@ class TrailsView
 	attr_reader :width, :height
 	#Number of line segments to draw for each object.
 	attr_accessor :trail_length
-	#Width of the trail behind each object.
-	attr_accessor :trail_width
 
-	def initialize (width = 600, height = 400, trail_length = 5, trail_width = trail_length)
+	def initialize (width = 600, height = 400, trail_length = 5)
 	
-		@width, @height, @trail_length, @trail_width = width, height, trail_length, trail_width
+		@width, @height, @trail_length, = width, height, trail_length
 	
 		#Create a drawing area.
 		@canvas = Gtk::DrawingArea.new
@@ -69,7 +67,7 @@ class TrailsView
 	#Takes an Environment, and draws it to the canvas.
 	#Tracks the position of each GameObject over time so it can draw a trail behind it.
 	#The head will match the object's Color exactly, fading to black at the tail.
-	#trail_width will be used as the line thickness at the object's head, diminishing to 1 at the tail.
+	#GameObject.size will be used as the line thickness at the object's head, diminishing to 1 at the tail.
 	def update(environment)
 	
 		#Clear the background on the buffer.
@@ -85,6 +83,8 @@ class TrailsView
 		#For each GameObject in the environment:
 		environment.objects.each do |object|
 
+			object_radius = Math.sqrt(object.size / Math::PI)
+
 			#Add the object's current location to the list.
 			@locations[object.identifier] << [object.location.x, object.location.y]
 			#If the list is larger than the number of tail segments, delete the first position.
@@ -108,7 +108,7 @@ class TrailsView
 				
 				#Multiply the actual drawing width by the current multiplier to get the current drawing width.
 				graphics_context.set_line_attributes(
-					(@trail_width * multiplier).ceil,
+					(object_radius * 2 * multiplier).ceil,
 					Gdk::GC::LINE_SOLID,
 					Gdk::GC::CAP_ROUND, #Line ends drawn as semicircles.
 					Gdk::GC::JOIN_MITER #Only used for polygons.

data/test/test_zyps.rb

@@ -20,9 +20,33 @@ require 'zyps'
 require 'test/unit'
 
 
+#Redefine Clock to return a predictable time.
+class Clock
+	def elapsed_time; 0.1; end
+end
+
+
 class TestGameObject < Test::Unit::TestCase
 
 
+	def test_constraints
+		#Test at initialization.
+		object = GameObject.new(
+			"", #Name.
+			Location.new,
+			Color.new,
+			Vector.new,
+			0,
+			-1 #Size.
+		)
+		assert_equal(0, object.size)
+		#Test accessors.
+		object = GameObject.new
+		object.size = -1
+		assert_equal(0, object.size)
+	end
+
+
 	def test_move
 		#Set up moving object.
 		object = GameObject.new
@@ -53,7 +77,7 @@ class TestCreature < Test::Unit::TestCase
 		assert_equal(0, creature.vector.speed)
 		assert_equal(0, creature.vector.pitch)
 		assert_equal(nil, creature.name)
-		assert_in_delta(0, creature.age, 0.1)
+		assert_equal(1, creature.size)
 		assert_equal([], creature.tags)
 		assert_equal([], creature.behaviors)
 		#Identifiers should be unique.
@@ -69,6 +93,7 @@ class TestCreature < Test::Unit::TestCase
 			Color.new(0.5, 0.6, 0.7),
 			Vector.new(1.5, 225),
 			2.001, #Age.
+			5.0, #Size.
 			["predator", "blue team"],
 			[behavior]
 		)
@@ -80,7 +105,7 @@ class TestCreature < Test::Unit::TestCase
 		assert_equal(0.7, creature.color.blue)
 		assert_equal(1.5, creature.vector.speed)
 		assert_equal(225, creature.vector.pitch)
-		assert_in_delta(2.001, creature.age, 0.01)
+		assert_equal(5.0, creature.size)
 		assert(creature.tags.include?("predator"))
 		assert(creature.tags.include?("blue team"))
 		assert(creature.behaviors.include?(behavior))
@@ -93,77 +118,103 @@ end
 
 class TestEnvironment < Test::Unit::TestCase
 
+	
 	def setup
 	
-		#Interactions will be logged here.
-		@interactions = []
-		
-		#Create creatures.
-		creature1 = Creature.new('1')
-		creature2 = Creature.new('2')
-		creature_behavior = Behavior.new
-		creature_behavior.actions << lambda {|creature, target| @interactions << "#{creature.name} targeting #{target.name}"}
-		creature1.behaviors << creature_behavior
-		creature2.behaviors << creature_behavior
-		
-		#Create an environment and add the creatures.
-		@environment = Environment.new([creature1, creature2])
+		#Create an environment and add creatures.
+		@environment = Environment.new
+		@environment.objects << Creature.new('1')
+		@environment.objects << Creature.new('2')
 		
 	end
 	
 	
+	#An action that keeps a log of the actor and target.
+	class LogAction < Action
+		attr_reader :interactions
+		def initialize
+			#Interactions will be logged here.
+			@interactions = []
+		end
+		def do(actor, target)
+			#Log the interaction.
+			@interactions << "#{actor.name} targeting #{target.name}"
+		end
+	end
+	
 	def test_interactions
 	
+		#Set up behavior that will log interactions.
+		behavior = Behavior.new
+		log = LogAction.new
+		behavior.actions << log
+		@environment.objects.each {|creature| creature.behaviors << behavior}
+		
 		#Have environment elements interact.
 		@environment.interact
 
 		#Look for expected interactions (each should only occur once).
-		assert(@interactions.find_all{|i| i == "2 targeting 1"}.length == 1)
-		assert(@interactions.find_all{|i| i == "1 targeting 2"}.length == 1)
-		assert(@interactions.find_all{|i| i == "1 targeting 1"}.length == 0)
-		assert(@interactions.find_all{|i| i == "2 targeting 2"}.length == 0)
+		assert(log.interactions.find_all{|i| i == "2 targeting 1"}.length == 1)
+		assert(log.interactions.find_all{|i| i == "1 targeting 2"}.length == 1)
+		assert(log.interactions.find_all{|i| i == "1 targeting 1"}.length == 0)
+		assert(log.interactions.find_all{|i| i == "2 targeting 2"}.length == 0)
 		
 	end
 	
 	
+	#An environmental factor that logs its target.
+	class LogFactor < EnvironmentalFactor
+		attr_reader :interactions
+		def initialize
+			#Interactions will be logged here.
+			@interactions = []
+		end
+		def act(target)
+			#Log the interaction.
+			@interactions << "Environment targeting #{target.name}"
+		end
+	end
+	
 	def test_environmental_factors
 	
 		#Create an environmental factor.
-		behavior = Behavior.new
-		behavior.actions << lambda {|factor, target| @interactions << "Environment targeting #{target.name}"}
-		@environment.environmental_factors << EnvironmentalFactor.new([behavior])
+		logger = LogFactor.new
+		@environment.environmental_factors << logger
 		
 		#Have environment elements interact.
 		@environment.interact
 
 		#Look for expected interactions (each should only occur once).
-		assert(@interactions.find_all{|i| i == "Environment targeting 1"}.length == 1)
-		assert(@interactions.find_all{|i| i == "Environment targeting 2"}.length == 1)
+		assert(logger.interactions.find_all{|i| i == "Environment targeting 1"}.length == 1)
+		assert(logger.interactions.find_all{|i| i == "Environment targeting 2"}.length == 1)
 		
 	end
 	
 	
+	#A condition that is false unless actor and target have specific names.
+	class NameCondition < Condition
+		def test(actor, target)
+			return true if actor.name == '1' and target.name == '2'
+		end
+	end
+	
 	def test_conditions
 	
-		#Change behaviors to only occur if the target's name is '2'.
-		@environment.objects.each do |creature|
-			behavior = Behavior.new
-			behavior.conditions << lambda do |creature, target|
-				return true if creature.name == '1' and target.name == '2'
-			end
-			behavior.actions << lambda do |creature, target|
-				@interactions << "#{creature.name} is targeting #{target.name}"
-			end
-			creature.behaviors << behavior
-		end
-		
+		#Set up behavior that will log interactions.
+		behavior = Behavior.new
+		log = LogAction.new
+		behavior.actions << log
+		name_checker = NameCondition.new
+		behavior.conditions << name_checker
+		@environment.objects.each {|creature| creature.behaviors << behavior}
+				
 		#Have environment elements interact.
 		@environment.interact
 
-		#Creature '1' should not have been acted on.
-		assert(@interactions.find_all{|i| i == "2 is targeting 1"}.length == 0)
-		#Creature '2' *should* have been acted on.
-		assert(@interactions.find_all{|i| i == "1 is targeting 2"}.length == 1)
+		#Creature '1' should NOT have been acted on.
+		assert(log.interactions.find_all{|i| i == "2 targeting 1"}.length == 0)
+		#Creature '2' SHOULD have been acted on.
+		assert(log.interactions.find_all{|i| i == "1 targeting 2"}.length == 1)
 		
 	end
 	
@@ -172,6 +223,53 @@ end
 
 
 
+class TestColor < Test::Unit::TestCase
+	
+	def test_default_initialization
+		color = Color.new
+		assert_equal(1, color.red)
+		assert_equal(1, color.green)
+		assert_equal(1, color.blue)
+	end
+	
+	def test_explicit_initialization
+		color = Color.new(0.25, 0.5, 0.75)
+		assert_equal(0.25, color.red)
+		assert_equal(0.5, color.green)
+		assert_equal(0.75, color.blue)
+	end
+	
+	def test_constraints
+		#Test at initialization.
+		color = Color.new(-1, -1, -1)
+		assert_equal(0, color.red)
+		assert_equal(0, color.green)
+		assert_equal(0, color.blue)
+		color = Color.new(2, 2, 2)
+		assert_equal(1, color.red)
+		assert_equal(1, color.green)
+		assert_equal(1, color.blue)
+		#Test accessors.
+		color = Color.new
+		color.red = -1
+		assert_equal(0, color.red)
+		color.red = 2
+		assert_equal(1, color.red)
+		color.green = -1
+		assert_equal(0, color.green)
+		color.green = 2
+		assert_equal(1, color.green)
+		color.blue = -1
+		assert_equal(0, color.blue)
+		color.blue = 2
+		assert_equal(1, color.blue)
+	end
+	
+	
+end
+
+
+
 class TestVector < Test::Unit::TestCase
 
 
@@ -270,23 +368,6 @@ end
 
 
 
-class TestClock < Test::Unit::TestCase
-
-
-	def test_elapsed_time
-	
-		#Create a clock, wait a moment, then see how much time has elapsed since its creation.
-		clock = Clock.new
-		sleep 0.1
-		assert_in_delta(0.1, clock.elapsed_time, 0.02)
-		
-	end
-	
-	
-end
-
-
-
 class TestUtility < Test::Unit::TestCase
 	
 	
@@ -342,18 +423,27 @@ class TestUtility < Test::Unit::TestCase
 	end
 
 	
-	def test_inside_box?
-		#Too far left.
-		assert(! Utility.inside_box?(Location.new(1, 3), Location.new(2, 2), Location.new(4, 4)))
-		#Too far right.
-		assert(! Utility.inside_box?(Location.new(5, 3), Location.new(2, 2), Location.new(4, 4)))
-		#Too far up.
-		assert(! Utility.inside_box?(Location.new(3, 1), Location.new(2, 2), Location.new(4, 4)))
-		#Too far down.
-		assert(! Utility.inside_box?(Location.new(3, 5), Location.new(2, 2), Location.new(4, 4)))
-		#Inside.
-		assert(Utility.inside_box?(Location.new(3, 3), Location.new(2, 2), Location.new(4, 4)))
+	def test_collided?
+		#Objects apart.
+		assert(! Utility.collided?(
+			GameObject.new("", Location.new(0, 0), Color.new, Vector.new, 0, 0.196), #Radius = 0.25
+			GameObject.new("", Location.new(1, 0), Color.new, Vector.new, 0, 0.196)
+		))
+		#Objects touching (not a collision).
+		assert(! Utility.collided?(
+			GameObject.new("", Location.new(0, 0), Color.new, Vector.new, 0, 0.785), #Radius = 0.5
+			GameObject.new("", Location.new(1, 0), Color.new, Vector.new, 0, 0.785)
+		))
+		#Objects collided.
+		assert(Utility.collided?(
+			GameObject.new("", Location.new(0, 0), Color.new, Vector.new, 0, 1.766), #Radius = 0.75
+			GameObject.new("", Location.new(1, 0), Color.new, Vector.new, 0, 1.766)
+		))
+		#Objects in same place.
+		assert(Utility.collided?(
+			GameObject.new("", Location.new(0, 0)),
+			GameObject.new("", Location.new(0, 0))
+		))
 	end
-
 	
 end