gosu_extensions 0.2.9 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.3.0

data/lib/core/background.rb

@@ -14,6 +14,7 @@ class Background
   end
   
   def functionify path_or_color
+    return lambda {} unless path_or_color
     Gosu::Color === path_or_color ? color_draw_function(path_or_color) : image_draw_function(path_or_color)
   end
   

data/lib/core/collision.rb

@@ -9,12 +9,12 @@ class Collision
   
   #
   #
-  attr_reader :window, :this, :that, :definition
+  attr_reader :things, :this, :that, :definition
   
+  # Things can collide.
   #
-  #
-  def initialize window, this, that = this, &definition
-    @window     = window # TODO Remove.
+  def initialize things, this, that = this, &definition
+    @things     = things
     @this       = this
     @that       = that
     @definition = definition && package(definition)
@@ -35,9 +35,9 @@ class Collision
   #
   def simple_package definition
     lambda do |this_shape, _|
-      window.moveables.each do |moveable|
-        if moveable.shape == this_shape
-          moveable.instance_eval &definition
+      things.each do |thing|
+        if thing.shape == this_shape
+          thing.instance_eval &definition
           break
         end
       end
@@ -49,13 +49,13 @@ class Collision
   def complex_package definition
     lambda do |this_shape, that_shape|
       this_that = Array.new 2
-      window.moveables.each do |moveable|
-        if moveable.shape == this_shape
-          this_that[0] = moveable
+      things.each do |thing|
+        if thing.shape == this_shape
+          this_that[0] = thing
           break if this_that.all?
         end
-        if moveable.shape == that_shape
-          this_that[1] = moveable
+        if thing.shape == that_shape
+          this_that[1] = thing
           break if this_that.all?
         end
       end

data/lib/core/environment.rb

@@ -2,7 +2,8 @@ class Environment < CP::Space
   
   # Remove body and shape from self.
   #
-  def remove shape
+  def remove thing
+    shape = thing.shape
     self.remove_body shape.body
     self.remove_shape shape
   end

data/lib/core/game_window.rb

@@ -28,17 +28,24 @@ class GameWindow < Gosu::Window
               :gravity_vector,
               :background_options
   attr_reader :environment,
-              :moveables,
+              :sprites,
+              :things,
+              :objects,
               :font,
-              :scheduling,
-              :collisions
+              :scheduling
   attr_accessor :stop_condition,
-                :proceed_condition
+                :proceed_condition,
+                :collisions
   
   def initialize
     setup_window
-    setup_moveables
-    setup_remove_shapes
+    
+    setup_environment
+    
+    setup_sprites
+    setup_things
+    setup_objects
+    
     setup_controls
     setup_window_control # e.g. ESC => exits
     
@@ -57,14 +64,14 @@ class GameWindow < Gosu::Window
     
     setup_containers
     
-    setup_environment
-    
     setup_enemies
     setup_players
     setup_waves
     
     setup_collisions
     
+    setup_apply_damping
+    
     install_main_loop
     
     after_setup
@@ -77,10 +84,10 @@ class GameWindow < Gosu::Window
       # Smoother, but slower: GC.start if rand > 0.98
       next_step
       SUBSTEPS.times do
-        remove_shapes
         move
         targeting
         handle_input
+        remove_marked
         step_physics
       end
     end
@@ -102,7 +109,7 @@ class GameWindow < Gosu::Window
     @font_size || 20
   end
   def damping
-    @damping || 0.001
+    @damping || 0.5
   end
   def caption
     @caption || ""
@@ -117,15 +124,42 @@ class GameWindow < Gosu::Window
     @gravity_vector || @gravity_vector = CP::Vec2.new(0, 0.98/SUBSTEPS)
   end
   def background_options
-    Gosu::Color::WHITE
+    # default is no background
   end
   
   class << self
+    
+    # Sets the Esc button to close the window.
+    #
+    def default_controls
+      it_is Controllable
+      controls Gosu::Button::KbEscape => :close
+    end
+    
+    # Gravity acting.
+    #
+    # If you want to set the gravity_vector on the window,
+    # use its writer: window.gravity_vector = CP::Vec2.new(1, 2)
+    #
     def gravity amount = 0.98
       InitializerHooks.register self do
         self.gravity_vector = CP::Vec2.new(0, amount.to_f/SUBSTEPS)
       end
     end
+    # How much is movement damped?
+    #
+    def damping amount = 0.0
+      InitializerHooks.register self do
+        self.damping = amount
+      end
+    end
+    
+    # Size of the window. Use either width, height, or just size.
+    #
+    def size w = DEFAULT_SCREEN_WIDTH, h = DEFAULT_SCREEN_HEIGHT
+      width w
+      height h
+    end
     def width value = DEFAULT_SCREEN_WIDTH
       InitializerHooks.register self do
         self.screen_width = value
@@ -136,16 +170,15 @@ class GameWindow < Gosu::Window
         self.screen_height = value
       end
     end
+    
+    # Window caption.
+    #
     def caption text = ""
       InitializerHooks.register self do
         self.caption = text
       end
     end
-    def damping amount = 0.0
-      InitializerHooks.register self do
-        self.damping = amount
-      end
-    end
+    
     def font name = Gosu::default_font_name, size = 20
       InitializerHooks.register self do
         self.font_name = name
@@ -164,18 +197,17 @@ class GameWindow < Gosu::Window
       end
     end
     
-    attr_accessor :collisions
     def no_collision this, that = this
       # The next line doesn't work, as &nil == nil
       # collision this, that, &Collision::None
       InitializerHooks.register self do
-        self.collisions << Collision.new(self, this, that)
+        self.collisions << Collision.new(things, this, that)
       end
     end
     def collision this, that = this, &definition
       definition ||= Collision::Simple
       InitializerHooks.register self do
-        self.collisions << Collision.new(self, this, that, &definition)
+        self.collisions << Collision.new(things, this, that, &definition)
       end
     end
     
@@ -210,11 +242,14 @@ class GameWindow < Gosu::Window
   def setup_background
     @background = Background.new self
   end
-  def setup_moveables
-    @moveables = Moveables.new
+  def setup_sprites
+    @sprites = Sprites.new
   end
-  def setup_remove_shapes
-    @remove_shapes = RemoveShapes.new
+  def setup_things
+    @things = Things.new @environment
+  end
+  def setup_objects
+    @objects = Objects.new things, sprites
   end
   def setup_controls
     @controls = Controls.new
@@ -223,8 +258,7 @@ class GameWindow < Gosu::Window
     add_controls_for self
   end
   def setup_containers
-    @players = []
-    @waves   = Waves.new self, @scheduling
+    @waves = Waves.new self, @scheduling
   end
   def setup_steps
     @step = 0
@@ -245,7 +279,11 @@ class GameWindow < Gosu::Window
       attr_accessor :window
     end
     @environment.window = self
-    @environment.damping = -self.damping + 1 # recalculate the damping such that 0.0 has no damping.
+  end
+  def setup_apply_damping
+    # recalculate the damping such that 0.0 has no damping.
+    #
+    @environment.damping = -self.damping + 1
   end
   # Callbacks.
   #
@@ -259,10 +297,6 @@ class GameWindow < Gosu::Window
   
   #
   #
-  # Example:
-  #   collisions do
-  #     add_collision_func ...
-  #
   def setup_collisions
     self.collisions.each { |collision| collision.install_on(environment) }
   end
@@ -324,43 +358,21 @@ class GameWindow < Gosu::Window
   # Moves each moveable.
   #
   def move
-    @moveables.move
+    @objects.move
   end
   # Handles the targeting process.
   #
   def targeting
-    @moveables.targeting
+    @things.targeting
   end
   # Remove the shapes that are marked for removal.
   #
-  def remove_shapes
-    @remove_shapes.remove_from @environment, @moveables
+  def remove_marked
+    @objects.remove_marked
   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.
-  #       
-  #       def destroy
-  #         threaded do
-  #           5.times { sleep 0.1; animate_explosion }
-  #           @window.unregister self
-  #         end
-  #       end
-  #
-  def unregister thing
-    # explicitly call unregister_ui thing if you want it
-    remove thing.shape
-  end
   # Register a user interfaceable object.
   #
   def register_ui thing
@@ -370,19 +382,6 @@ class GameWindow < Gosu::Window
     @uis.delete thing
   end
   
-  # Remove this shape the next turn.
-  #
-  # Note: Internal use. Use unregister to properly remove a moveable.
-  #
-  def remove shape
-    @remove_shapes.add shape
-  end
-  # Is the thing registered?
-  #
-  def registered? thing
-    @moveables.registered? thing
-  end
-  
   # Scheduling
   #
   
@@ -396,6 +395,8 @@ class GameWindow < Gosu::Window
   #     destroy!
   #   end
   #
+  # Note: You can also use after instead of threaded.
+  #
   def threaded time = 1, &code
     @scheduling.add time, &code
   end
@@ -407,26 +408,25 @@ class GameWindow < Gosu::Window
   
   # Example:
   # * x, y = uniform_random_position
+  # * warp_to *uniform_random_position
   #
   def uniform_random_position
     [rand(self.width), rand(self.height)]
   end
   # Randomly adds a Thing to a uniform random position.
   #
+  # Returns the new thing
+  #
   def add type, x = nil, y = nil, &random_function
     thing = type.new self
     position = x && y && [x, y] || random_function && random_function[]
     thing.warp_to *position
-    register thing
+    thing.show
+    thing
   end
   def randomly_add type
     add type, *uniform_random_position
   end
-  # Revives the player if not already in.
-  #
-  def revive player
-    register player unless registered?(player) # player.registered?
-  end
   
   # Drawing methods
   #
@@ -436,7 +436,7 @@ class GameWindow < Gosu::Window
   def draw
     draw_background
     draw_ambient
-    draw_moveables
+    draw_objects
     draw_ui
   end
   # Draws a background image.
@@ -449,13 +449,12 @@ class GameWindow < Gosu::Window
   def draw_ambient
     
   end
-  # Draw the moveables.
+  # Draw the things.
   #
-  def draw_moveables
-    @moveables.draw
+  def draw_objects
+    @objects.draw
   end
-  # Override for example with
-  # @font.draw "P1 Score: ", 10, 10, ZOrder::UI, 1.0, 1.0, 0xffff0000
+  #
   #
   def draw_ui
     @uis.each(&:draw_ui)

data/lib/core/objects.rb

@@ -0,0 +1,46 @@
+# Objects is an aggregator of things and sprites.
+#
+class Objects
+  
+  attr_reader :things, :sprites
+  
+  #
+  #
+  def initialize things, sprites
+    @things, @sprites = things, sprites
+  end
+  
+  # # TODO Not used?
+  # #
+  # def registered? thing_or_sprite
+  #   @things.registered?(thing_or_sprite) || @sprites.registered?(thing_or_sprite)
+  # end
+  # 
+  # #
+  # #
+  # def register thing_or_sprite
+  #   Thing === thing_or_sprite ? @things.register(thing_or_sprite) : @sprites.register(thing_or_sprite)
+  # end
+  
+  #
+  #
+  def move
+    @things.move
+    @sprites.move
+  end
+  
+  #
+  #
+  def draw
+    @things.draw
+    @sprites.draw
+  end
+  
+  #
+  #
+  def remove_marked
+    @things.remove_marked
+    @sprites.remove_marked
+  end
+  
+end