zyps 0.3.1 → 0.4.1

data/bin/zyps

@@ -20,279 +20,20 @@
 
 begin
 	require 'zyps'
+	require 'zyps/actions'
+	require 'zyps/conditions'
+	require 'zyps/environmental_factors'
 	require 'zyps/views/trails'
 rescue LoadError
 	require 'rubygems'
 	require 'zyps'
+	require 'zyps/actions'
+	require 'zyps/conditions'
+	require 'zyps/environmental_factors'
 	require 'zyps/views/trails'
 end
 
 
-#Generates new creatures and places them in an environment.
-class Generator
-
-	#Environment creatures will be spawned into.
-	attr_accessor :environment
-	#Boundary that all new objects must be inside.
-	attr_accessor :min_x, :min_y, :max_x, :max_y
-	#Array of tags to choose from when generating new one.
-	attr_accessor :tag_pool
-	#Array of colors to choose from when generating new one.
-	attr_accessor :color_pool
-	#The maximum speed a new creature should be going.
-	attr_accessor :max_speed
-	#The maximum number of behaviors a creature can have.
-	attr_accessor :max_behaviors
-	#The maximum number of conditions a Behavior can have.
-	attr_accessor :max_conditions
-	#The maximum number of actions a Behavior can have.
-	attr_accessor :max_actions
-	
-	def initialize(environment, min_x, min_y, max_x, max_y)
-		@environment, @min_x, @min_y, @max_x, @max_y = environment, min_x, min_y, max_x, max_y
-		@tag_pool = %q{foo bar baz}
-		@color_pool = []
-		@max_behaviors = 2
-		@max_conditions = 2
-		@max_actions = 2
-		@max_speed = 100
-	end
-	
-	#Create a creature.
-	def create_creature()
-	
-		creature = Creature.new()
-		#Create a Color.
-		creature.color = create_color
-		#Create a Location.
-		creature.location = create_location
-		#Create a Vector.
-		creature.vector = create_vector()
-		#Create a random tag.
-		creature.tags << create_tag()
-		#Create a random number of behaviors.
-		generate_number(0, @max_behaviors).to_i.times {creature.behaviors << create_behavior()}
-		
-		creature
-		
-	end
-	
-	#Create a random tag.
-	#Chooses from tag_pool.
-	def create_tag()
-		@tag_pool[generate_number(0, @tag_pool.length).to_i]
-	end
-	#Create a random Color.
-	#Chooses from color_pool, or creates a random one from scratch if color_pool is empty.
-	def create_color()
-		if (color_pool.length != 0) then
-			return @color_pool[generate_number(0, @color_pool.length).to_i]
-		else
-			return Color.new(generate_random_number(0, 1), generate_random_number(0, 1), generate_random_number(0, 1))
-		end
-	end
-	#Create a random Location.
-	def create_location()
-		Location.new(
-			generate_random_number(0, @max_x - @min_x) + @min_x,
-			generate_random_number(0, @max_y - @min_y) + @min_y
-		)
-	end
-	#Create a random Vector.
-	def create_vector()
-		Vector.new(generate_number(0, @max_speed), generate_number(0, 360))
-	end
-	#Create a random Behavior.
-	def create_behavior()
-		behavior = Behavior.new
-		action_count = generate_number(0, @max_actions).to_i
-		action_count.times do
-			behavior.actions << create_action()
-		end
-		#Only add conditions if there's an action.
-		if action_count > 0 then
-			#There should always be a proximity condition.
-			behavior.conditions << create_proximity_condition()
-			#Add some additional conditions.
-			generate_random_number(0, @max_conditions).to_i.times do
-				behavior.conditions << create_condition()
-			end
-		end
-		behavior
-	end
-	#Create a random condition.
-	def create_condition()
-		case generate_number(0, 2).to_i
-		when 0
-			return create_tag_condition()
-		when 1
-			return create_age_condition()
-		else
-			raise "Invalid condition"
-		end
-	end
-	#Create a condition that looks for a random tag.
-	def create_tag_condition()
-		tag = create_tag()
-		lambda {|creature, target| target.tags.include?(tag)}
-	end
-	#Create a condition that looks for a random age.
-	def create_age_condition()
-		age = generate_number(0, 60)
-		lambda {|creature, target| target.age > age}
-	end
-	#Create a condition that looks for a random proximity.
-	def create_proximity_condition()
-		proximity = generate_number(0, 100)
-		lambda do |creature, target|
-			Utility.find_distance(creature.location, target.location) < proximity
-		end
-	end
-	#Create a random action.
-	def create_action()
-		case generate_random_number(0, 9).to_i
-		when 0
-			return create_accelerate_action()
-		when 1
-			return create_approach_action()
-		when 2
-			return create_flee_action()
-		when 3
-			return create_blend_action()
-		when 4
-			return create_mate_action()
-		when 5
-			return create_spawn_action()
-		when 6
-			return create_turn_action()
-		when 7
-			return create_eat_action()
-		when 8
-			return create_tag_action()
-		else
-			raise "Invalid action"
-		end
-	end
-	#Create an action that accelerates at a random rate.
-	def create_accelerate_action()
-		clock = Clock.new()
-		rate = generate_number(0, 10)
-		lambda {|creature, target| creature.vector.speed += rate * clock.elapsed_time}
-	end
-	#Create an action that turns in a circle.
-	def create_turn_action()
-		clock = Clock.new()
-		rate = generate_number(0, 360)
-		lambda {|creature, target| creature.vector.pitch += rate * clock.elapsed_time}
-	end
-	#Create an action that approaches the target.
-	def create_approach_action()
-		heading = Vector.new
-		rate = generate_number(0, 20)
-		lambda do |creature, target|
-			#Find the difference between the current heading and the angle to the target.
-			turn_angle = Utility.find_angle(creature.location, target.location) - heading.pitch
-			#If the angle is the long way around from the current heading, change it to the smaller angle.
-			if turn_angle > 180 then
-				turn_angle -= 360.0
-			elsif turn_angle < -180 then
-				turn_angle += 360.0
-			end
-			#If turn angle is greater than allowed turn speed, reduce it.
-			turn_angle = Utility.constrain_value(turn_angle, rate)
-			#Turn the appropriate amount.
-			heading.pitch += turn_angle
-			#Apply the heading to the creature's movement vector.
-			creature.vector += heading
-		end
-	end
-	#Create an action that flees from the target.
-	def create_flee_action()
-		heading = Vector.new
-		rate = generate_number(0, 20)
-		lambda do |creature, target|
-			#Find the difference between the current heading and the angle AWAY from the target.
-			turn_angle = Utility.find_angle(creature.location, target.location) - heading.pitch + 180
-			#If the angle is the long way around from the current heading, change it to the smaller angle.
-			if turn_angle > 180 then
-				turn_angle -= 360.0
-			elsif turn_angle < -180 then
-				turn_angle += 360.0
-			end
-			#If turn angle is greater than allowed turn speed, reduce it.
-			turn_angle = Utility.constrain_value(turn_angle, rate)
-			#Turn the appropriate amount.
-			heading.pitch += turn_angle
-			#Apply the heading to the creature's movement vector.
-			creature.vector += heading
-		end
-	end
-	#Create an action that shifts the subject's color to match the target.
-	def create_blend_action()
-		lambda {|creature, target| creature.color += target.color}
-	end
-	#Create an action that mates with the target.
-	def create_mate_action()
-		#TODO
-		lambda {|creature, target| }
-	end
-	#Create an action that spawns a new creature.
-	def create_spawn_action()
-		#TODO
-		lambda {|creature, target| }
-	end
-	#Create an action that eats the target.
-	def create_eat_action()
-		lambda {|creature, target| @environment.objects.delete(target)}
-	end
-	#Create an action that applies a tag to the target.
-	def create_tag_action()
-		tag = create_tag()
-		lambda {|creature, target| target.tags << tag unless target.tags.include?(tag)}
-	end
-	#Generate a number between the given minimum and maximum, based on the current system time.
-	def generate_number(minimum, maximum)
-		(Time.new.to_f % (maximum - minimum)) + minimum
-	end
-	#Generate a random number between the given minimum and maximum.
-	def generate_random_number(minimum, maximum)
-		value = rand * (maximum - minimum) + minimum
-	end
-end
-
-
-
-#Keeps all objects within a set of walls.
-class EncloseBehavior < Behavior
-
-	#Positions of walls.
-	attr_accessor :left, :top, :right, :bottom
-	
-	def initialize
-		super
-		@left, @top, @right, @bottom = 0, 0, 0, 0
-		@actions << lambda do |boundary, object|
-			#If object is beyond a boundary, set its position equal to the boundary and reflect it.
-			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
-	
-end
-
-
 
 class Application
 
@@ -334,15 +75,12 @@ class Application
 	
 	
 		#Keep all objects within a boundary.
-		enclose = EncloseBehavior.new()
-		enclose.left = 0
-		enclose.right = @width
-		enclose.top = 0
-		enclose.bottom = @height
-		@environment.environmental_factors << EnvironmentalFactor.new([enclose])
-
-		#Create a creature generator.
-		@generator = Generator.new(@environment, 0, 0, @width, @height)
+		enclosure = Enclosure.new
+		enclosure.left = 0
+		enclosure.bottom = 0
+		enclosure.top = @height
+		enclosure.right = @width
+		@environment.environmental_factors << enclosure
 
 		#Create thread to update environment.
 		thread = Thread.new do
@@ -350,9 +88,7 @@ class Application
 			begin
 			
 				drawing_clock = Clock.new
-				birth_clock = Clock.new
 				time_per_frame = 1.0 / @fps
-				time_since_birth = 0
 				
 				loop do
 				
@@ -411,90 +147,30 @@ class Application
 					Utility.find_angle(@press_location, @release_location) #Move in direction of drag.
 				),
 				0,
+				1,
 				@tags_box.text.split(/,\s*/)
 			)
 			behavior = Behavior.new
 			condition_tags = @tag_condition_box.text
 			condition_tags.split(/,\s*/).each do |tag|
-				behavior.conditions << lambda do |creature, target|
-					target.tags.include?(tag)
-				end
+				behavior.conditions << TagCondition.new(tag)
 			end
 			proximity = @proximity_condition_slider.value
-			if proximity > 0
-				behavior.conditions << lambda do |creature, target|
-					Utility.find_distance(creature.location, target.location) < proximity
-				end
-			end
+			behavior.conditions << ProximityCondition.new(proximity) if proximity > 0
 			age = @age_condition_slider.value
-			if age > 0
-				behavior.conditions << lambda do |creature, target|
-					target.age > age
-				end
-			end
+			behavior.conditions << AgeCondition.new(age) if age > 0
 			acceleration = @acceleration_slider.value
-			if acceleration != 0
-				behavior.actions << lambda do |creature, target|
-					creature.vector.speed += acceleration
-					creature.vector.speed = 0 if creature.vector.speed < 0
-				end
-			end
+			behavior.actions << AccelerateAction.new(acceleration) if acceleration != 0
 			turn = @turn_slider.value
-			if turn != 0
-				behavior.actions << lambda do |creature, target|
-					creature.vector.pitch += turn
-				end
-			end
+			behavior.actions << TurnAction.new(turn) if turn != 0
 			approach_angle = @approach_slider.value
-			if approach_angle > 0
-				heading = creature.vector.clone
-				behavior.actions << lambda do |creature, target|
-					#Find the difference between the current heading and the angle to the target.
-					turn_angle = Utility.find_angle(creature.location, target.location) - heading.pitch
-					#If the angle is the long way around from the current heading, change it to the smaller angle.
-					if turn_angle > 180 then
-						turn_angle -= 360.0
-					elsif turn_angle < -180 then
-						turn_angle += 360.0
-					end
-					#If turn angle is greater than allowed turn speed, reduce it.
-					turn_angle = Utility.constrain_value(turn_angle, approach_angle)
-					#Turn the appropriate amount.
-					heading.pitch += turn_angle
-					#Apply the heading to the creature's movement vector.
-					creature.vector += heading
-				end
-			end
+			behavior.actions << ApproachAction.new(Vector.new(1, creature.vector.pitch), approach_angle) if approach_angle > 0
 			flee_angle = @flee_slider.value
-			if flee_angle > 0
-				heading = creature.vector.clone
-				behavior.actions << lambda do |creature, target|
-					#Find the difference between the current heading and the angle to the target.
-					turn_angle = Utility.find_angle(creature.location, target.location) - heading.pitch + 180
-					#If the angle is the long way around from the current heading, change it to the smaller angle.
-					if turn_angle > 180 then
-						turn_angle -= 360.0
-					elsif turn_angle < -180 then
-						turn_angle += 360.0
-					end
-					#If turn angle is greater than allowed turn speed, reduce it.
-					turn_angle = Utility.constrain_value(turn_angle, flee_angle)
-					#Turn the appropriate amount.
-					heading.pitch += turn_angle
-					#Apply the heading to the creature's movement vector.
-					creature.vector += heading
-				end
-			end
-			if @eat_flag.active?
-				behavior.actions << lambda do |creature, target|
-					@environment.objects.delete(target)
-				end
-			end
+			behavior.actions << FleeAction.new(Vector.new(5, creature.vector.pitch), flee_angle) if flee_angle > 0
+			behavior.actions << EatAction.new(@environment) if @eat_flag.active?
 			apply_tags = @tag_action_box.text
 			apply_tags.split(/,\s*/).each do |tag|
-				behavior.conditions << lambda do |creature, target|
-					target.tags << tag unless target.tags.include?(tag)
-				end
+				behavior.actions << TagAction.new(tag)
 			end
 			creature.behaviors << behavior
 			@environment.objects << creature

data/bin/zyps_demo

@@ -20,10 +20,14 @@
 
 begin
 	require 'zyps'
+	require 'zyps/actions'
+	require 'zyps/conditions'
 	require 'zyps/views/trails'
 rescue LoadError
 	require 'rubygems'
 	require 'zyps'
+	require 'zyps/actions'
+	require 'zyps/conditions'
 	require 'zyps/views/trails'
 end
 
@@ -38,6 +42,8 @@ class Demo
 	FRAME_COUNT = 80
 	#Number of frames per second.
 	FRAMES_PER_SECOND = 30
+	#Default size of game objects.
+	DEFAULT_OBJECT_SIZE = 78.5 #5 units in radius.
 
 	#Set up a window, a canvas, and an object environment, then run the given block.
 	def demo
@@ -102,10 +108,12 @@ class Demo
 		count.times do |i|
 			multiplier = i / count.to_f
 			environment.objects << Creature.new(
-				i,
+				i, #Name.
 				Location.new(multiplier * @view.width, multiplier * @view.height),
 				Color.new(multiplier, 1 - multiplier, multiplier / 2 + 0.5),
-				Vector.new(100 * multiplier, multiplier * 360)
+				Vector.new(100 * multiplier, multiplier * 360),
+				0, #Age.
+				DEFAULT_OBJECT_SIZE #Size.
 			)
 		end
 	end
@@ -125,7 +133,9 @@ class Demo
 			say("The things that populate an environment are called GameObjects.  Each object has:")
 			object = GameObject.new
 			say("...a name")
-			object.name = "Clancy"
+			object.name = "Huey"
+			say("...a size")
+			object.size = DEFAULT_OBJECT_SIZE
 			say("...a Location with x and y coordiates")
 			object.location = Location.new(@view.width/2, @view.height/2)
 			say("...a Color with red, green and blue components ranging from 0 to 1")
@@ -136,14 +146,28 @@ class Demo
 			say("Once your object is ready, add it to the environment.")
 			@environment.objects << object
 		
-			say("Call a view's render(objects) method to draw the objects.")
+			say("Add a view as an observer of an Environment, and it will draw the objects.")
 			say("Call an environment's interact() method to have the objects in it move around.")
-			say("Our demo's animate() method does both these things for us.")
+			say("Our demo's animate() method does this for us.")
 			animate(FRAME_COUNT)
 			
 			say("Let's add a couple more objects with different colors and vectors.")
-			@environment.objects << GameObject.new(nil, Location.new(@view.width/2, @view.height/2), Color.new(0, 1, 0), Vector.new(20, 135))
-			@environment.objects << GameObject.new(nil, Location.new(@view.width/2, @view.height/2), Color.new(0, 0, 1), Vector.new(30, 225))
+			@environment.objects << GameObject.new(
+				"Duey", #Name.
+				Location.new(@view.width/2, @view.height/2),
+				Color.new(0, 1, 0),
+				Vector.new(20, 135),
+				0, #Age.
+				DEFAULT_OBJECT_SIZE * 2 #Size.
+			)
+			@environment.objects << GameObject.new(
+				"Louie", #Name.
+				Location.new(@view.width/2, @view.height/2),
+				Color.new(0, 0, 1),
+				Vector.new(30, 225),
+				0, #Age.
+				DEFAULT_OBJECT_SIZE * 3 #Size.
+			)
 			animate(FRAME_COUNT)
 			
 			say("The viewing area can be resized at any time via its width and height attributes.")
@@ -151,16 +175,22 @@ class Demo
 			@view.height += 100
 			animate(FRAME_COUNT)
 			
-			say("TrailsView lets you set the thickness and length of the trails as well.")
-			@view.trail_width = 10
-			@view.trail_length = 10
+			say("TrailsView lets you set the length of the trails as well.")
+			@view.trail_length = 50
 			animate(FRAME_COUNT)
 			
 		end
-				
+		
 	end
 
 
+	class Gravity < EnvironmentalFactor
+		#Accelerate object toward the 'ground'.
+		def act(target)
+			target.vector.y += 9.8
+		end
+	end
+	
 	#Demonstrates environmental factors by adding gravity to the environment.
 	def test_environmental_factors
 
@@ -172,26 +202,19 @@ class Demo
 			animate(FRAME_COUNT)
 			
 			say("Let's add a new EnvironmentalFactor to simulate gravity.")
-			gravity = EnvironmentalFactor.new
+			gravity = Gravity.new
 			
-			say("We create a Behavior the EnvironmentalFactor will follow.")
-			accelerate = Behavior.new
-			say("The behavior will have a single action: to accelerate objects toward the 'ground' at 9.8 meters/second.")
-			accelerate.actions << lambda {|gravity, target| target.vector.y += 9.8}
-			say("We add the behavior to the EnvironmentalFactor.")
-			gravity.behaviors << accelerate
-			say("Then we add the EnvironmentalFactor to the Environment.")
+			say("We add gravity to the Environment.")
 			@environment.environmental_factors << gravity
 			
 			say("Everything immediately drops.")
 			animate(FRAME_COUNT)
 			
 		end
-				
+		
 	end
 
 
-	
 	#Demonstrates creature behaviors.
 	def test_behaviors
 
@@ -199,17 +222,17 @@ class Demo
 		
 		thread = Thread.new do
 
-			say("Let's add a behavior to our creatures.")
+			say("Let's add a Behavior to our creatures.")
 			chase = Behavior.new
 			
-			say("We'll have them head straight toward their target.")
-			chase.actions << lambda do |creature, target|
-				angle_to_target = Utility.find_angle(creature.location, target.location)
-				creature.vector.pitch = angle_to_target
-			end
+			say("A Behavior has one or more Action objects that define an action to take on the current target.")
+			say("We'll add an Action that makes the creatures head straight toward their target.")
+			chase.actions << FaceAction.new
 			
+			say("A Behavior also has one or more Condition objects.")
+			say("Unless every Condition is true, the action(s) won't be carried out.")
 			say("So that they don't target every creature on the screen, we'll add a condition to the behavior saying the target must have the label 'food'.")
-			chase.conditions << lambda {|creature, target| target.tags.include?('food')}
+			chase.conditions << TagCondition.new("food")
 			
 			say("We'll apply this behavior to all creatures currently in the environment.")
 			@environment.objects.each {|creature| creature.behaviors << chase}
@@ -217,11 +240,12 @@ class Demo
 			
 			say("Then we'll toss a piece of food (a GameObject with the label 'food') into the environment.")
 			@environment.objects << GameObject.new(
-				"target",
+				"target", #Name.
 				Location.new(@view.width / 2, @view.height / 2),
 				Color.new(1, 1, 1),
 				Vector.new(50, 315),
 				0, #Age.
+				DEFAULT_OBJECT_SIZE * 2, #Size.
 				["food"] #Tags.
 			)
 			
@@ -235,17 +259,14 @@ class Demo
 
 	#A Creature that changes the colors of other objects.
 	class Morpher < Creature
+		#Changes an object's color.
 		def initialize(*arguments)
 			super
 			morph = Behavior.new
 			#Shift the target's color to match the creature's.
-			morph.actions << lambda do |creature, target|
-				target.color.red += 0.1 if target.color.red < creature.color.red
-				target.color.green += 0.1 if target.color.green < creature.color.green
-				target.color.blue += 0.1 if target.color.blue < creature.color.blue
-			end
+			morph.actions << BlendAction.new(self.color)
 			#Act only on nearby targets.
-			morph.conditions << lambda {|creature, target| Utility.find_distance(creature.location, target.location) < 50}
+			morph.conditions << ProximityCondition.new(50)
 			@behaviors << morph
 		end
 	end
@@ -260,15 +281,15 @@ class Demo
 		say("Morphers are created with a single behavior, which shifts the color of any nearby target to match the Morpher's color.")
 		
 		say("Let's place a red Morpher...")
-		@environment.objects << Morpher.new(nil, Location.new(0, 100), Color.new(1, 0, 0), Vector.new(100, 0))
+		@environment.objects << Morpher.new(nil, Location.new(0, 100), Color.new(1, 0, 0), Vector.new(100, 0), 0, DEFAULT_OBJECT_SIZE)
 		say("a green one...")
-		@environment.objects << Morpher.new(nil, Location.new(0, 150), Color.new(0, 1, 0), Vector.new(200, 0))
+		@environment.objects << Morpher.new(nil, Location.new(0, 150), Color.new(0, 1, 0), Vector.new(200, 0), 0, DEFAULT_OBJECT_SIZE)
 		say("and a blue one...")
-		@environment.objects << Morpher.new(nil, Location.new(0, 200), Color.new(0, 0, 1), Vector.new(300, 0))
+		@environment.objects << Morpher.new(nil, Location.new(0, 200), Color.new(0, 0, 1), Vector.new(300, 0), 0, DEFAULT_OBJECT_SIZE)
 		
 		say("And see what they do.")
 		thread = Thread.new {animate(FRAME_COUNT)}
-				
+		
 	end
 
 
@@ -280,30 +301,17 @@ class Demo
 		thread = Thread.new do
 
 		
-			say("Many actions need to happen smoothly over time, such as accelerating at a given rate.")
-			
 			say("Here are some Creatures, just plodding along.")
 			animate(FRAME_COUNT / 4)
 			say("We're going to have them pick up the pace.")
 			
-			say("A Clock helps track the passage of time (obviously).")
-			say("We'll create a separate Clock object for each creature.")
-			clocks = Hash.new {|h, k| h[k] = Clock.new}
-			
-			say("Our acceleration behavior is going to check to see how long it's been since it last took effect.")
-			say("It will multiply that time by a given rate, say 100 meters/second.")
-			say("Let's say it's been 0.1 seconds since this creature last accelerated.")
-			say("100 times 0.1 is 10.")
-			say("So we should add 10 meters/second to the creature's speed.")
-			accelerate = Behavior.new
-			accelerate.actions << lambda do |creature, target|
-				#Accelerate the appropriate amount for the elapsed time.
-				creature.vector.speed += 100 * clocks[creature].elapsed_time
+			say("We add a Behavior with an AccelerateAction to all the creatures, and specify they should increase their speed by 100 units/second...")
+			@environment.objects.each do |creature|
+				accelerate = Behavior.new
+				accelerate.actions << AccelerateAction.new(100)
+				creature.behaviors << accelerate
 			end
 			
-			say("We add acceleration to all the creatures...")
-			@environment.objects.each {|creature| creature.behaviors << accelerate}
-			
 			say("And watch them rocket away.")
 			animate(FRAME_COUNT)
 			
@@ -319,24 +327,16 @@ class Demo
 		
 		thread = Thread.new do
 		
-			say("Turning smoothly requires tracking the rate of the turn as well.")
+			say("This time we'll use the TurnAction class.")
 			animate(FRAME_COUNT / 2)
 			
-			say("Again, we keep a separate Clock for each Creature.")
-			clocks = Hash.new {|h, k| h[k] = Clock.new}
-			
-			say("Our turn behavior follows the same principle as accelerating.")
-			say("We see how many seconds have elapsed, then multiply that by the turn rate.")
-			say("We add the result to the Vector angle.")
-			turn = Behavior.new
-			turn.actions << lambda do |creature, target|
-				#Turn the appropriate amount for the elapsed time.
-				creature.vector.pitch += 100 * clocks[creature].elapsed_time
+			say("We tell each creature it should turn by 90 degrees/second...")
+			@environment.objects.each do |creature|
+				turn = Behavior.new
+				turn.actions << TurnAction.new(90)
+				creature.behaviors << turn
 			end
 			
-			say("We add the behavior to each Creature...")
-			@environment.objects.each {|creature| creature.behaviors << turn}
-			
 			say("And watch things spiral out of control.")
 			animate(FRAME_COUNT)
 			
@@ -351,55 +351,25 @@ class Demo
 		populate(@environment, 50)
 		
 		say("When your car skids on ice, you might steer in a different direction, but you're going to keep following your original vector for a while.")
-		say("Adding vectors together lets us simulate this.")
-		
-		say("We'll keep a separate Vector for each Creature to track the direction it's 'steering' in.")
-		headings = Hash.new {|h, k| h[k] = Vector.new(k.vector.speed, k.vector.pitch)}
-		
-		say("We'll only allow them to turn a maximum of 20 degrees in either direction.")
-		max_turn_angle = 20
-		
-		say("We create a Behavior which adds the Vector the creature WANTS to follow to the Vector it's ACTUALLY following.")
-		approach = Behavior.new
-		approach.actions << lambda do |creature, target|
-		
-			#Find the difference between the current heading and the angle to the target.
-			turn_angle = Utility.find_angle(creature.location, target.location) - headings[creature].pitch
-			
-			#If the angle is the long way around from the current heading, change it to the smaller angle.
-			if turn_angle > 180 then
-				turn_angle -= 360.0
-			elsif turn_angle < -180 then
-				turn_angle += 360.0
-			end
-			
-			#If turn angle is greater than allowed turn speed, reduce it.
-			turn_angle = Utility.constrain_value(turn_angle, max_turn_angle)
-			
-			#Turn the appropriate amount.
-			headings[creature].pitch += turn_angle
-			
-			#Apply the heading to the creature's movement vector.
-			creature.vector += headings[creature]
-			
-		end
-		
-		say("We add a condition that it should only target its prey.")
-		approach.conditions << lambda do |creature, target|
-			target.tags.include?('prey')
+		say("Our ApproachAction adds the vector the creature WANTS to follow to the vector it's ACTUALLY following.")
+		say("We add a behavior with an ApproachAction to all creatures...")
+		say("We also add a condition that it should only target food.")
+		@environment.objects.each do |creature|
+			approach = Behavior.new
+			approach.actions << ApproachAction.new(creature.vector)
+			approach.conditions << TagCondition.new("food")
+			creature.behaviors << approach
 		end
 		
-		say("We add the behavior to all creatures...")
-		@environment.objects.each {|creature| creature.behaviors << approach}
-		
 		say("Add a target...")
 		@environment.objects << Creature.new(
 			"target",
-			Location.new(@view.width / 2, @view.height / 2),
+			Location.new(@view.width / 2, @view.height / 3),
 			Color.new(1, 1, 1),
 			Vector.new(3, 0),
 			0, #Age.
-			["prey"] #Tags.
+			DEFAULT_OBJECT_SIZE, #Size.
+			["food"] #Tags.
 		)
 		
 		say("And watch them all TRY to catch it.")
@@ -408,58 +378,27 @@ class Demo
 	end
 
 
-	#Demonstrates turning away from an object, instead of toward it.
+
+	#Demonstrates adding vectors.
 	def test_flee
 
-		populate(@environment, 20)
-		
-		say("Fleeing from something is just like approaching it, but we head in the OPPOSITE direction.")
-		say("Just get the angle toward the object, then add 180 degrees.")
-		
-		#Keep a separate heading for each object.
-		headings = Hash.new {|h, k| h[k] = Vector.new(k.vector.speed, k.vector.pitch)}
-		
-		#Create a behavior.
-		max_turn_angle = 20
-		flee = Behavior.new
-		flee.actions << lambda do |creature, target|
-		
-			#Find the difference between the current heading and the angle AWAY from the target.
-			turn_angle = Utility.find_angle(creature.location, target.location) - headings[creature].pitch + 180
-			
-			#If the angle is the long way around from the current heading, change it to the smaller angle.
-			if turn_angle > 180 then
-				turn_angle -= 360.0
-			elsif turn_angle < -180 then
-				turn_angle += 360.0
-			end
-			
-			#If turn angle is greater than allowed turn speed, reduce it.
-			turn_angle = Utility.constrain_value(turn_angle, max_turn_angle)
-			
-			#Turn the appropriate amount for the elapsed time.
-			headings[creature].pitch += turn_angle
-			
-			#Apply the heading to the creature's movement vector.
-			creature.vector += headings[creature]
-			
-		end
+		populate(@environment, 50)
 		
-		#Flee from only the creature's predator.
-		flee.conditions << lambda do |creature, target|
-			target.tags.include?('predator')
+		say("A FleeAction is just like an ApproachAction, but we head in the OPPOSITE direction.")
+		@environment.objects.each do |creature|
+			flee = Behavior.new
+			flee.actions << FleeAction.new(creature.vector)
+			flee.conditions << TagCondition.new("predator")
+			creature.behaviors << flee
 		end
 		
-		#Add behavior to creatures.
-		@environment.objects.each {|creature| creature.behaviors << flee}
-		
-		#Add a target.
 		@environment.objects << Creature.new(
-			"lion",
+			"target",
 			Location.new(@view.width / 2, @view.height / 2),
 			Color.new(1, 1, 1),
 			Vector.new(3, 0),
 			0, #Age.
+			DEFAULT_OBJECT_SIZE, #Size.
 			["predator"] #Tags.
 		)
 		
@@ -468,47 +407,32 @@ class Demo
 	end
 
 
-	#A Behavior that destroys the target.
-	class Destroy < Behavior
-		#Environment from which targets will be removed.
-		attr_accessor :environment
-		def initialize(actions = [], conditions = [], environment = Environment.new)
-			super(actions, conditions)
-			@environment = environment
-			#"Kill" target.
-			self.actions << lambda do |creature, target|
-				@environment.objects.delete(target)
-			end
-			#Act only if target is close.
-			self.conditions << lambda do |creature, target|
-				Utility.find_distance(creature.location, target.location) < 25
-			end
-		end
-	end
-
-
+	
 	#Demonstrates keeping a reference to an Environment so a Creature can alter it.
-	def test_destroy
+	def test_eat
 	
 		populate(@environment)
 		
 		say("Most games are all about destruction, but there hasn't been much so far.")
 		say("Let's create a creature that causes some havoc.")
-		delinquent = Creature.new(nil, Location.new(0, 150), Color.new(0, 1, 0), Vector.new(200, 0))
-		
-		say("This demo code includes a subclass of Behavior, called Destroy.")
-		destroy = Destroy.new
-		
-		say("We'll destroy our targets by removing them from their environment.")
-		say("Creatures and their Behaviors normally know nothing about the Environment they belong to, so we added an environment attribute to Destroy.")
-		say("Destroy finds the target in Environment.objects and removes it.")
-		destroy.environment = @environment
-		
-		say("Add the Destroy instance to the creature's behaviors...")
-		delinquent.behaviors << destroy
+		predator = Creature.new(nil, Location.new(0, 150), Color.new(0, 1, 0), Vector.new(200, 0), 0, DEFAULT_OBJECT_SIZE * 2)
+		
+		say("The EatAction eats targets by removing them from their environment.")
+		say("Creatures and their Actions normally know nothing about the Environment they belong to, so EatAction takes an Environment in its constructor.")
+		say("EatAction finds the target in Environment.objects and removes it.")
+		action = EatAction.new(@environment)
+		
+		say("Create a behavior...")
+		behavior = Behavior.new
+		say("Add the action to the behavior...")
+		behavior.actions << action
+		say("Add a condition that they must collide first...")
+		behavior.conditions << CollisionCondition.new
+		say("Add the behavior to the creature...")
+		predator.behaviors << behavior
 		
 		say("Drop the creature into the actual environment...")
-		@environment.objects << delinquent
+		@environment.objects << predator
 		
 		say("And - chomp!")
 		thread = Thread.new {animate(FRAME_COUNT)}
@@ -518,6 +442,7 @@ class Demo
 
 	#Run all the demos.
 	def main
+		say "This is a demonstration of the Zyps library."
 		say "After each demo, close the window to proceed."
 		say("-" * 30)
 		demo {test_render}
@@ -528,7 +453,10 @@ class Demo
 		demo {test_turn}
 		demo {test_approach}
 		demo {test_flee}
-		demo {test_destroy}
+		demo {test_eat}
+		say "To learn more about how the library works, you can read the source code in the 'bin/zyps_demo' file in the Zyps distribution."
+		say "And if you want to code your own Actions, Conditions, EnvironmentalFactors, or Views, see the distribution's 'lib' folder for examples."
+		say "Thanks for watching!"
 	end