zyps 0.7.1 → 0.7.2

data/bin/zyps

@@ -22,6 +22,7 @@ gems_loaded = false
 begin
 	require 'logger'
 	require 'wx'
+	require 'yaml'
 	require 'zyps'
 	require 'zyps/actions'
 	require 'zyps/conditions'
@@ -79,7 +80,7 @@ class Application < Wx::App
 			:uri => nil,
 		}.merge(options)
 		@log.debug "options: #{@options.inspect}"
-	
+		
 	end
 	
 
@@ -98,19 +99,29 @@ class Application < Wx::App
 		frame.evt_close {on_exit}
 		
 		@log.debug "Create a view and canvas."
-		drawing_area = Wx::Window.new(frame)
-		drawing_area.min_size = [0, 0]
-		frame.sizer.add(drawing_area, 1, Wx::GROW)
+		@drawing_area = Wx::Window.new(frame)
+		@drawing_area.min_size = [0, 0]
+		frame.sizer.add(@drawing_area, 1, Wx::GROW)
 		@view = TrailsView.new(
 			:width => @options[:width],
 			:height => @options[:height],
-			:canvas => WxCanvas.new(drawing_area)
+			:canvas => WxCanvas.new
 		)
 		@log.debug "Set up mouse click/drag handlers for canvas."
 		@press_location = nil
-		drawing_area.evt_left_down {|event| on_mouse_press(event)}
-		drawing_area.evt_left_up {|event| on_mouse_release(event)}
-		@log.debug "Resize view and enclosure when canvas changes size."
+		@drawing_area.evt_left_down {|event| on_mouse_press(event)}
+		@drawing_area.evt_left_up {|event| on_mouse_release(event)}
+		#Whenever the drawing area needs updating, copy the view's buffer over.
+		@drawing_area.evt_paint {|event| @drawing_area.paint {|dc| render(dc)}}
+		
+		@log.debug "Create menus."
+		@menus = MenuSet.new(frame)
+		evt_menu(@menus.open_menu) {|event| on_open_menu(event)}
+		evt_menu(@menus.save_menu) {|event| on_save_menu(event)}
+		evt_menu(@menus.save_as_menu) {|event| on_save_as_menu(event)}
+		evt_menu(@menus.exit_menu) {|event| on_exit}
+		evt_menu(@menus.using_zyps_menu) {|event| on_using_zyps_menu(event)}
+		evt_menu(@menus.about_menu) {|event| on_about_menu(event)}
 
 		@log.debug "Create an interface."
 		@controls = ControlPanel.new(frame)
@@ -134,8 +145,8 @@ class Application < Wx::App
 			@enclosure = Enclosure.new(
 				:left => 0,
 				:bottom => 0,
-				:top => drawing_area.size.height,
-				:right => drawing_area.size.width
+				:top => @drawing_area.size.height,
+				:right => @drawing_area.size.width
 			)
 			@environment.environmental_factors << @enclosure
 		end
@@ -163,14 +174,19 @@ class Application < Wx::App
 	#Update environment and view.
 	def on_timer
 		#Resize playfield if window has been resized.
-		if @view.height != @view.canvas.drawing_area.size.height || @view.width != @view.canvas.drawing_area.size.width
-			@view.height = @view.canvas.drawing_area.size.height
-			@view.width = @view.canvas.drawing_area.size.width
-			@enclosure.top = @view.canvas.drawing_area.size.height
-			@enclosure.right = @view.canvas.drawing_area.size.width
+		if @view.height != @drawing_area.size.height || @view.width != @drawing_area.size.width
+			@view.height = @drawing_area.size.height
+			@view.width = @drawing_area.size.width
+			@enclosure.top = @drawing_area.size.height
+			@enclosure.right = @drawing_area.size.width
 		end
 		#Update environment.
 		@environment.interact
+		#Update viewing area.
+		@drawing_area.paint do |dc|
+			#Copy from View to drawing area.
+			render(dc)
+		end
 		#Keeps dead objects from accumulating and causing hiccups later.
 		GC.start
 	end
@@ -217,6 +233,150 @@ class Application < Wx::App
 	end
 	
 	
+	#Takes a Wx::DC to copy the view to.
+	def render(dc)
+		#Copy the buffer to the device context.
+		dc.draw_bitmap(@view.canvas.buffer, 0, 0, false)
+	end	
+		
+	
+	#Let user choose an environment save file.
+	def on_open_menu(event)
+		@log.debug "Set up a dialog to open a .zyp file.  Retain the directory the user moves to."
+		dialog = Wx::FileDialog.new(
+			@frame,
+			:wildcard => "*.zyp",
+			:style => Wx::FD_OPEN | Wx::FD_CHANGE_DIR
+		)
+		@log.debug "Act only if user presses OK."
+		if dialog.show_modal == Wx::ID_OK
+			begin
+				@environment.objects = YAML.load_file(dialog.path)
+				@object_file = dialog.path
+			rescue Exception => exception
+				show_alert(exception.message)
+			end
+		end
+	end
+	
+	
+	#Save environment to file, or choose a file if none is selected.
+	def on_save_menu(event)
+		if @object_file
+			begin
+				save_objects(@object_file)
+			rescue Exception => exception
+				show_alert(exception.message)
+				on_save_as_menu(event)
+			end
+		else
+			on_save_as_menu(event)
+		end
+	end
+	
+	
+	#Let user provide a file name to save the environment to.
+	def on_save_as_menu(event)
+		@log.debug "Set up a dialog to save a .zyp file."
+		@log.debug "Retain the directory the user moves to."
+		@log.debug "Prompt before overwriting a file."
+		dialog = Wx::FileDialog.new(
+			@frame,
+			:wildcard => "*.zyp",
+			:style => Wx::FD_SAVE | Wx::FD_CHANGE_DIR | Wx::FD_OVERWRITE_PROMPT
+		)
+		@log.debug "Act only if user presses OK."
+		if dialog.show_modal == Wx::ID_OK
+			begin
+				save_objects(dialog.path)
+				@object_file = dialog.path
+			rescue Exception => exception
+				show_alert(exception.message)
+			end
+		end
+	end
+	
+	
+	#Display program info.
+	def on_about_menu(event)
+		show_message(<<EOD)
+Zyps
+
+http://jay.mcgavren.com/zyps
+
+Copyright Jay McGavren, jay@mcgavren.com
+
+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/>.
+EOD
+	end
+	
+	
+	#Display program info.
+	def on_using_zyps_menu(event)
+		show_message(<<EOD)
+Creating Creatures
+Use the check boxes at the right to select the actions you want new creatures to perform.  Then click inside the playfield at the left to create a creature.
+You can "launch" a creature by clicking and dragging the mouse in the playfield, then releasing.  The new creature will travel in the direction you drag the mouse cursor.
+
+Controlling the View
+The "Length" slider controls the length of the tail behind each creature.
+Check the "Trails" checkbox to have creatures leave a winding trail behind them as they travel.  Uncheck it to make all trails disappear.
+
+Controlling the Environment
+Click the "Clear" button to clear all creatures from the environment (any trails will still be left behind).
+
+Saving and Loading
+Use the "Save As..." and "Save" menus under the File menu to save the environment to a ".zyp" file.  When you later reopen the file via the "Load" menu, all your creatures will be brought back.
+EOD
+	end
+	
+	
+	#Save environment objects to the given path.
+	def save_objects(path)
+		File.open(path, "w") {|file| YAML.dump(@environment.objects, file)}
+	end
+	
+	
+	#Display an alert to the user.
+	def show_alert(message)
+		Wx::MessageDialog.new(
+			@frame,
+			:message => message,
+			:caption => "Alert",
+			:style => Wx::OK
+		).show_modal
+	end
+
+	
+	#Display a message to the user.
+	def show_message(message)
+		dialog = Wx::Dialog.new(@frame)
+		dialog.sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+		text = Wx::TextCtrl.new(
+			dialog,
+			:style => Wx::TE_READONLY | Wx::TE_MULTILINE,
+			:value => message
+		)
+		dialog.sizer.add(text, 1, Wx::EXPAND)
+		ok_button = Wx::Button.new(dialog, Wx::ID_OK, "OK")
+		dialog.sizer.add(ok_button, 0, Wx::ALIGN_CENTER_HORIZONTAL)
+		ok_button.set_default
+		ok_button.set_focus
+		dialog.show_modal
+	end
+	
+	
 end
 
 
@@ -232,6 +392,93 @@ end
 
 
 
+#Application menu system.
+class MenuSet
+
+
+	attr_accessor :open_menu
+	attr_accessor :save_menu
+	attr_accessor :save_as_menu
+	attr_accessor :exit_menu
+	attr_accessor :using_zyps_menu
+	attr_accessor :about_menu
+
+
+	#Takes the frame that will be its parent.
+	def initialize(parent)
+	
+		menu_bar = Wx::MenuBar.new
+		
+		file_menu = Wx::Menu.new
+		@open_menu = add_item(
+			file_menu,
+			:label => "&Open...\tCtrl+O",
+			:id => Wx::ID_OPEN
+		)
+		@save_menu = add_item(
+			file_menu,
+			:label => "&Save\tCtrl+S",
+			:id => Wx::ID_SAVE
+		)
+		@save_as_menu = add_item(
+			file_menu,
+			:label => "Save &As...\tCtrl+Shift+S",
+			:id => Wx::ID_SAVEAS
+		)
+		file_menu.append_separator
+		@exit_menu = add_item(
+			file_menu,
+			:label => "E&xit",
+			:id => Wx::ID_EXIT
+		)
+		menu_bar.append(file_menu, "&File")
+		
+		help_menu = Wx::Menu.new
+		@using_zyps_menu = add_item(
+			help_menu,
+			:label => "&Using Zyps",
+			:id => Wx::ID_HELP_CONTENTS
+		)
+		help_menu.append_separator
+		@about_menu = add_item(
+			help_menu,
+			:label => "&About",
+			:id => Wx::ID_ABOUT
+		)
+		menu_bar.append(help_menu, "&Help")
+		
+		parent.set_menu_bar(menu_bar)
+		
+	end
+
+	
+	private
+	
+	
+		def add_item(parent, options = {})
+			options = {
+				:id => Wx::ID_ANY,
+				:label => "",
+				:help_string => "",
+				:kind => Wx::ITEM_NORMAL,
+				:sub_menu => nil,
+			}.merge(options)
+			item = Wx::MenuItem.new(
+				parent,
+				options[:id],
+				options[:label],
+				options[:help_string],
+				options[:kind],
+				options[:sub_menu]
+			)
+			parent.append_item(item)
+			item
+		end
+	
+end
+
+
+
 #Controls for manipulating the environment.
 class ControlPanel < Wx::Panel
 
@@ -248,6 +495,7 @@ class ControlPanel < Wx::Panel
 	attr_accessor :clear_button
 
 
+	#Takes the frame/control that will be its parent.
 	def initialize(parent)
 	
 		super(parent)
@@ -304,7 +552,9 @@ class ControlPanel < Wx::Panel
 		
 		#Create a button with the given options, and add it to the given container.
 		def add_button(parent, options = {})
-			add_control(Wx::Button.new(parent, options))
+			control = Wx::Button.new(parent, options)
+			control.parent.sizer.add(control, 0, Wx::ALIGN_CENTER_HORIZONTAL|Wx::ALL, 3)
+			control
 		end
 		
 		#Create the given label, and add it to the given container.

data/bin/zyps-175

@@ -0,0 +1,514 @@
+#!/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 'gtk2'
+	require 'optparse'
+	require 'zyps'
+	require 'zyps/actions'
+	require 'zyps/conditions'
+	require 'zyps/environmental_factors'
+	require 'zyps/remote'
+	require 'zyps/views/trails'
+	require 'zyps/views/canvas/gtk2'
+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 = 200
+DEFAULT_MAX_POPULATION = 100
+DEFAULT_FPS = 60
+
+
+class Application
+
+	#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
+	
+	#Create app window, game environment, and view.
+	#Set up default values.
+	#Takes a hash with these keys and defaults:
+	#	: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
+	def initialize(options = {})
+		
+		options = {
+			: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
+		}.merge(options)
+		
+		@uri, @view_width, @view_height, @fps, @max_population, @max_speed, @enclosure =
+		options[:uri], options[:view_width], options[:view_height], options[:fps], options[:max_population], options[:max_speed], options[:enclosure]
+		
+	end
+	
+	
+	def main
+	
+		#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}
+		
+		#Create environment.
+		@environment = Environment.new
+		
+		#Set up controls.
+		#Also initializes @view.
+		window.add(
+			create_controls(
+				:view_width => @view_width,
+				:view_height => @view_height,
+				:spacing => 2
+			)
+		)
+	
+		#Show all widgets.
+		window.show_all
+			
+		#Point view at environment.
+		@environment.add_observer(@view)
+		
+		#Keep objects on screen.
+		if @enclosure
+			enclosure = Enclosure.new(
+				:left => 0,
+				:bottom => 0,
+				:top => @view_height,
+				:right => @view_width
+			)
+			@environment.environmental_factors << enclosure
+		end
+		
+		#Keep all objects under a certain speed.
+		@environment.environmental_factors << SpeedLimit.new(@max_speed) if @max_speed
+		
+		#Limit population.
+		@environment.environmental_factors << PopulationLimit.new(@max_population) if @max_population
+		
+		#Set up a creature generator.
+		@generator = CreatureGenerator.new(@environment)
+
+		#Create thread to update environment.
+		thread = Thread.new do
+		
+			begin
+			
+				drawing_clock = Clock.new
+				time_per_frame = 1.0 / @fps
+				
+				loop do
+
+					@environment.interact
+					
+					#Determine how much time is left in this frame.
+					time_left_in_frame = (time_per_frame) - drawing_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.
+		if @uri
+			server = EnvironmentServer.new(@environment, @uri)
+			server.start
+			#Disable file system access.
+			$SAFE = 2
+		end
+
+		
+		#Activate the GUI.
+		Gtk.main
+		
+	end
+	
+	
+	#Create a view and controls.
+	#Takes a hash with these defaults:
+	#	:view_width => @view_width
+	#	:view_height => @view_height
+	#	:homogeneous => false
+	#	:spacing => 0
+	#	:expand => false
+	#	:fill => false
+	#	:padding => 0
+	def create_controls(options = {})
+	
+		options = {
+			:view_width => @view_width,
+			:view_height => @view_height,
+			:homogeneous => false,
+			:spacing => 0,
+			:expand => false,
+			:fill => false,
+			:padding => 0,
+		}.merge(options)
+		
+		#Create a container for the view and controls.
+		interface = Gtk::HBox.new(options[:homogeneous], options[:spacing])
+		
+		#Add view to interface.
+		@view = TrailsView.new(
+			:width => options[:view_width],
+			:height => options[:view_height],
+			:trail_length => 5
+		)
+		drawing_window = Gtk::DrawingArea.new
+		@view.canvas = GTK2Canvas.new(drawing_window)
+		interface.pack_start(drawing_window, options[:expand], options[:fill], options[:padding])
+		
+		#When mouse button pressed, record location for use in release event handler.
+		drawing_window.add_events(Gdk::Event::BUTTON_PRESS_MASK)
+		drawing_window.signal_connect("button-press-event") do |canvas, event|
+			@press_location = Location.new(event.x, event.y)
+		end
+		
+		#Create a creature on button release.
+		drawing_window.add_events(Gdk::Event::BUTTON_RELEASE_MASK)
+		drawing_window.signal_connect("button-release-event") do |canvas, event|
+			#Ensure the mouse was pressed within the canvas.
+			if @press_location
+				#Create creature at release location.
+				@release_location = Location.new(event.x, event.y)
+				@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.
+					:turn => @turn_flag.active?,
+					:approach => @approach_flag.active?,
+					:flee => @flee_flag.active?,
+					:push => @push_flag.active?,
+					:pull => @pull_flag.active?,
+					:breed => @breed_flag.active?,
+					:eat => @eat_flag.active?
+				)
+				#Nullify press location, as it is no longer applicable.
+				@press_location = nil
+			end
+		end
+		
+		#Create a VBox for all controls.
+		control_panel = Gtk::VBox.new(options[:homogeneous], options[:spacing])
+		
+		#Create a group for the actions.
+		action_controls = Gtk::VBox.new(options[:homogeneous], options[:spacing])
+		action_controls.pack_start(Gtk::Label.new("Actions"), options[:expand], options[:fill], options[:padding])
+		@turn_flag = Gtk::CheckButton.new("Turn")
+		action_controls.pack_start(@turn_flag, options[:expand], options[:fill], options[:padding])
+		@approach_flag = Gtk::CheckButton.new("Chase")
+		action_controls.pack_start(@approach_flag, options[:expand], options[:fill], options[:padding])
+		@flee_flag = Gtk::CheckButton.new("Flee")
+		action_controls.pack_start(@flee_flag, options[:expand], options[:fill], options[:padding])
+		@push_flag = Gtk::CheckButton.new("Push")
+		action_controls.pack_start(@push_flag, options[:expand], options[:fill], options[:padding])
+		@pull_flag = Gtk::CheckButton.new("Pull")
+		action_controls.pack_start(@pull_flag, options[:expand], options[:fill], options[:padding])
+		@breed_flag = Gtk::CheckButton.new("Breed")
+		action_controls.pack_start(@breed_flag, options[:expand], options[:fill], options[:padding])
+		@eat_flag = Gtk::CheckButton.new("Eat")
+		action_controls.pack_start(@eat_flag, options[:expand], options[:fill], options[:padding])
+		#Add the action controls to the panel.
+		control_panel.pack_start(action_controls, options[:expand], options[:fill], options[:padding])
+		
+		#Create a group for environment controls.
+		environment_controls = Gtk::VBox.new(options[:homogeneous], options[:spacing])
+		environment_controls.pack_start(Gtk::Label.new("Length"), options[:expand], options[:fill], options[:padding])
+		@trail_length_slider = Gtk::HScale.new(2, 100, 1)
+		@trail_length_slider.signal_connect("value-changed") {
+			@view.trail_length = @trail_length_slider.value
+		}
+		@trail_length_slider.value = 5
+		environment_controls.pack_start(@trail_length_slider, options[:expand], options[:fill], options[:padding])
+		@trails_flag = Gtk::CheckButton.new("Trails")
+		@trails_flag.signal_connect("toggled") {
+			@view.erase_flag = ! @trails_flag.active?
+		}
+		@trails_flag.active = false
+		environment_controls.pack_start(@trails_flag, options[:expand], options[:fill], options[:padding])
+		@clear_button = Gtk::Button.new("Clear")
+		@clear_button.signal_connect("clicked") {
+			@environment.objects = []
+		}
+		environment_controls.pack_start(@clear_button, options[:expand], options[:fill], options[:padding])
+		#Add the environment controls to the BOTTOM of the panel.
+		control_panel.pack_end(environment_controls, options[:expand], options[:fill], options[:padding])
+		
+		#Add the control panel to the interface.
+		interface.pack_start(control_panel, options[:expand], options[:fill], options[:padding])
+		
+		interface
+		
+	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,
+			"URI to serve the environment on via dRuby.  If not specified, no server will be started."
+		) {|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
+
+
+
+class CreatureGenerator
+	
+	#Environment creatures will be added to.
+	attr_accessor :environment
+	#Default required proximity for actions.
+	attr_accessor :default_proximity
+	#Rate of new TurnActions.
+	attr_accessor :turn_rate
+	#Acceleration rate of new ApproachActions.
+	attr_accessor :approach_rate
+	#Acceleration rate of new FleeActions.
+	attr_accessor :flee_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.
+		@default_proximity = 200
+		@approach_rate = 200
+		@flee_rate = @approach_rate
+		@push_strength = @approach_rate * 2
+		@pull_strength = @push_strength * 0.75
+		@turn_rate = @approach_rate * 1.1
+		@turn_angle = 90
+		@breed_rate = 10
+		
+	end
+
+
+	#Create a creature and add it to the environment.
+	def create_creature(options = {})
+	
+		options = {
+			:x => 0,
+			:y => 0,
+			:speed => 1,
+			:pitch => 0,
+			:action_proximity => @default_proximity,
+			:turn => false,
+			:approach => false,
+			:flee => false,
+			:push => false,
+			:pull => false,
+			:breed => false,
+			:eat => false,
+		}.merge(options)
+		
+		#Create a creature.
+		creature = Creature.new(
+			:location => Location.new(options[:x], options[:y]),
+			:vector => Vector.new(options[:speed], options[:pitch]),
+			:size => 5
+		)
+		
+		#Set up actions and merge colors according to selected behaviors.
+		color = Color.new(0.25, 0.25, 0.25)
+		if options[:turn]
+			color.blue += 1
+			creature.behaviors << Behavior.new(
+				:actions => [TurnAction.new(@turn_rate, @turn_angle)],
+				:conditions => [ProximityCondition.new(options[:action_proximity] * 2)]
+			)
+		end
+		if options[:approach]
+			color.red += 1
+			creature.behaviors << create_behavior(
+				:actions => [ApproachAction.new(@approach_rate)],
+				:conditions => [ProximityCondition.new(options[:action_proximity])]
+			)
+		end
+		if options[:flee]
+			color.red += 0.5; color.green += 0.5 #Yellow.
+			creature.behaviors << create_behavior(
+				:actions => [FleeAction.new(@flee_rate)],
+				:conditions => [ProximityCondition.new(options[:action_proximity] * 0.5)]
+			)
+		end
+		if options[:push]
+			color.red += 0.5; color.blue += 0.5 #Purple.
+			creature.behaviors << create_behavior(
+				:actions => [PushAction.new(@push_strength)],
+				:conditions => [ProximityCondition.new(options[:action_proximity] * 0.25)]
+			)
+		end
+		if options[:pull]
+			color.blue += 0.75; color.green += 0.75 #Aqua.
+			creature.behaviors << create_behavior(
+				:actions => [PullAction.new(@pull_strength)],
+				:conditions => [ProximityCondition.new(options[:action_proximity] * 0.75)]
+			)
+		end
+		if options[:breed]
+			color.green -= 0.1 #Make a bit redder.
+			color.blue -= 0.1
+			creature.behaviors << create_behavior(
+				:actions => [BreedAction.new(@environment, @breed_rate)],
+				:conditions => [CollisionCondition.new] #The default ProximityCondition won't do.
+			)
+		end
+		if options[:eat]
+			color.green += 1
+			creature.behaviors << create_behavior(
+				:actions => [EatAction.new(@environment)],
+				:conditions => [
+					CollisionCondition.new, #The default ProximityCondition won't do.
+					StrengthCondition.new #The eater should be as strong or stronger than its dinner.
+				] 
+			)
+		end
+		
+		creature.color = color
+		
+		@environment.objects << creature
+		
+	end
+	
+	
+	def create_behavior(options = {})
+	
+		options = {
+			:actions => [],
+			:conditions => [ProximityCondition.new(@default_proximity)],
+		}.merge(options)
+		
+		behavior = Behavior.new
+		behavior.actions = options[:actions]
+		behavior.conditions = options[:conditions]
+		behavior
+		
+	end
+	
+	
+end
+
+
+
+begin
+	#Create a server.
+	application = Application.new
+	#Parse the command line.
+	application.process_options(ARGV)
+	#Start the server.
+	application.main
+rescue => exception
+	#Print error to STDERR and exit with an abnormal status.
+	abort "Error: " + exception.message + exception.backtrace.join("\n")
+end

data/bin/zyps_demo

@@ -70,7 +70,6 @@ class Demo < Wx::App
 		say "First, we need to create a Frame (window) to hold everything."
 		frame = Wx::Frame.new(nil, :size => [WIDTH, HEIGHT], :title => "Zyps Demo")
 		frame.evt_close {|event| exit}
-		frame.show
 		
 		say "Zyps environments are displayed using Views."
 		say "A TrailsView shows game objects with little light trails behind them."
@@ -80,7 +79,11 @@ class Demo < Wx::App
 		)
 		say "We also assign the View a Canvas to draw to."
 		say "Since our framework is wxWidgets, we'll use a WxCanvas."
-		view.canvas = WxCanvas.new(frame)
+		view.canvas = WxCanvas.new
+		
+		say "We need a place to draw our View to."
+		say "We'll add a Wx::Window to the Frame."
+		window = Wx::Window.new(frame)
 		
 		say "The world is called an Environment in Zyps.  Let's create a new one."
 		@environment = Environment.new
@@ -96,14 +99,21 @@ class Demo < Wx::App
 		timer_id = Wx::ID_HIGHEST + 1
 		timer = Wx::Timer.new(self, timer_id)
 		say "The timer will trigger the environment update."
+		say "Then it copies the updated view's buffer to our window."
 		say "We also call the Ruby garbage collector with each update."
 		say "This keeps dead objects from accumulating and causing hiccups later."
 		evt_timer(timer_id) do
 			@environment.interact
+			window.paint do |surface|
+				surface.draw_bitmap(view.canvas.buffer, 0, 0, false)
+			end
 			GC.start
 		end
 		timer.start(milliseconds_per_frame)
 		
+		say "Our final setup step is to show the window that will display it all."
+		frame.show
+		
 	end
 	
 	

data/lib/zyps/views/canvas/wx.rb

@@ -23,34 +23,25 @@ module Zyps
 
 
 #Called by View objects for use in wxRuby applications.
-#Assign an instance to a View, then add the drawing_area attribute to a GUI container object.
-#The drawing area will be updated whenever the View is.
+#Assign an instance to a View, and the drawing_area will be updated whenever the View is.
 class WxCanvas
 
 
-	#A wxWidgets window that will be painted on.
-	attr_reader :drawing_area
+	#A Wx::Bitmap that will be painted on.
+	attr_reader :buffer
 	#Dimensions of the drawing area.
 	#Control should normally be left to the owner View object.
 	attr_reader :width, :height
 
-	#Takes the wxRuby GUI object that will be its parent.
-	def initialize (drawing_area)
-	
-		@drawing_area = drawing_area
+
+	def initialize
 	
 		#Will be resized later.
-		@width = @drawing_area.size.width
-		@height = @drawing_area.size.height
+		@width, @height = 1, 1
 
 		#Set to correct size.
 		resize
 		
-		#Whenever the drawing area needs updating...
-		@drawing_area.evt_paint do |event|
-			render
-		end
-		
 		#Arrays of shapes that will be painted when render() is called.
 		@rectangle_queue = []
 		@line_queue = []
@@ -111,14 +102,15 @@ class WxCanvas
 			#Draw all queued lines.
 			render_lines(surface)
 		end
-		#Copy offscreen bitmap to screen.
-		@drawing_area.paint do |dc|
-			#Copy the buffer to the viewable window.
-			dc.draw_bitmap(buffer, 0, 0, false)
-		end
 	end
 				
 	
+	#The Wx::Bitmap to draw to.
+	def buffer
+		@buffer ||= Wx::Bitmap.new(@width, @height)
+	end
+
+	
 	private
 
 	
@@ -136,12 +128,6 @@ class WxCanvas
 		def resize
 			@buffer = nil #Causes buffer to reset its size next time it's accessed.
 		end
-	
-		
-		#The Wx::Bitmap to draw to.
-		def buffer
-			@buffer ||= Wx::Bitmap.new(@width, @height)
-		end
 
 		
 		#Draw all queued rectangles to the given GC.

metadata

@@ -1,88 +1,82 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.2
+specification_version: 1
 name: zyps
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
+date: 2008-01-29 00:00:00 -07:00
+summary: A game library for Ruby
+require_paths: 
+- lib
+email: jay@mcgavren.com
+homepage: http://jay.mcgavren.com/zyps/
+rubyforge_project: zyps
+description: 
+autorequire: zyps
+default_executable: 
+bindir: bin
+has_rdoc: true
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
 - Jay McGavren
-autorequire: zyps
-bindir: bin
-cert_chain: []
-
-date: 2008-01-25 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: wxruby
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.9.2
-    version: 
-description: 
-email: jay@mcgavren.com
-executables: 
-- zyps
-extensions: []
-
-extra_rdoc_files: 
-- README.txt
-- COPYING.LESSER.txt
-- COPYING.txt
 files: 
 - COPYING.LESSER.txt
 - COPYING.txt
 - README.txt
-- bin/zyps_demo
 - bin/zyps
+- bin/zyps-175
+- bin/zyps_demo
 - 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/remote.rb
-- lib/zyps/environmental_factors.rb
-- lib/zyps/actions.rb
-- lib/zyps/conditions.rb
 - lib/zyps.rb
+- test/test_zyps.rb
 - test/zyps
+- test/zyps/test_actions.rb
 - test/zyps/test_behaviors.rb
+- test/zyps/test_conditions.rb
 - test/zyps/test_environmental_factors.rb
 - test/zyps/test_remote.rb
-- test/zyps/test_actions.rb
-- test/zyps/test_conditions.rb
+test_files: 
 - test/test_zyps.rb
-has_rdoc: true
-homepage: http://jay.mcgavren.com/zyps/
-post_install_message: 
 rdoc_options: 
 - --title
 - Zyps - A game library for Ruby
 - --main
 - README.txt
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+extra_rdoc_files: 
+- README.txt
+- COPYING.LESSER.txt
+- COPYING.txt
+executables: 
+- zyps
+extensions: []
+
 requirements: []
 
-rubyforge_project: zyps
-rubygems_version: 1.0.1
-signing_key: 
-specification_version: 2
-summary: A game library for Ruby
-test_files: 
-- test/test_zyps.rb
+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: