zyps 0.6.3 → 0.7.0

data/test/zyps/test_conditions.rb

@@ -28,18 +28,18 @@ class TestConditions < Test::Unit::TestCase
 
 
 	def setup
-		@actor = Creature.new('name', Location.new(1, 1))
-		@target = GameObject.new('name', Location.new(2, 2))
+		@actor = Creature.new(:name => 'name', :location => Location.new(1, 1))
+		@target = GameObject.new(:name => 'name', :location => Location.new(2, 2))
 	end
 
 
 	def test_tag_condition
 		condition = TagCondition.new("tag")
 		#Test for falsehood.
-		assert(! condition.met?(@actor, @target))
+		assert(! condition.select(@actor, [@target]).include?(@target))
 		#Test for truth.
 		@target.tags << "tag"
-		assert(condition.met?(@actor, @target))
+		assert(condition.select(@actor, [@target]).include?(@target))
 	end
 	
 	
@@ -47,22 +47,22 @@ class TestConditions < Test::Unit::TestCase
 		condition = AgeCondition.new(0.2)
 		#Test for falsehood.
 		@target.age = 0.1
-		assert(! condition.met?(@actor, @target))
+		assert(! condition.select(@actor, [@target]).include?(@target))
 		#Test for truth.
 		@target.age = 0.2
-		assert(condition.met?(@actor, @target))
+		assert(condition.select(@actor, [@target]).include?(@target))
 		@target.age = 0.3
-		assert(condition.met?(@actor, @target))
+		assert(condition.select(@actor, [@target]).include?(@target))
 	end
 	
 	
 	def test_proximity_condition
 		condition = ProximityCondition.new(1)
 		#Test for falsehood.
-		assert(! condition.met?(@actor, @target))
+		assert(! condition.select(@actor, [@target]).include?(@target))
 		#Test for truth.
 		@target.location = Location.new(0.5, 0.5)
-		assert(condition.met?(@actor, @target))
+		assert(condition.select(@actor, [@target]).include?(@target))
 	end
 	
 	
@@ -70,10 +70,29 @@ class TestConditions < Test::Unit::TestCase
 		condition = CollisionCondition.new
 		#Test for falsehood.
 		@actor.size, @target.size = 0.196, 0.196 #Radius = 0.25
-		assert(! condition.met?(@actor, @target))
+		assert(! condition.select(@actor, [@target]).include?(@target))
 		#Test for truth.
 		@actor.size, @target.size = 1.766, 1.766 #Radius = 0.75
-		assert(condition.met?(@actor, @target))
+		assert(condition.select(@actor, [@target]).include?(@target))
+	end
+	
+	
+	def test_strength_condition
+		condition = StrengthCondition.new
+		#For now, "strength" is based merely on size.
+		#Test for falsehood.
+		@actor.size = 1
+		@target.size = 2
+		assert(! condition.select(@actor, [@target]).include?(@target))
+		#Test for truth.
+		#Equally strong objects cause the condition to return true.
+		@actor.size = 2
+		@target.size = 2
+		assert(condition.select(@actor, [@target]).include?(@target))
+		#As will cases where the actor is stronger, of course.
+		@actor.size = 3
+		@target.size = 2
+		assert(condition.select(@actor, [@target]).include?(@target))
 	end
 	
 	

data/test/zyps/test_environmental_factors.rb

@@ -35,40 +35,42 @@ class TestEnclosure < Test::Unit::TestCase
 	def test_enclosure
 	
 		creature = Creature.new
+		environment = Environment.new(:objects => [creature])
 		
 		#Create an enclosure.
-		enclosure = Enclosure.new
-		enclosure.left = 1
-		enclosure.top = 3
-		enclosure.right = 3
-		enclosure.bottom = 1
+		enclosure = Enclosure.new(
+			:left => 1,
+			:top => 3,
+			:right => 3,
+			:bottom => 1
+		)
 		
 		#Place creature outside the walls, and act on it.
 		#Ensure it's moved inside and its heading reflects off the walls.
 		creature.location = Location.new(0, 2) #Too far left.
 		creature.vector.pitch = 170
-		enclosure.act(creature)
+		enclosure.act(environment)
 		assert_equal(1, creature.location.x)
 		assert_equal(2, creature.location.y)
 		assert_equal(10, creature.vector.pitch)
 		
 		creature.location = Location.new(4, 2) #Too far right.
 		creature.vector.pitch = 10
-		enclosure.act(creature)
+		enclosure.act(environment)
 		assert_equal(3, creature.location.x)
 		assert_equal(2, creature.location.y)
 		assert_equal(170, creature.vector.pitch)
 		
 		creature.location = Location.new(2, 0) #Too far down.
 		creature.vector.pitch = 280
-		enclosure.act(creature)
+		enclosure.act(environment)
 		assert_equal(2, creature.location.x)
 		assert_equal(1, creature.location.y)
 		assert_equal(80, creature.vector.pitch)
 		
 		creature.location = Location.new(2, 4) #Too far up.
 		creature.vector.pitch = 80
-		enclosure.act(creature)
+		enclosure.act(environment)
 		assert_equal(2, creature.location.x)
 		assert_equal(3, creature.location.y)
 		assert_equal(280, creature.vector.pitch)
@@ -76,7 +78,7 @@ class TestEnclosure < Test::Unit::TestCase
 		#Place creature inside the walls, and ensure it's unaffected.
 		creature.location = Location.new(2, 2) #Inside.
 		creature.vector.pitch = 45
-		enclosure.act(creature)
+		enclosure.act(environment)
 		assert_equal(2, creature.location.x)
 		assert_equal(2, creature.location.y)
 		assert_equal(45, creature.vector.pitch)
@@ -92,23 +94,24 @@ class TestSpeedLimit < Test::Unit::TestCase
 	def test_speed_limit
 	
 		creature = Creature.new
+		environment = Environment.new(:objects => [creature])
 		
 		#Create a speed limit.
 		limit = SpeedLimit.new(10)
 		
 		#Act on a creature going under the limit, and ensure it's unaffected.
 		creature.vector.speed = 1
-		limit.act(creature)
+		limit.act(environment)
 		assert_equal(1, creature.vector.speed)
 		
 		#Act on a creature going over the limit, and ensure its speed is reduced.
 		creature.vector.speed = 11
-		limit.act(creature)
+		limit.act(environment)
 		assert_equal(10, creature.vector.speed)
 		
 		#Act on a creature going in reverse, and ensure its speed is reduced.
 		creature.vector.speed = -11
-		limit.act(creature)
+		limit.act(environment)
 		assert_equal(-10, creature.vector.speed)
 				
 	end
@@ -121,11 +124,12 @@ class TestAccelerator < Test::Unit::TestCase
 
 	def test_standing_start
 		creature = Creature.new
+		environment = Environment.new(:objects => [creature])
 		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)
+		accelerator.act(environment)
 		assert_equal(ELAPSED_TIME, creature.vector.speed)
 		assert_equal(270, creature.vector.pitch)
 	end
@@ -133,11 +137,12 @@ class TestAccelerator < Test::Unit::TestCase
 
 	def test_cancellation
 		creature = Creature.new
+		environment = Environment.new(:objects => [creature])
 		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)
+		accelerator.act(environment)
 		assert_equal(0.95, creature.vector.speed)
 		assert_equal(45, creature.vector.pitch)
 	end
@@ -151,14 +156,15 @@ class TestFriction < Test::Unit::TestCase
 
 	def test_slowing
 		creature = Creature.new
+		environment = Environment.new(:objects => [creature])
 		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)
+		friction.act(environment)
 		assert_equal(STARTING_SPEED - ELAPSED_TIME, creature.vector.speed)
 		#Test cumulative effect.
-		friction.act(creature)
+		friction.act(environment)
 		assert_equal(STARTING_SPEED - ELAPSED_TIME * 2, creature.vector.speed)
 	end
 
@@ -172,26 +178,26 @@ class TestPopulationLimit < Test::Unit::TestCase
 		#Create an environment.
 		environment = Environment.new
 		#Create a population limit for the environment.
-		limit = PopulationLimit.new(environment, 2)
+		limit = PopulationLimit.new(2)
 		
 		#Ensure population is not affected when under/at the limit.
 		creature_1 = Creature.new
 		environment.objects << creature_1
-		limit.act(creature_1)
+		limit.act(environment)
 		assert(environment.objects.include?(creature_1))
 		creature_2 = Creature.new
 		environment.objects << creature_2
-		limit.act(creature_1)
+		limit.act(environment)
 		assert(environment.objects.include?(creature_1))
 		assert(environment.objects.include?(creature_2))
-		limit.act(creature_2)
+		limit.act(environment)
 		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)
+		limit.act(environment)
 		assert(! environment.objects.include?(creature_1))
 		
 		#Ensure other creatures aren't touched.

data/test/zyps/test_remote.rb

@@ -79,12 +79,12 @@ class TestRemote < Test::Unit::TestCase
 		creature = Creature.new
 		creature.vector = Vector.new(SPEED, PITCH)
 		behavior = Behavior.new
-		behavior.actions << TurnAction.new(RATE)
+		behavior.actions << TurnAction.new(RATE, 90)
 		creature.behaviors << behavior
 		@client.objects << creature
 		@client.objects << Creature.new #Second creature to interact with.
 		@environment.interact
-		assert_in_delta(PITCH + 0.1 * RATE, @client.objects[0].vector.pitch, 0.001)
+		assert(@client.objects[0].vector.pitch > PITCH)
 	end
 	
 	#Place Creature with Condition and ensure it's followed.
@@ -92,7 +92,7 @@ class TestRemote < Test::Unit::TestCase
 		creature = Creature.new
 		creature.vector = Vector.new(SPEED, PITCH)
 		behavior = Behavior.new
-		behavior.actions << TurnAction.new(RATE)
+		behavior.actions << TurnAction.new(RATE, 90)
 		behavior.conditions << TagCondition.new('foobar') #Will return false.
 		creature.behaviors << behavior
 		@client.objects << creature

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: zyps
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
-date: 2007-11-08 00:00:00 -07:00
+  version: 0.7.0
+date: 2008-01-23 00:00:00 -07:00
 summary: A game library for Ruby
 require_paths: 
 - lib
@@ -34,13 +34,15 @@ files:
 - README.txt
 - bin/zyps
 - bin/zyps_demo
-- bin/zyps_server
 - lib/zyps
 - lib/zyps/actions.rb
 - lib/zyps/conditions.rb
 - lib/zyps/environmental_factors.rb
 - lib/zyps/remote.rb
 - lib/zyps/views
+- lib/zyps/views/canvas
+- lib/zyps/views/canvas/gtk2.rb
+- lib/zyps/views/canvas/wx.rb
 - lib/zyps/views/trails.rb
 - lib/zyps.rb
 - test/test_zyps.rb
@@ -63,11 +65,17 @@ extra_rdoc_files:
 - COPYING.txt
 executables: 
 - zyps
-- zyps_demo
-- zyps_server
 extensions: []
 
-requirements: 
-- - Ruby-GNOME2
-dependencies: []
+requirements: []
 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: wxruby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.9.2
+    version: 

data/bin/zyps_server

@@ -1,235 +0,0 @@
-#!/usr/local/bin/ruby
-
-# 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/>.
-
-
-gems_loaded = false
-begin
-	require 'optparse'
-	require 'zyps'
-	require 'zyps/actions'
-	require 'zyps/conditions'
-	require 'zyps/environmental_factors'
-	require 'zyps/remote'
-	require 'zyps/views/trails'
-	require 'drb'
-rescue LoadError
-	if gems_loaded == false
-		require 'rubygems'
-		gems_loaded = true
-		retry
-	else
-		raise
-	end
-end
-
-
-include Zyps
-
-
-DEFAULT_VIEW_WIDTH = 800
-DEFAULT_VIEW_HEIGHT = 600
-DEFAULT_MAX_SPEED = 500
-DEFAULT_MAX_POPULATION = 100
-DEFAULT_FPS = 60
-
-
-#A server for a Zyps Environment.
-class ZypsServer
-
-	#Port to open service on.
-	attr_accessor :uri
-	#Maximum allowed number of objects.
-	attr_accessor :max_population
-	#View dimensions.
-	attr_accessor :view_width, :view_height
-	
-	#Set up default values.
-	def initialize(
-		uri = nil,
-		view_width = DEFAULT_VIEW_WIDTH,
-		view_height = DEFAULT_VIEW_HEIGHT,
-		fps = DEFAULT_FPS,
-		max_population = DEFAULT_MAX_POPULATION,
-		max_speed = DEFAULT_MAX_SPEED,
-		enclosure = true
-	)
-		@uri, @view_width, @view_height, @fps, @max_population, @max_speed, @enclosure =
-		uri, view_width, view_height, fps, max_population, max_speed, enclosure
-	end
-
-	#Create app window, game environment, view, and network service.
-	def main
-	
-		#A clock to track frames to draw this second.
-		clock = Clock.new
-		time_per_frame = 1.0 / @fps
-	
-		#Create a window, and set GTK up to quit when it is closed.
-		window = Gtk::Window.new
-		window.signal_connect("delete_event") {false}
-		window.signal_connect("destroy") {Gtk.main_quit}
-		
-		#Add view to window.
-		view = TrailsView.new(@view_width, @view_height)
-		window.add(view.canvas)
-		window.show_all
-		
-		#Create environment.
-		environment = Environment.new
-		
-		#Point view at environment.
-		environment.add_observer(view)
-		
-		#Limit population.
-		environment.environmental_factors << PopulationLimit.new(environment, @max_population) if @max_population
-		
-		#Limit speed of objects.
-		environment.environmental_factors << SpeedLimit.new(@max_speed) if @max_speed
-		
-		#Keep objects on screen.
-		if @enclosure
-			enclosure = Enclosure.new()
-			enclosure.left = 0
-			enclosure.bottom = 0
-			enclosure.top = @view_height
-			enclosure.right = @view_width
-			environment.environmental_factors << enclosure
-		end
-		
-		#Create thread to update environment.
-		update_thread = Thread.new do
-		
-			begin
-			
-				loop do
-				
-					begin
-						environment.interact
-					rescue Exception => exception
-						puts exception, exception.backtrace
-						puts environment.inspect
-					end
-					
-					#Control population.
-					environment.objects.shift while environment.objects.length > @max_population
-
-					#Determine how much time is left in this frame.
-					time_left_in_frame = time_per_frame - clock.elapsed_time
-					#Sleep for the remaining time.
-					if time_left_in_frame > 0
-						sleep time_left_in_frame
-					#Skip a frame if things are going too slow.
-					else
-						sleep time_per_frame
-					end
-					
-				end
-				
-			rescue Exception => exception
-				puts exception, exception.backtrace
-			end
-			
-		end
-		
-		#Start a network service.
-		server = EnvironmentServer.new(environment, @uri)
-		server.start
-		#Display our URI.
-		puts "Zyps server active at #{server.uri}"
-		
-		#Disable file system access.
-		$SAFE = 2
-
-		#Activate the GUI.
-		Gtk.main
-		
-	end
-	
-	
-	#Set attributes according to command-line arguments.
-	def process_options(arguments)
-	
-		#Set up option parser.
-		options = OptionParser.new
-		
-		#Define valid options.
-		options.on("-h", "--help", TrueClass, "Display program help.") {
-			puts options.help
-			exit
-		}
-		options.on(
-			"-m",
-			"--max-population [number]",
-			Integer,
-			"The maximum number of allowed game objects.  #{DEFAULT_MAX_POPULATION} by default."
-		) {|value| @max_population = value}
-		options.on(
-			"-s",
-			"--max-speed [number]",
-			Integer,
-			"The fastest an object can go.  #{DEFAULT_MAX_SPEED ? DEFAULT_MAX_SPEED : 'No limit'} by default."
-		) {|value| @max_speed = value}
-		options.on(
-			"-n",
-			"--no-enclosure",
-			"Disables the barrier that normally keeps objects on the screen."
-		) {|value| @enclosure = false}
-		options.on(
-			"-u",
-			"--uri [uri]",
-			String,
-			"dRuby URI to run the server on.  If not defined, one will be selected and printed to STDOUT."
-		) {|value| @uri = value}
-		options.on(
-			"-f",
-			"--fps [frames]",
-			Integer,
-			"Number of frames to draw per second.  #{DEFAULT_FPS} by default."
-		) {|value| @fps = value}
-		options.on(
-			"--view-width [pixels]",
-			Integer,
-			"Window width.  #{DEFAULT_VIEW_WIDTH} by default."
-		) {|value| @view_width = value}
-		options.on(
-			"--view-height [pixels]",
-			Integer,
-			"Window height.  #{DEFAULT_VIEW_HEIGHT} by default."
-		) {|value| @view_height = value}
-		
-		#Parse the options, printing usage if parsing fails.
-		options.parse(arguments) rescue puts "#{$!}\nType '#{$0} --help' for valid options."
-		
-	end
-
-
-end
-
-
-begin
-	#Create a server.
-	server = ZypsServer.new
-	#Parse the command line.
-	server.process_options(ARGV)
-	#Start the server.
-	server.main
-rescue => exception
-	#Print error to STDERR and exit with an abnormal status.
-	abort "Error: " + exception.message + exception.backtrace.join("\n")
-end