gosu_extensions 0.1.23 → 0.1.24

data/VERSION

@@ -1 +1 @@
-0.1.23
+0.1.24

data/lib/core/game_window.rb

@@ -28,7 +28,8 @@ class GameWindow < Gosu::Window
               :gravity_vector
   attr_reader :environment,
               :moveables,
-              :font
+              :font,
+              :scheduling
   attr_accessor :background_path,
                 :background_hard_borders
   
@@ -46,15 +47,17 @@ class GameWindow < Gosu::Window
     setup_background
     
     setup_steps
-    setup_waves
     setup_scheduling
     setup_font
     
     setup_containers
     
     setup_environment
+    
     setup_enemies
     setup_players
+    setup_waves
+    
     setup_collisions
     
     install_main_loop
@@ -158,6 +161,9 @@ class GameWindow < Gosu::Window
     end
   end
   
+  # Setup methods
+  #
+  
   def setup_window
     self.caption = self.class.caption || ""
   end
@@ -180,14 +186,12 @@ class GameWindow < Gosu::Window
   end
   def setup_containers
     @players = []
+    @waves   = Waves.new self, @scheduling
   end
   def setup_steps
     @step = 0
     @dt = 1.0 / 60.0
   end
-  def setup_waves
-    @waves = Waves.new self
-  end
   def setup_scheduling
     @scheduling = Scheduling.new
   end
@@ -202,12 +206,11 @@ class GameWindow < Gosu::Window
     @environment.window = self
     @environment.damping = -self.damping + 1 # recalculate the damping such that 0.0 has no damping.
   end
-  
   # Override.
   #
   def setup_players; end
   def setup_enemies; end
-  
+  def setup_waves; end
   #
   #
   # Example:
@@ -231,23 +234,20 @@ class GameWindow < Gosu::Window
     @controls << Control.new(self, object)
   end
   
-  def next_step
-    @step += 1
-    @waves.check @step # TODO maybe the waves should move into the scheduling
-    @scheduling.step
-  end
-  
-  
-  # Core methods used by the extensions "framework"
+  # Main loop methods.
   #
   
-  # The main loop.
-  #
   # TODO implement hooks.
   #
   def update
     @current_loop.call
   end
+  # Advances to the next step in the game.
+  #
+  def next_step
+    @step += 1
+    @scheduling.step
+  end
   # Each step, this is called to handle any input.
   #
   def handle_input
@@ -258,7 +258,31 @@ class GameWindow < Gosu::Window
   def step_physics
     @environment.step @dt
   end
+  # Moves each moveable.
+  #
+  def move
+    @moveables.move
+  end
+  # Handles the targeting process.
+  #
+  def targeting
+    @moveables.targeting
+  end
+  # Remove the shapes that are marked for removal.
+  #
+  def remove_shapes
+    @remove_shapes.remove_from @environment, @moveables
+  end
+  
+  # Adding things.
+  #
   
+  # Moveables register themselves here.
+  #
+  def register moveable
+    @moveables.register moveable
+    moveable.add_to @environment
+  end
   # Things unregister themselves here.
   #
   # Note: Use as follows in a Thing.
@@ -273,7 +297,6 @@ class GameWindow < Gosu::Window
   def unregister thing
     remove thing.shape
   end
-  
   # Remove this shape the next turn.
   #
   # Note: Internal use. Use unregister to properly remove a moveable.
@@ -281,6 +304,14 @@ class GameWindow < Gosu::Window
   def remove shape
     @remove_shapes.add shape
   end
+  # Is the thing registered?
+  #
+  def registered? thing
+    @moveables.registered? thing
+  end
+  
+  # Scheduling
+  #
   
   # Run some code at relative time <time>.
   #
@@ -296,40 +327,16 @@ class GameWindow < Gosu::Window
     @scheduling.add time, &code
   end
   
-  # Moves each moveable.
-  #
-  def move
-    @moveables.move
-  end
-  # Handles the targeting process.
-  #
-  def targeting
-    @moveables.targeting
-  end
   
   # Utility Methods
   #
   
-  # 
-  #
   # Example:
   # * x, y = uniform_random_position
   #
   def uniform_random_position
     [rand(self.width), rand(self.height)]
   end
-  
-  #
-  #
-  # Example:
-  #   imprint do
-  #     circle x, y, radius, :fill => true, :color => :black
-  #   end
-  #
-  def imprint &block
-    @background_image.paint &block
-  end
-  
   # Randomly adds a Thing to a uniform random position.
   #
   def randomly_add type
@@ -337,32 +344,12 @@ class GameWindow < Gosu::Window
     thing.warp_to *uniform_random_position
     register thing
   end
-  
-  # Moveables register themselves here.
-  #
-  def register moveable
-    @moveables.register moveable
-    moveable.add_to @environment
-  end
-  
-  # Remove the shapes that are marked for removal.
-  #
-  def remove_shapes
-    @remove_shapes.remove_from @environment, @moveables
-  end
-  
   # Revives the player if not already in.
   #
   def revive player
     register player unless registered?(player) # player.registered?
   end
   
-  # Is the thing registered?
-  #
-  def registered? thing
-    @moveables.registered? thing
-  end
-  
   # Drawing methods
   #
   
@@ -395,6 +382,19 @@ class GameWindow < Gosu::Window
   def draw_ui
     
   end
+  #
+  #
+  # Example:
+  #   imprint do
+  #     circle x, y, radius, :fill => true, :color => :black
+  #   end
+  #
+  def imprint &block
+    @background_image.paint &block
+  end
+  
+  # Input handling.
+  #
   
   # 
   #

data/lib/core/scheduling.rb

@@ -16,8 +16,8 @@ class Scheduling
   
   # Adds a code block at time time.
   #
-  def add time = 1, &code
-    @threads << [time, code]
+  def add time = 1, proc = nil, &code
+    @threads << [time, code || proc]
   end
   
   # Does two things:

data/lib/core/wave.rb

@@ -0,0 +1,35 @@
+#
+#
+class Wave
+  
+  attr_reader :generated_type, :execution_amount, :positioning_function
+  
+  UniformRandom = lambda { |window, instance| instance.warp_to *window.uniform_random_position }
+  TopBorder     = lambda { |window, instance| instance.warp_to rand(window.width), 0 }
+  RightBorder   = lambda { |window, instance| instance.warp_to window.width, rand(window.height) }
+  BottomBorder  = lambda { |window, instance| instance.warp_to rand(window.width), window.height }
+  LeftBorder    = lambda { |window, instance| instance.warp_to 0, rand(window.height) }
+  
+  #
+  #
+  # Note: The function needs a param generated_type.
+  #
+  def initialize generated_type, execution_amount = 1, &positioning_function
+    @generated_type      = generated_type
+    @execution_amount    = execution_amount
+    @positioning_function = positioning_function || UniformRandom
+  end
+  
+  #
+  #
+  def for_scheduling window
+    lambda do
+      self.execution_amount.times do
+        instance = self.generated_type.new window
+        window.register instance
+        self.positioning_function.call(window, instance)
+      end
+    end
+  end
+  
+end

data/lib/core/waves.rb

@@ -2,33 +2,25 @@
 #
 class Waves
   
-  #
-  #
-  def initialize window
-    @window = window
-    @waves = {}
-  end
+  attr_reader :window, :scheduling
   
   #
   #
-  def add amount, type, time
-    @waves[time] ||= []
-    @waves[time] << [amount, type]
+  def initialize window, scheduling
+    @window     = window
+    @scheduling = scheduling
   end
   
   #
   #
-  def check time
-    if wave? time
-      types = @waves[time]
-      types.each { |amount, type| amount.times { @window.randomly_add type } }
-    end
+  def add time, generated_type, times, &generation
+    add_wave time, Wave.new(generated_type, times, &generation)
   end
   
   #
   #
-  def wave? time
-    !@waves[time].nil?
+  def add_wave time, wave
+    scheduling.add time, wave.for_scheduling(window)
   end
   
 end

data/lib/gosu_extensions.rb

@@ -30,11 +30,12 @@ require 'it_is_a'
 
 require 'moveables'
 require 'remove_shapes'
+require 'wave'
+require 'waves'
 require 'scheduling'
 require 'game_window'
 require 'control'
 require 'controls'
-require 'waves'
 require 'layer'
 
 $:.unshift File.join(File.dirname(__FILE__), '/traits')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 23
-  version: 0.1.23
+  - 24
+  version: 0.1.24
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +02:00
+date: 2010-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,7 @@ files:
 - lib/core/trait.rb
 - lib/core/traits.rb
 - lib/core/vector_utilities.rb
+- lib/core/wave.rb
 - lib/core/waves.rb
 - lib/extensions/module.rb
 - lib/extensions/numeric.rb