zyps 0.5.2 → 0.6.1

data/lib/zyps/actions.rb

@@ -18,6 +18,9 @@
 require 'zyps'
 
 
+module Zyps
+
+
 #Head toward a target.
 class FaceAction < Action
 	#Set the actor's heading to point directly at target.
@@ -26,6 +29,7 @@ class FaceAction < Action
 	end
 end
 
+
 #Increase/decrease speed over time.
 class AccelerateAction < Action
 	#Units per second to accelerate.
@@ -221,7 +225,7 @@ class PushAction < Action
 		super
 		@clock.reset_elapsed_time
 	end
-	#Accelerate away from the target, but limited by turn rate.
+	#Accelerate the target away from the actor, but limited by elapsed time.
 	def do(actor, target)
 		#Angle to target is also angle of push force.
 		push_angle = Utility.find_angle(actor.location, target.location)
@@ -256,3 +260,6 @@ class PullAction < Action
 		target.vector += Vector.new(pull_force, pull_angle)
 	end
 end
+
+
+end #module Zyps

data/lib/zyps/conditions.rb

@@ -18,6 +18,9 @@
 require 'zyps'
 
 
+module Zyps
+
+
 #Act only on objects with the correct tag.
 class TagCondition < Condition
 	#The tag to look for on the target.
@@ -67,3 +70,6 @@ class CollisionCondition < Condition
 		Utility.collided?(actor, target)
 	end
 end
+
+
+end #module Zyps

data/lib/zyps/environmental_factors.rb

@@ -18,6 +18,9 @@
 require 'zyps'
 
 
+module Zyps
+
+
 #Keeps all objects within a set of walls.
 class Enclosure < EnvironmentalFactor
 	
@@ -29,9 +32,11 @@ class Enclosure < EnvironmentalFactor
 	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
@@ -49,6 +54,7 @@ class Enclosure < EnvironmentalFactor
 			object.vector.pitch = Utility.find_reflection_angle(180, object.vector.pitch)
 		end
 	end
+	
 end
 
 
@@ -58,14 +64,82 @@ class SpeedLimit < EnvironmentalFactor
 	
 	#Maximum allowed speed in units.
 	attr_accessor :maximum
+	
 	def initialize(units)
 		self.maximum = units
 	end
+	
 	#If object is over the speed, reduce its speed.
 	def act(object)
 		object.vector.speed = Utility.constrain_value(object.vector.speed, @maximum)
 	end
+	
+end
+
+
+#A force that pushes on all objects.
+class Accelerator < EnvironmentalFactor
+	
+	#Vector to apply to objects.
+	attr_accessor :vector
+	
+	def initialize(vector)
+		self.vector = vector
+		@clock = Clock.new
+	end
+
+	#Accelerate the target away from the actor, but limited by elapsed time.
+	def act(object)
+		object.vector += Vector.new(@vector.speed * @clock.elapsed_time, @vector.pitch)
+	end
+
+end
+
+#Gravity pulls all objects downward.
+class Gravity < Accelerator
+	def initialize; super(Vector.new(9.8, 270)); end
+end
+
+
+#A force that slows all objects.
+class Friction < EnvironmentalFactor
+	
+	#Rate of slowing.
+	attr_accessor :force
+	
+	def initialize(force)
+		self.force = force
+		@clock = Clock.new
+	end
+	
+	#Reduce the target's speed at the given rate.
+	def act(object)
+		object.vector.speed -= @force * @clock.elapsed_time
+	end
+	
 end
 
 
+class PopulationLimit < EnvironmentalFactor
+	
+	#Environment to remove objects from.
+	attr_accessor :environment
+	#Maximum allowed population.
+	attr_accessor :count
+	
+	def initialize(environment, count)
+		self.environment = environment
+		self.count = count
+	end
+	
+	#Remove target if there are too many objects in environment.
+	def act(object)
+		if environment.objects.length > @count
+			environment.objects.delete(object)
+		end
+	end
+	
+end
+
 
+end #module Zyps

data/lib/zyps/views/trails.rb

@@ -19,6 +19,9 @@
 require 'gtk2'
 
 
+module Zyps
+
+
 #A view of game objects.
 class TrailsView
 
@@ -145,3 +148,6 @@ class TrailsView
 		end
 	
 end
+
+
+end #module Zyps

data/test/test_zyps.rb

@@ -20,6 +20,9 @@ require 'zyps'
 require 'test/unit'
 
 
+include Zyps
+
+
 #Redefine Clock to return a predictable time.
 class Clock
 	def elapsed_time; 0.1; end

data/test/zyps/test_actions.rb

@@ -21,6 +21,9 @@ require 'zyps/actions'
 require 'test/unit'
 
 
+include Zyps
+
+
 #Allowed deviation for assert_in_delta.
 REQUIRED_ACCURACY = 0.001
 

data/test/zyps/test_conditions.rb

@@ -21,6 +21,9 @@ require 'zyps/conditions'
 require 'test/unit'
 
 
+include Zyps
+
+
 #Redefine Clock to return a predictable time.
 class Clock
 	def elapsed_time; 0.1; end

data/test/zyps/test_environmental_factors.rb

@@ -21,15 +21,18 @@ require 'zyps/environmental_factors'
 require 'test/unit'
 
 
+include Zyps
+
+
 #Redefine Clock to return a predictable time.
+ELAPSED_TIME = 0.1
 class Clock
-	def elapsed_time; 0.1; end
+	def elapsed_time; ELAPSED_TIME; end
 end
 
 
 class TestEnclosure < Test::Unit::TestCase
 
-
 	def test_enclosure
 	
 		creature = Creature.new
@@ -81,14 +84,12 @@ class TestEnclosure < Test::Unit::TestCase
 		
 	end
 	
-	
 end
 
 
 
 class TestSpeedLimit < Test::Unit::TestCase
 
-
 	def test_speed_limit
 	
 		creature = Creature.new
@@ -110,12 +111,94 @@ class TestSpeedLimit < Test::Unit::TestCase
 		creature.vector.speed = -11
 		limit.act(creature)
 		assert_equal(-10, creature.vector.speed)
-		
-		
+				
 	end
 	
-	
 end
 
 
 
+class TestAccelerator < Test::Unit::TestCase
+
+	def test_standing_start
+		creature = Creature.new
+		creature.vector = Vector.new(0, 0)
+		#Create an accelerator that pushes downwards by 1 unit/sec.
+		accelerator = Accelerator.new(Vector.new(1, 270))
+		#Act on a creature, and ensure its vector is modified appropriately.
+		accelerator.act(creature)
+		assert_equal(ELAPSED_TIME, creature.vector.speed)
+		assert_equal(270, creature.vector.pitch)
+	end
+
+
+	def test_cancellation
+		creature = Creature.new
+		creature.vector = Vector.new(1, 45)
+		#Create an accelerator pushing opposite to the creature's direction of travel.
+		accelerator = Accelerator.new(Vector.new(0.5, 225))
+		#Act on a creature, and ensure its vector is modified appropriately.
+		accelerator.act(creature)
+		assert_equal(0.95, creature.vector.speed)
+		assert_equal(45, creature.vector.pitch)
+	end
+
+end
+
+
+class TestFriction < Test::Unit::TestCase
+
+	STARTING_SPEED = 1
+
+	def test_slowing
+		creature = Creature.new
+		creature.vector = Vector.new(STARTING_SPEED, 0)
+		#Create friction that slows objects by 1 unit/sec.
+		friction = Friction.new(1)
+		#Act on a creature, and ensure its vector is modified appropriately.
+		friction.act(creature)
+		assert_equal(STARTING_SPEED - ELAPSED_TIME, creature.vector.speed)
+		#Test cumulative effect.
+		friction.act(creature)
+		assert_equal(STARTING_SPEED - ELAPSED_TIME * 2, creature.vector.speed)
+	end
+
+end
+
+
+class TestPopulationLimit < Test::Unit::TestCase
+	
+	def test_limit
+	
+		#Create an environment.
+		environment = Environment.new
+		#Create a population limit for the environment.
+		limit = PopulationLimit.new(environment, 2)
+		
+		#Ensure population is not affected when under/at the limit.
+		creature_1 = Creature.new
+		environment.objects << creature_1
+		limit.act(creature_1)
+		assert(environment.objects.include?(creature_1))
+		creature_2 = Creature.new
+		environment.objects << creature_2
+		limit.act(creature_1)
+		assert(environment.objects.include?(creature_1))
+		assert(environment.objects.include?(creature_2))
+		limit.act(creature_2)
+		assert(environment.objects.include?(creature_1))
+		assert(environment.objects.include?(creature_2))
+		
+		#Ensure first creature is removed when limit is exceeded.
+		creature_3 = Creature.new
+		environment.objects << creature_3
+		limit.act(creature_1)
+		assert(! environment.objects.include?(creature_1))
+		
+		#Ensure other creatures aren't touched.
+		assert(environment.objects.include?(creature_2))
+		assert(environment.objects.include?(creature_3))
+		
+	end
+	
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.0
 specification_version: 1
 name: zyps
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
-date: 2007-09-24 00:00:00 -07:00
+  version: 0.6.1
+date: 2007-10-24 00:00:00 -07:00
 summary: A game library for Ruby
 require_paths: 
 - lib
@@ -34,19 +34,194 @@ files:
 - README.txt
 - bin/zyps
 - bin/zyps_demo
+- bin/zyps_server
 - lib/zyps
+- lib/zyps.rb
+- lib/zyps/views
 - lib/zyps/actions.rb
-- lib/zyps/conditions.rb
 - lib/zyps/environmental_factors.rb
-- lib/zyps/views
+- lib/zyps/conditions.rb
 - lib/zyps/views/trails.rb
-- lib/zyps.rb
-- test/test_zyps.rb
 - test/zyps
-- test/zyps/test_actions.rb
+- test/test_zyps.rb
 - test/zyps/test_behaviors.rb
-- test/zyps/test_conditions.rb
+- test/zyps/test_actions.rb
 - test/zyps/test_environmental_factors.rb
+- test/zyps/test_conditions.rb
+- doc/created.rid
+- doc/rdoc-style.css
+- doc/files
+- doc/classes
+- doc/fr_file_index.html
+- doc/fr_class_index.html
+- doc/fr_method_index.html
+- doc/index.html
+- doc/files/lib
+- doc/files/COPYING_LESSER_txt.html
+- doc/files/COPYING_txt.html
+- doc/files/README_txt.html
+- doc/files/lib/zyps_rb.html
+- doc/files/lib/zyps
+- doc/files/lib/zyps/actions_rb.html
+- doc/files/lib/zyps/environmental_factors_rb.html
+- doc/files/lib/zyps/conditions_rb.html
+- doc/files/lib/zyps/views
+- doc/files/lib/zyps/views/trails_rb.html
+- doc/classes/Zyps
+- doc/classes/Zyps.html
+- doc/classes/Zyps/Utility.src
+- doc/classes/Zyps/TrailsView.src
+- doc/classes/Zyps/Enclosure.src
+- doc/classes/Zyps/Behavior.src
+- doc/classes/Zyps/Action.src
+- doc/classes/Zyps/TagCondition.src
+- doc/classes/Zyps/AccelerateAction.src
+- doc/classes/Zyps/SpeedLimit.src
+- doc/classes/Zyps/Creature.src
+- doc/classes/Zyps/PopulationLimit.src
+- doc/classes/Zyps/Vector.src
+- doc/classes/Zyps/Location.src
+- doc/classes/Zyps/Color.src
+- doc/classes/Zyps/Accelerator.src
+- doc/classes/Zyps/PullAction.src
+- doc/classes/Zyps/PushAction.src
+- doc/classes/Zyps/TagAction.src
+- doc/classes/Zyps/DestroyAction.src
+- doc/classes/Zyps/ProximityCondition.src
+- doc/classes/Zyps/AgeCondition.src
+- doc/classes/Zyps/GameObject.src
+- doc/classes/Zyps/Gravity.src
+- doc/classes/Zyps/BlendAction.src
+- doc/classes/Zyps/EatAction.src
+- doc/classes/Zyps/Clock.src
+- doc/classes/Zyps/Friction.src
+- doc/classes/Zyps/ApproachAction.src
+- doc/classes/Zyps/TurnAction.src
+- doc/classes/Zyps/FaceAction.src
+- doc/classes/Zyps/Environment.src
+- doc/classes/Zyps/CollisionCondition.src
+- doc/classes/Zyps/FleeAction.src
+- doc/classes/Zyps/Utility.html
+- doc/classes/Zyps/TrailsView.html
+- doc/classes/Zyps/Enclosure.html
+- doc/classes/Zyps/Behavior.html
+- doc/classes/Zyps/Action.html
+- doc/classes/Zyps/TagCondition.html
+- doc/classes/Zyps/AccelerateAction.html
+- doc/classes/Zyps/SpeedLimit.html
+- doc/classes/Zyps/Creature.html
+- doc/classes/Zyps/PopulationLimit.html
+- doc/classes/Zyps/Vector.html
+- doc/classes/Zyps/Location.html
+- doc/classes/Zyps/Color.html
+- doc/classes/Zyps/Accelerator.html
+- doc/classes/Zyps/NoMatchException.html
+- doc/classes/Zyps/PullAction.html
+- doc/classes/Zyps/PushAction.html
+- doc/classes/Zyps/TagAction.html
+- doc/classes/Zyps/DestroyAction.html
+- doc/classes/Zyps/ProximityCondition.html
+- doc/classes/Zyps/AgeCondition.html
+- doc/classes/Zyps/EnvironmentalFactor.html
+- doc/classes/Zyps/GameObject.html
+- doc/classes/Zyps/Gravity.html
+- doc/classes/Zyps/BlendAction.html
+- doc/classes/Zyps/EatAction.html
+- doc/classes/Zyps/Clock.html
+- doc/classes/Zyps/Friction.html
+- doc/classes/Zyps/ApproachAction.html
+- doc/classes/Zyps/TurnAction.html
+- doc/classes/Zyps/FaceAction.html
+- doc/classes/Zyps/Environment.html
+- doc/classes/Zyps/CollisionCondition.html
+- doc/classes/Zyps/Condition.html
+- doc/classes/Zyps/FleeAction.html
+- doc/classes/Zyps/Utility.src/M000001.html
+- doc/classes/Zyps/Utility.src/M000002.html
+- doc/classes/Zyps/Utility.src/M000003.html
+- doc/classes/Zyps/Utility.src/M000004.html
+- doc/classes/Zyps/Utility.src/M000005.html
+- doc/classes/Zyps/Utility.src/M000006.html
+- doc/classes/Zyps/Utility.src/M000007.html
+- doc/classes/Zyps/TrailsView.src/M000008.html
+- doc/classes/Zyps/TrailsView.src/M000009.html
+- doc/classes/Zyps/Enclosure.src/M000010.html
+- doc/classes/Zyps/Enclosure.src/M000011.html
+- doc/classes/Zyps/Behavior.src/M000012.html
+- doc/classes/Zyps/Behavior.src/M000013.html
+- doc/classes/Zyps/Action.src/M000014.html
+- doc/classes/Zyps/Action.src/M000015.html
+- doc/classes/Zyps/Action.src/M000016.html
+- doc/classes/Zyps/Action.src/M000017.html
+- doc/classes/Zyps/TagCondition.src/M000018.html
+- doc/classes/Zyps/TagCondition.src/M000019.html
+- doc/classes/Zyps/AccelerateAction.src/M000020.html
+- doc/classes/Zyps/AccelerateAction.src/M000021.html
+- doc/classes/Zyps/AccelerateAction.src/M000022.html
+- doc/classes/Zyps/SpeedLimit.src/M000023.html
+- doc/classes/Zyps/SpeedLimit.src/M000024.html
+- doc/classes/Zyps/Creature.src/M000025.html
+- doc/classes/Zyps/Creature.src/M000026.html
+- doc/classes/Zyps/PopulationLimit.src/M000027.html
+- doc/classes/Zyps/PopulationLimit.src/M000028.html
+- doc/classes/Zyps/Vector.src/M000029.html
+- doc/classes/Zyps/Vector.src/M000030.html
+- doc/classes/Zyps/Vector.src/M000031.html
+- doc/classes/Zyps/Vector.src/M000032.html
+- doc/classes/Zyps/Vector.src/M000033.html
+- doc/classes/Zyps/Vector.src/M000034.html
+- doc/classes/Zyps/Vector.src/M000035.html
+- doc/classes/Zyps/Vector.src/M000036.html
+- doc/classes/Zyps/Location.src/M000037.html
+- doc/classes/Zyps/Color.src/M000038.html
+- doc/classes/Zyps/Color.src/M000039.html
+- doc/classes/Zyps/Color.src/M000040.html
+- doc/classes/Zyps/Color.src/M000041.html
+- doc/classes/Zyps/Color.src/M000042.html
+- doc/classes/Zyps/Color.src/M000043.html
+- doc/classes/Zyps/Accelerator.src/M000044.html
+- doc/classes/Zyps/Accelerator.src/M000045.html
+- doc/classes/Zyps/PullAction.src/M000046.html
+- doc/classes/Zyps/PullAction.src/M000047.html
+- doc/classes/Zyps/PullAction.src/M000048.html
+- doc/classes/Zyps/PushAction.src/M000049.html
+- doc/classes/Zyps/PushAction.src/M000050.html
+- doc/classes/Zyps/PushAction.src/M000051.html
+- doc/classes/Zyps/TagAction.src/M000052.html
+- doc/classes/Zyps/TagAction.src/M000053.html
+- doc/classes/Zyps/DestroyAction.src/M000054.html
+- doc/classes/Zyps/DestroyAction.src/M000055.html
+- doc/classes/Zyps/ProximityCondition.src/M000056.html
+- doc/classes/Zyps/ProximityCondition.src/M000057.html
+- doc/classes/Zyps/AgeCondition.src/M000058.html
+- doc/classes/Zyps/AgeCondition.src/M000059.html
+- doc/classes/Zyps/GameObject.src/M000060.html
+- doc/classes/Zyps/GameObject.src/M000061.html
+- doc/classes/Zyps/GameObject.src/M000062.html
+- doc/classes/Zyps/GameObject.src/M000063.html
+- doc/classes/Zyps/GameObject.src/M000064.html
+- doc/classes/Zyps/Gravity.src/M000065.html
+- doc/classes/Zyps/BlendAction.src/M000066.html
+- doc/classes/Zyps/BlendAction.src/M000067.html
+- doc/classes/Zyps/EatAction.src/M000068.html
+- doc/classes/Zyps/Clock.src/M000069.html
+- doc/classes/Zyps/Clock.src/M000070.html
+- doc/classes/Zyps/Clock.src/M000071.html
+- doc/classes/Zyps/Friction.src/M000072.html
+- doc/classes/Zyps/Friction.src/M000073.html
+- doc/classes/Zyps/ApproachAction.src/M000074.html
+- doc/classes/Zyps/ApproachAction.src/M000075.html
+- doc/classes/Zyps/ApproachAction.src/M000076.html
+- doc/classes/Zyps/TurnAction.src/M000077.html
+- doc/classes/Zyps/TurnAction.src/M000078.html
+- doc/classes/Zyps/TurnAction.src/M000079.html
+- doc/classes/Zyps/FaceAction.src/M000080.html
+- doc/classes/Zyps/Environment.src/M000081.html
+- doc/classes/Zyps/Environment.src/M000082.html
+- doc/classes/Zyps/CollisionCondition.src/M000083.html
+- doc/classes/Zyps/FleeAction.src/M000084.html
+- doc/classes/Zyps/FleeAction.src/M000085.html
+- doc/classes/Zyps/FleeAction.src/M000086.html
 test_files: 
 - test/test_zyps.rb
 rdoc_options: 
@@ -61,6 +236,7 @@ extra_rdoc_files:
 executables: 
 - zyps
 - zyps_demo
+- zyps_server
 extensions: []
 
 requirements: