zyps 0.7.0 → 0.7.1

data/bin/zyps

@@ -98,19 +98,20 @@ 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)
 		@view = TrailsView.new(
 			:width => @options[:width],
 			:height => @options[:height],
-			:canvas => WxCanvas.new(frame)
+			:canvas => WxCanvas.new(drawing_area)
 		)
-		frame.sizer.add(@view.canvas.drawing_area, 1, Wx::GROW)
 		@log.debug "Set up mouse click/drag handlers for canvas."
 		@press_location = nil
-		@view.canvas.drawing_area.evt_left_down {|event| on_mouse_press(event)}
-		@view.canvas.drawing_area.evt_left_up {|event| on_mouse_release(event)}
+		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."
-		@view.canvas.drawing_area.evt_size {|event| on_view_resize(event)}
-		
+
 		@log.debug "Create an interface."
 		@controls = ControlPanel.new(frame)
 		@controls.clear_button.evt_button(@controls.clear_button.get_id) do |event|
@@ -133,8 +134,8 @@ class Application < Wx::App
 			@enclosure = Enclosure.new(
 				:left => 0,
 				:bottom => 0,
-				:top => @view.canvas.drawing_area.size.height,
-				:right => @view.canvas.drawing_area.size.width
+				:top => drawing_area.size.height,
+				:right => drawing_area.size.width
 			)
 			@environment.environmental_factors << @enclosure
 		end
@@ -149,18 +150,31 @@ class Application < Wx::App
 		@log.debug "Timer will fire every #{milliseconds_per_frame} milliseconds."
 		timer_id = Wx::ID_HIGHEST + 1
 		timer = Wx::Timer.new(self, timer_id)
-		evt_timer(timer_id) do
-			@environment.interact
-			#Keeps dead objects from accumulating and causing hiccups later.
-			GC.start
-		end
+		evt_timer(timer_id) {on_timer}
 		timer.start(milliseconds_per_frame)
 		
 		@log.debug "Display GUI."
+		frame.send_size_event
 		frame.show
 	
 	end
 
+
+	#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
+		end
+		#Update environment.
+		@environment.interact
+		#Keeps dead objects from accumulating and causing hiccups later.
+		GC.start
+	end
+	
 	
 	#Save config and shut down.
 	def on_exit
@@ -203,15 +217,6 @@ class Application < Wx::App
 	end
 	
 	
-	#Resize objects that are dependent on the view size.
-	def on_view_resize(event)
-		@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
-	end
-	
-	
 end
 
 
@@ -248,7 +253,7 @@ class ControlPanel < Wx::Panel
 		super(parent)
 		self.sizer = Wx::BoxSizer.new(Wx::VERTICAL)
 
-		action_controls = add_panel(self)
+		action_controls = add_panel(self, :proportion => 2)
 		add_label(action_controls, :label => "Actions")
 		@turn_flag = add_check_box(action_controls, :label => "Turn")
 		@approach_flag = add_check_box(action_controls, :label => "Chase")
@@ -258,13 +263,13 @@ class ControlPanel < Wx::Panel
 		@breed_flag = add_check_box(action_controls, :label => "Breed")
 		@eat_flag = add_check_box(action_controls, :label => "Eat")
 		
-		display_controls = add_panel(self)
+		display_controls = add_panel(self, :proportion => 1)
 		add_label(display_controls, :label => "Length")
 		@length_slider = add_slider(display_controls, :min_value => 2, :max_value => 100)
 		@length_slider.value = 5
 		@trails_flag = add_check_box(display_controls, :label => "Trails")
 		
-		environment_controls = add_panel(self)
+		environment_controls = add_panel(self, :proportion => 1)
 		add_label(environment_controls, :label => "Environment")
 		@clear_button = add_button(environment_controls, :label => "Clear")
 		
@@ -315,10 +320,11 @@ class ControlPanel < Wx::Panel
 		def add_panel(parent, options = {})
 			options = {
 				:sizer => Wx::BoxSizer.new(Wx::VERTICAL),
+				:proportion => 1,
 			}.merge(options)
 			panel = Wx::Panel.new(parent, options)
 			panel.sizer = options[:sizer]
-			panel.parent.sizer.add(panel, 1, Wx::GROW|Wx::ALL, 3)
+			panel.parent.sizer.add(panel, options[:proportion], Wx::GROW|Wx::ALL, 3)
 			panel
 		end
 		

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

@@ -35,14 +35,14 @@ class WxCanvas
 	attr_reader :width, :height
 
 	#Takes the wxRuby GUI object that will be its parent.
-	def initialize (parent)
+	def initialize (drawing_area)
+	
+		@drawing_area = drawing_area
 	
 		#Will be resized later.
-		@width = 1
-		@height = 1
+		@width = @drawing_area.size.width
+		@height = @drawing_area.size.height
 
-		#Create a drawing area.
-		@drawing_area = Wx::Window.new(parent)
 		#Set to correct size.
 		resize
 		
@@ -134,7 +134,6 @@ class WxCanvas
 	
 		#Resize buffer and drawing area.
 		def resize
-			@drawing_area.set_size(Wx::Size.new(@width, @height))
 			@buffer = nil #Causes buffer to reset its size next time it's accessed.
 		end
 	

metadata

@@ -1,81 +1,88 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: zyps
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
-date: 2008-01-23 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: 
+  version: 0.7.1
 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
 - bin/zyps_demo
+- bin/zyps
 - 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_files: 
+- test/zyps/test_actions.rb
+- test/zyps/test_conditions.rb
 - 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
-extra_rdoc_files: 
-- README.txt
-- COPYING.LESSER.txt
-- COPYING.txt
-executables: 
-- zyps
-extensions: []
-
+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: 
 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: 
+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