chingu 0.5.5.3 → 0.5.6

data/Manifest.txt

@@ -38,12 +38,10 @@ examples/media/stickfigure.bmp
 examples/media/stickfigure.png
 examples/media/video_games.png
 lib/chingu.rb
-lib/chingu/actor.rb
 lib/chingu/animation.rb
 lib/chingu/assets.rb
 lib/chingu/basic_game_object.rb
 lib/chingu/core_extensions.rb
-lib/chingu/effects.rb
 lib/chingu/fpscounter.rb
 lib/chingu/game_object.rb
 lib/chingu/game_object_list.rb
@@ -52,8 +50,12 @@ lib/chingu/game_state_manager.rb
 lib/chingu/game_states/debug.rb
 lib/chingu/game_states/fade_to.rb
 lib/chingu/game_states/pause.rb
-lib/chingu/gfx_helpers.rb
-lib/chingu/helpers.rb
+lib/chingu/helpers/game_object.rb
+lib/chingu/helpers/game_state.rb
+lib/chingu/helpers/gfx.rb
+lib/chingu/helpers/input_client.rb
+lib/chingu/helpers/input_dispatcher.rb
+lib/chingu/helpers/rotation_center.rb
 lib/chingu/inflector.rb
 lib/chingu/input.rb
 lib/chingu/named_resource.rb
@@ -64,9 +66,7 @@ lib/chingu/require_all.rb
 lib/chingu/text.rb
 lib/chingu/traits/collision_detection.rb
 lib/chingu/traits/effect.rb
-lib/chingu/traits/input.rb
 lib/chingu/traits/retrofy.rb
-lib/chingu/traits/rotation_center.rb
 lib/chingu/traits/timer.rb
 lib/chingu/traits/velocity.rb
 lib/chingu/window.rb

data/README.rdoc

@@ -3,13 +3,12 @@ http://github.com/ippa/chingu/tree/master
 
 DOCUMENTATION: http://rdoc.info/projects/ippa/chingu
 
-Ruby 1.9.1 is recommended. Also works with 1.8.7+.
+Ruby 1.9.1 is recommended. Should also work with 1.8.7+.
 
-This is still a rather young project, core classes and naming can still change.
+Chingu has started to settle down, thouch core classes and naming can still change for good reasons.
 
 == INSTALL
-  gem sources -a http://gems.github.com
-  sudo gem install ippa-chingu
+  gem install chingu
 
 
 == DESCRIPTION
@@ -426,6 +425,34 @@ Chingus trait-implementation is just ordinary ruby modules with 3 special method
  - draw_trait
 Each of those 3 methods must call "super" to continue the trait-chain.
 
+Example:
+
+  class Ogre < Chingu::GameObject
+    has_trait :velocity, :timer
+    
+    def initialize(options)
+      super
+      @red = Gosu::Color.new(0xFFFF0000)
+      @white = Gosu::Color.new(0xFFFFFFFF)
+      
+      #
+      # some basic physics provided by the velocity-trait
+      # These 2 parameters will affect @x and @y every game-iteration
+      # So if your ogre is standing on the ground, make sure you cancel out the effect of @acceleration_y
+      #
+      @velocity_x = 1       # move constantly to the right
+      @acceleration_y = 0.4 # gravity is basicly a downwards acceleration
+    end
+    
+    def hit_by(object)
+      #
+      # during() and then() is provided by the timer-trait
+      # flash red for 300 millisec when hit, then go back to normal
+      #
+      during(100) { @color = @red; @mode = :additive }.then { @color = @white; @mode = :default }
+    end
+  end
+  
 The flow for a game object then becomes:
 
   -- creating the object
@@ -441,8 +468,8 @@ There's a couple of traits included as default in Chingu:
 
 ==== Trait "timer"
 Adds timer functionallity to your game object
-  during(300) { @color = Color.new(0xFFFFFFFF) }   # forces @color to white ever update for 300 ms
-  after(400) { self.destroy }                     # destroy object after 400 ms
+  during(300) { @color = Color.new(0xFFFFFFFF) }   # forces @color to white every update for 300 ms
+  after(400) { self.destroy }                      # destroy object after 400 ms
   between(1000,2000) { self.rotate(10) }           # starting after 1 second, call rotate(10) every update during 1 second
   
 ==== Trait "velocity"
@@ -476,6 +503,8 @@ Provides screen_x and screen_y which takes the zoom into account
 Also provides new code for draw() which uses screen_x / screen_y instead of x / y
 
 
+
+
 === Assets / Paths
 
 You might wonder why this is necessary in the straight Gosu example:
@@ -529,8 +558,8 @@ See http://www.libgosu.org/rdoc/classes/Gosu/Window.html for a full set of metho
 
 === How did you decide on naming of methods / classes?
 There's 1 zillion ways of naming stuff. As a general guideline I've tried to follow Gosus naming.
-If Gosu didn't have a good name for a certain thing/method I've checked Ruby itself and then Rails since alot
- of Ruby-devs are familiar with Rails.
+If Gosu didn't have a good name for a certain thing/method I've checked Ruby itself and then Rails since alot of Ruby-devs are familiar with Rails.
+GameObject.all is naming straight from rails for example. Most stuff in GameObject follow the naming from Gosus Image#draw_rot.
 
 == TODO:
 * add :padding and :align => :topleft etc to class Text
@@ -580,9 +609,13 @@ If Gosu didn't have a good name for a certain thing/method I've checked Ruby its
 * Jacius of Rubygame (For doing cool stuff that's well documented as re-usable). So far rect.rb and named_resource.rb is taken from Rubygame.
 * Jduff for input / commits.
 * Jlnr,Philymore,Shawn24,JamesKilton for constructive feedback/discussions.
+* Apillet for codesuggestions and cleanups
 * Thanks to http://github.com/tarcieri for require_all code, good stuff
 
 == REQUIREMENTS:
 * Gosu latest version
-* Ruby 1.8.7+ (Works with 1.9+ as well!)
+* Ruby 1.9.1+ or 1.8.7+
+* gem 'opengl' if you want to use Image#retrofy, not needed otherwise
+* gem 'texplay' for some bonus Image-pixel operations, not needed otherwise
+
 

data/chingu.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.5.5.3"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-10-06}
+  s.date = %q{2009-10-10}
   s.description = %q{Game framework built on top of the OpenGL accelerated game lib Gosu. 
 It adds simple yet powerful game states, prettier input handling, deployment safe asset-handling, a basic re-usable game object and automation of common task.}
   s.email = ["ippa@rubylicio.us"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "benchmarks/README.txt"]
-  s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "benchmarks/README.txt", "benchmarks/benchmark.rb", "benchmarks/benchmark3.rb", "benchmarks/benchmark4.rb", "benchmarks/benchmark5.rb", "benchmarks/benchmark6.rb", "benchmarks/meta_benchmark.rb", "benchmarks/meta_benchmark2.rb", "chingu.gemspec", "examples/example1.rb", "examples/example10.rb", "examples/example11.rb", "examples/example12.rb", "examples/example2.rb", "examples/example3.rb", "examples/example4.rb", "examples/example5.rb", "examples/example6.rb", "examples/example7.rb", "examples/example8.rb", "examples/example9.rb", "examples/media/Parallax-scroll-example-layer-0.png", "examples/media/Parallax-scroll-example-layer-1.png", "examples/media/Parallax-scroll-example-layer-2.png", "examples/media/Parallax-scroll-example-layer-3.png", "examples/media/background1.png", "examples/media/fire_bullet.png", "examples/media/fireball.png", "examples/media/particle.png", "examples/media/ruby.png", "examples/media/spaceship.png", "examples/media/stickfigure.bmp", "examples/media/stickfigure.png", "examples/media/video_games.png", "lib/chingu.rb", "lib/chingu/actor.rb", "lib/chingu/animation.rb", "lib/chingu/assets.rb", "lib/chingu/basic_game_object.rb", "lib/chingu/core_extensions.rb", "lib/chingu/effects.rb", "lib/chingu/fpscounter.rb", "lib/chingu/game_object.rb", "lib/chingu/game_object_list.rb", "lib/chingu/game_state.rb", "lib/chingu/game_state_manager.rb", "lib/chingu/game_states/debug.rb", "lib/chingu/game_states/fade_to.rb", "lib/chingu/game_states/pause.rb", "lib/chingu/gfx_helpers.rb", "lib/chingu/helpers.rb", "lib/chingu/inflector.rb", "lib/chingu/input.rb", "lib/chingu/named_resource.rb", "lib/chingu/parallax.rb", "lib/chingu/particle.rb", "lib/chingu/rect.rb", "lib/chingu/require_all.rb", "lib/chingu/text.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/effect.rb", "lib/chingu/traits/input.rb", "lib/chingu/traits/retrofy.rb", "lib/chingu/traits/rotation_center.rb", "lib/chingu/traits/timer.rb", "lib/chingu/traits/velocity.rb", "lib/chingu/window.rb"]
+  s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "benchmarks/README.txt", "benchmarks/benchmark.rb", "benchmarks/benchmark3.rb", "benchmarks/benchmark4.rb", "benchmarks/benchmark5.rb", "benchmarks/benchmark6.rb", "benchmarks/meta_benchmark.rb", "benchmarks/meta_benchmark2.rb", "chingu.gemspec", "examples/example1.rb", "examples/example10.rb", "examples/example11.rb", "examples/example12.rb", "examples/example2.rb", "examples/example3.rb", "examples/example4.rb", "examples/example5.rb", "examples/example6.rb", "examples/example7.rb", "examples/example8.rb", "examples/example9.rb", "examples/media/Parallax-scroll-example-layer-0.png", "examples/media/Parallax-scroll-example-layer-1.png", "examples/media/Parallax-scroll-example-layer-2.png", "examples/media/Parallax-scroll-example-layer-3.png", "examples/media/background1.png", "examples/media/fire_bullet.png", "examples/media/fireball.png", "examples/media/particle.png", "examples/media/ruby.png", "examples/media/spaceship.png", "examples/media/stickfigure.bmp", "examples/media/stickfigure.png", "examples/media/video_games.png", "lib/chingu.rb", "lib/chingu/animation.rb", "lib/chingu/assets.rb", "lib/chingu/basic_game_object.rb", "lib/chingu/core_extensions.rb", "lib/chingu/fpscounter.rb", "lib/chingu/game_object.rb", "lib/chingu/game_object_list.rb", "lib/chingu/game_state.rb", "lib/chingu/game_state_manager.rb", "lib/chingu/game_states/debug.rb", "lib/chingu/game_states/fade_to.rb", "lib/chingu/game_states/pause.rb", "lib/chingu/helpers/game_object.rb", "lib/chingu/helpers/game_state.rb", "lib/chingu/helpers/gfx.rb", "lib/chingu/helpers/input_client.rb", "lib/chingu/helpers/input_dispatcher.rb", "lib/chingu/helpers/rotation_center.rb", "lib/chingu/inflector.rb", "lib/chingu/input.rb", "lib/chingu/named_resource.rb", "lib/chingu/parallax.rb", "lib/chingu/particle.rb", "lib/chingu/rect.rb", "lib/chingu/require_all.rb", "lib/chingu/text.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/effect.rb", "lib/chingu/traits/retrofy.rb", "lib/chingu/traits/timer.rb", "lib/chingu/traits/velocity.rb", "lib/chingu/window.rb"]
   s.homepage = %q{http://github.com/ippa/chingu/tree/master}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/examples/example1.rb

@@ -13,11 +13,12 @@ include Gosu
 # 
 class Game < Chingu::Window
   def initialize
-    super(640,480,false)  # leave it blank and it will be 800,600,non fullscreen
+    super(640,480,false)              # leave it blank and it will be 800,600,non fullscreen
+    self.input = { :escape => :exit } # exits example on Escape
+    
     @player = Player.create(:x => 200, :y => 200, :image => Image["spaceship.png"])
     @player.input = { :holding_left => :move_left, :holding_right => :move_right, 
-                      :holding_up => :move_up, :holding_down => :move_down, :escape => :exit}
-    p RUBY_VERSION
+                      :holding_up => :move_up, :holding_down => :move_down }
   end
   
   def update

data/examples/example2.rb

@@ -65,19 +65,12 @@ class Play < Chingu::GameState
                       :holding_up => :move_up, 
                       :holding_down => :move_down, 
                       :space => :fire,
-                      :escape => :exit,
                       }
-    self.input = { :f1 => :debug }
+    self.input = { :f1 => :debug, :escape => :exit }
   end
   
-  def debug
-    #puts "--------"
-    #GameObject.all.each do |game_object|
-    #  puts game_object.class
-    #end
-    #return 
-    
-    push_game_state(Chingu::GameStates::Debug)
+  def debug   
+    push_game_state(Chingu::GameStates::Debug.new)
   end
     
   #
@@ -97,17 +90,9 @@ class Play < Chingu::GameState
   # A #super call here would call #update on all Chingu::Actors and check their inputs, and call the specified method.
   # 
   def update
-    Bullet.destroy_if { |bullet| bullet.outside_window? }
-    #Bullet.destroy_if(&:outside_window?)
-    
-    #
-    # Bullet.each_collision(Enemy) do |bullet, enemy|
-    #   enemy.collision_with(bullet)
-    #   bullet.destroy!
-    # end
-    #
-      
     super
+    
+    Bullet.destroy_if { |bullet| bullet.outside_window? }
     $window.caption = "FPS: #{$window.fps} - milliseconds_since_last_tick: #{$window.milliseconds_since_last_tick} - game objects# #{current_game_state.game_objects.size} Bullets# #{Bullet.size}"
   end  
 end

data/lib/chingu.rb

@@ -23,10 +23,9 @@ CHINGU_ROOT = File.dirname(File.expand_path(__FILE__))
 
 require 'rubygems' unless RUBY_VERSION =~ /1\.9/
 require 'gosu'
-require 'set'
 require File.join(CHINGU_ROOT,"chingu","require_all") # Thanks to http://github.com/tarcieri/require_all !
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.5.5.3"
+  VERSION = "0.5.6"
 end

data/lib/chingu/animation.rb

@@ -125,6 +125,7 @@ module Chingu
     #
     def retrofy
       frames.each { |frame| frame.retrofy }
+      self
     end
     
     #

data/lib/chingu/core_extensions.rb

@@ -48,6 +48,7 @@ module Gosu
       glBindTexture(GL_TEXTURE_2D, self.gl_tex_info.tex_name)
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST)
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST)
+      self
     end
   end
 end

data/lib/chingu/game_object.rb

@@ -29,7 +29,9 @@ module Chingu
   class GameObject < Chingu::BasicGameObject
     attr_accessor :image, :x, :y, :angle, :center_x, :center_y, :factor_x, :factor_y, :color, :mode, :zorder
     attr_reader :paused, :visible, :factor, :center
-    has_trait :input, :rotation_center
+    
+    include Chingu::Helpers::InputClient        # Adds input and input=
+    include Chingu::Helpers::RotationCenter     # Adds easy and verbose modification of @center_x and @center_y
         
     def initialize(options = {})
       super

data/lib/chingu/game_state.rb

@@ -49,20 +49,19 @@ module Chingu
   #
 
   class GameState
-    include Chingu::GameStateHelpers    # Easy access to the global game state-queue
-    include Chingu::GFXHelpers          # Adds fill(), fade() etc to each game state
-    include Chingu::GameObjectHelpers   # adds game_objects_of_class etc ...
-    include Chingu::InputDispatcher     # dispatch-helpers
-    include Chingu::InputClient
+    include Chingu::Helpers::GFX                # Adds fill(), fade() etc to each game state
+    include Chingu::Helpers::GameState          # Easy access to the global game state-queue
+    include Chingu::Helpers::GameObject         # Adds game_objects_of_class etc ...
+    include Chingu::Helpers::InputDispatcher    # Input dispatch-helpers
+    include Chingu::Helpers::InputClient        # GameState can have it's own inputmap
     
-    attr_reader :options                # so jlnr can access his :level-number
+    attr_reader :options
     attr_accessor :game_state_manager, :game_objects
     
     def initialize(options = {})
       @options = options
-      ## @game_state_manager = options[:game_state_manager] || $window.game_state_manager
       @game_objects = GameObjectList.new
-      @input_clients = Set.new          # Set is like a unique Array with Hash lookupspeed
+      @input_clients = Array.new
       
       # Game state mamanger can be run alone
       if defined?($window) && $window.respond_to?(:game_state_manager)

data/lib/chingu/game_state_manager.rb

@@ -39,7 +39,7 @@ module Chingu
   # Return to the previous game state, don't call setup() on it when it becomes active.
   #   pop_game_state(:setup => false)
   #
-  # If you want to use Chingus GameStateManager _without_ Chingu::Windoe, see example5.rb
+  # If you want to use Chingus GameStateManager _without_ Chingu::Window, see example5.rb
   #
   class GameStateManager
     attr_accessor :inside_state

data/lib/chingu/{effects.rb → helpers/game_object.rb}

@@ -1,36 +1,53 @@
-#--
-#
-# Chingu -- Game framework built on top of the opengl accelerated gamelib Gosu
-# Copyright (C) 2009 ippa / ippa@rubylicio.us
-#
-# This library 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 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#++
-
-
-#
-# Effect-class
-#
-module Chingu
-  class Effect
-    def initialize(options)
-      super({:mode => :additive}.merge(options))
-      @trail = options[:trail] || 10
-    end
-      
-    def update
-    end    
-  end
+#--
+#
+# Chingu -- Game framework built on top of the opengl accelerated gamelib Gosu
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library 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 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+
+module Chingu
+  module Helpers
+  
+  #
+  # Convenience-methods for classes that hold game objects
+  # Mixed into Chingu::Window and Chingu::GameState
+  #
+  module GameObject
+  
+    def add_game_object(object)
+      @game_objects.add_game_object(object)
+    end
+    
+    def remove_game_object(object)
+      @game_objects.remove_game_object(object)
+    end
+    
+    def game_objects
+      @game_objects
+    end
+    
+    #
+    # Fetch game objects of a certain type/class
+    #
+    def game_objects_of_class(klass)
+      @game_objects.select { |game_object| game_object.is_a? klass }
+    end
+  end
+
+  end
 end

data/lib/chingu/helpers/game_state.rb

@@ -0,0 +1,62 @@
+#--
+#
+# Chingu -- Game framework built on top of the opengl accelerated gamelib Gosu
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library 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 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+
+module Chingu
+  module Helpers
+  
+  #
+  # push_game_state accepts either a class inherited from GameState or an object-instance from such a class.
+  #
+  # It will make call new() on a class, and just push an object.
+  #
+  module GameState
+    def push_game_state(state, options = {})
+      $window.game_state_manager.push_game_state(state, options)      
+    end
+  
+    def pop_game_state(options = {})
+      $window.game_state_manager.pop_game_state(options)
+    end
+
+    def switch_game_state(state, options = {})
+      $window.game_state_manager.switch_game_state(state, options)
+    end
+
+    def transitional_game_state(state, options = {})
+      $window.game_state_manager.transitional_game_state(state, options)      
+    end
+
+    def current_game_state
+      $window.game_state_manager.current_game_state
+    end
+
+    def previous_game_state
+      $window.game_state_manager.previous_game_state
+    end
+    
+    def clear_game_states
+      $window.game_state_manager.clear_game_states
+    end
+  end
+  
+  end
+end

data/lib/chingu/{gfx_helpers.rb → helpers/gfx.rb}

@@ -21,11 +21,13 @@
 
 
 module Chingu
+  module Helpers
+    
   #
   # Various helper-methods to manipulate the screen.
   # All drawings depend on the global variable $window which should be an instance of Gosu::Window or Chingu::Window
   #
-  module GFXHelpers
+  module GFX
   
     #
     # Fills whole window with color 'color'.
@@ -86,4 +88,6 @@ module Chingu
       end
     end
   end
+  
+  end
 end

data/lib/chingu/{traits/input.rb → helpers/input_client.rb}

@@ -21,18 +21,33 @@
 
 
 module Chingu
-  module Traits
-    module Input
-    
+  module Helpers
+  
+    #
+    # Input-handler mixin that adds #input= and #input
+    # 
+    # #input= does 2 things:
+    # 1) Initialized an inputmap
+    # 2) notifies the parent (could be main Window or a GameState) that the object wants input
+    #
+    # In Chingu this is mixed into Window, GameState and GameObject
+    #
+    module InputClient
       def input=(input_map)
         @input = input_map
-        @parent.add_input_client(self)  if @parent
+        
+        if @parent 
+          if (@input == nil || @input == {})
+            @parent.remove_input_client(self)
+          else
+            @parent.add_input_client(self)
+          end
+        end
       end
       
       def input
         @input
       end
-      
     end
   end
 end

data/lib/chingu/{helpers.rb → helpers/input_dispatcher.rb}

@@ -1,166 +1,104 @@
-#--
-#
-# Chingu -- Game framework built on top of the opengl accelerated gamelib Gosu
-# Copyright (C) 2009 ippa / ippa@rubylicio.us
-#
-# This library 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 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#++
-
-
-module Chingu
-  
-  module InputClient
-    def input=(input_map)
-      @input = input_map
-      @parent.add_input_client(self)  if @parent
-    end
-    
-    def input
-      @input
-    end
-  end
-    
-  module InputDispatcher
-    attr_reader :input_clients
-    
-    def add_input_client(object)
-      @input_clients << object
-    end
-    
-    def remove_input_client(object)
-      @input_clients.delete(object)
-    end
-
-    def dispatch_button_down(id, object)
-      return if(object.nil? || object.input.nil?)
-      
-      object.input.each do |symbol, action|
-        if Input::SYMBOL_TO_CONSTANT[symbol] == id
-          dispatch_action(action, object)
-        end        
-      end
-    end
-    
-    def dispatch_button_up(id, object)
-      return if object.nil? || object.input.nil?
-      
-      object.input.each do |symbol, action|
-        if symbol.to_s.include? "released_"
-          symbol = symbol.to_s.sub("released_", "").to_sym
-          if Input::SYMBOL_TO_CONSTANT[symbol] == id
-            dispatch_action(action, object)
-          end
-        end
-      end
-    end
-    
-    #
-    # Dispatches input-mapper for any given object
-    #
-    def dispatch_input_for(object, prefix = "holding_")
-      return if object.nil? || object.input.nil?
-      
-      object.input.each do |symbol, action|
-        if symbol.to_s.include? prefix
-          symbol = symbol.to_s.sub(prefix, "").to_sym
-          if $window.button_down?(Input::SYMBOL_TO_CONSTANT[symbol])
-            dispatch_action(action, object)
-          end
-        end
-      end
-    end
-    
-    #
-    # For a given object, dispatch "action".
-    # An action can be:
-    #
-    # * Symbol (:p, :space), translates into a method-call
-    # * Proc/Lambda, call() it
-    # * GameState-instance, push it on top of stack
-    # * GameState-inherited class, create a new instance, cache it and push it on top of stack
-    #
-    def dispatch_action(action, object)
-      # puts "Dispatch Action: #{action} - Objects class: #{object.class.to_s}"
-      if action.is_a? Symbol
-        object.send(action)
-      elsif action.is_a? Proc
-        action.call
-      elsif action.is_a? Chingu::GameState
-        push_game_state(action)
-      elsif action.superclass == Chingu::GameState
-        push_game_state(action)
-      end
-    end
-  end
-
-  #
-  # push_game_state accepts either a class inherited from GameState or an object-instance from such a class.
-  #
-  # It will make call new() on a class, and just push an object.
-  #
-  module GameStateHelpers
-    def push_game_state(state, options = {})
-      $window.game_state_manager.push_game_state(state, options)      
-    end
-  
-    def pop_game_state(options = {})
-      $window.game_state_manager.pop_game_state(options)
-    end
-
-    def switch_game_state(state, options = {})
-      $window.game_state_manager.switch_game_state(state, options)
-    end
-
-    def transitional_game_state(state, options = {})
-      $window.game_state_manager.transitional_game_state(state, options)      
-    end
-
-    def current_game_state
-      $window.game_state_manager.current_game_state
-    end
-
-    def previous_game_state
-      $window.game_state_manager.previous_game_state
-    end
-    
-    def clear_game_states
-      $window.game_state_manager.clear_game_states
-    end
-  end
-  
-  module GameObjectHelpers
-  
-    def add_game_object(object)
-      @game_objects.add_game_object(object)
-    end
-    
-    def remove_game_object(object)
-      @game_objects.remove_game_object(object)
-    end
-    
-    def game_objects
-      @game_objects
-    end
-    
-    #
-    # Fetch game objects of a certain type/class
-    #
-    def game_objects_of_class(klass)
-      @game_objects.select { |game_object| game_object.is_a? klass }
-    end
-  end
-
+#--
+#
+# Chingu -- Game framework built on top of the opengl accelerated gamelib Gosu
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library 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 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+
+module Chingu
+  module Helpers
+  
+  #
+  # Methods for parsing and dispatching Chingus input-maps
+  # Mixed into Chingu::Window and Chingu::GameState
+  #
+  module InputDispatcher
+    attr_reader :input_clients
+    
+    def add_input_client(object)
+      @input_clients << object    unless @input_clients.include?(object)
+    end
+    
+    def remove_input_client(object)
+      @input_clients.delete(object)
+    end
+
+    def dispatch_button_down(id, object)
+      return if(object.nil? || object.input.nil?)
+      
+      object.input.each do |symbol, action|
+        if Input::SYMBOL_TO_CONSTANT[symbol] == id
+          dispatch_action(action, object)
+        end        
+      end
+    end
+    
+    def dispatch_button_up(id, object)
+      return if object.nil? || object.input.nil?
+      
+      object.input.each do |symbol, action|
+        if symbol.to_s.include? "released_"
+          symbol = symbol.to_s.sub("released_", "").to_sym
+          if Input::SYMBOL_TO_CONSTANT[symbol] == id
+            dispatch_action(action, object)
+          end
+        end
+      end
+    end
+    
+    #
+    # Dispatches input-mapper for any given object
+    #
+    def dispatch_input_for(object, prefix = "holding_")
+      return if object.nil? || object.input.nil?
+      
+      object.input.each do |symbol, action|
+        if symbol.to_s.include? prefix
+          symbol = symbol.to_s.sub(prefix, "").to_sym
+          if $window.button_down?(Input::SYMBOL_TO_CONSTANT[symbol])
+            dispatch_action(action, object)
+          end
+        end
+      end
+    end
+    
+    #
+    # For a given object, dispatch "action".
+    # An action can be:
+    #
+    # * Symbol (:p, :space), translates into a method-call
+    # * Proc/Lambda, call() it
+    # * GameState-instance, push it on top of stack
+    # * GameState-inherited class, create a new instance, cache it and push it on top of stack
+    #
+    def dispatch_action(action, object)
+      # puts "Dispatch Action: #{action} - Objects class: #{object.class.to_s}"
+      if action.is_a? Symbol
+        object.send(action)
+      elsif action.is_a? Proc
+        action.call
+      elsif action.is_a? Chingu::GameState
+        push_game_state(action)
+      elsif action.superclass == Chingu::GameState
+        push_game_state(action)
+      end
+    end
+  end
+  
+  end
 end

data/lib/chingu/{traits → helpers}/rotation_center.rb

@@ -21,7 +21,7 @@
 
 
 module Chingu
-  module Traits
+  module Helpers
     module RotationCenter
       #
       # returns [center_x, center_y] (see Gosu::Image#draw_rot)

data/lib/chingu/parallax.rb

@@ -11,7 +11,7 @@ module Chingu
     #
     # repeat: [true|false]  When one background ends within the screen, repeat/loop it
     #
-    def initialize(options)
+    def initialize(options = {})
       super(options)
       @repeat = options[:repeat] || true
       @backgrounds = Array.new

data/lib/chingu/window.rb

@@ -1,20 +1,11 @@
 module Chingu
 
   class Window < Gosu::Window
-    # adds push_game_state, pop_game_state, current_game_state and previous_game_state
-    include Chingu::GameStateHelpers    
-    
-    # adds fill() etc...
-    include Chingu::GFXHelpers
-    
-    # adds game_objects_of_class etc ...
-    include Chingu::GameObjectHelpers
-    
-    # Input dispatch helpers
-    include Chingu::InputDispatcher
-    
-    # input= and input
-    include Chingu::InputClient
+    include Chingu::Helpers::GFX                # Adds fill(), fade() etc to each game state
+    include Chingu::Helpers::GameState          # Easy access to the global game state-queue
+    include Chingu::Helpers::GameObject         # Adds game_objects_of_class etc ...
+    include Chingu::Helpers::InputDispatcher    # Input dispatch-helpers
+    include Chingu::Helpers::InputClient        # WIndow has its own inputmap
     
     attr_reader :root, :game_state_manager, :game_objects, :milliseconds_since_last_tick
     
@@ -27,7 +18,6 @@ module Chingu
     # - Standard #update which updates all Chingu::GameObject's 
     # - Standard #draw which goes through 
     # - Assethandling with Image["picture.png"] and Sample["shot.wav"]
-    # - Default input mapping escape to close 
     #
     def initialize(width = 800, height = 600, fullscreen = false, update_interval = 16.666666)
       fullscreen ||= ARGV.include?("--fullscreen")
@@ -40,7 +30,7 @@ module Chingu
       Gosu::Song.autoload_dirs = [".", File.join(@root, "sfx"), File.join(@root, "media")]
 			
       @game_objects = GameObjectList.new
-      @input_clients = Set.new  # Set is like a unique Array with Hash lookupspeed
+      @input_clients = Array.new
       
       @fps_counter = FPSCounter.new
       @game_state_manager = GameStateManager.new
@@ -106,12 +96,18 @@ module Chingu
       #
       # Call update() on all game objects belonging to the main window.
       #
-      update_game_objects
+      @game_objects.update
       
       #
       # Call update() on all game objects belonging to the current game state.
       #
-      update_game_state_manager
+
+      #
+      # Call update() on our game_state_manger
+      # -> call update on active states
+      # -> call update on all game objects in that state
+      #
+      @game_state_manager.update
     end
     
     # 
@@ -131,22 +127,6 @@ module Chingu
       @game_state_manager.draw
     end
     
-    #
-    # Call update() on all game objects in main game window.
-    #
-    def update_game_objects
-      @game_objects.update
-    end
-    
-    #
-    # Call update() on our game_state_manger
-    # -> call update on active state 
-    # -> call update on all game objects in that state
-    #
-    def update_game_state_manager
-      @game_state_manager.update
-    end
-
     #
     # By default button_up sends the keyevent to the GameStateManager
     # .. Which then is responsible to send it to the right GameState(s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: 0.5.5.3
+  version: 0.5.6
 platform: ruby
 authors: 
 - ippa
@@ -30,7 +30,7 @@ cert_chain:
   hxtMlw==
   -----END CERTIFICATE-----
 
-date: 2009-10-06 00:00:00 +02:00
+date: 2009-10-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,12 +97,10 @@ files:
 - examples/media/stickfigure.png
 - examples/media/video_games.png
 - lib/chingu.rb
-- lib/chingu/actor.rb
 - lib/chingu/animation.rb
 - lib/chingu/assets.rb
 - lib/chingu/basic_game_object.rb
 - lib/chingu/core_extensions.rb
-- lib/chingu/effects.rb
 - lib/chingu/fpscounter.rb
 - lib/chingu/game_object.rb
 - lib/chingu/game_object_list.rb
@@ -111,8 +109,12 @@ files:
 - lib/chingu/game_states/debug.rb
 - lib/chingu/game_states/fade_to.rb
 - lib/chingu/game_states/pause.rb
-- lib/chingu/gfx_helpers.rb
-- lib/chingu/helpers.rb
+- lib/chingu/helpers/game_object.rb
+- lib/chingu/helpers/game_state.rb
+- lib/chingu/helpers/gfx.rb
+- lib/chingu/helpers/input_client.rb
+- lib/chingu/helpers/input_dispatcher.rb
+- lib/chingu/helpers/rotation_center.rb
 - lib/chingu/inflector.rb
 - lib/chingu/input.rb
 - lib/chingu/named_resource.rb
@@ -123,9 +125,7 @@ files:
 - lib/chingu/text.rb
 - lib/chingu/traits/collision_detection.rb
 - lib/chingu/traits/effect.rb
-- lib/chingu/traits/input.rb
 - lib/chingu/traits/retrofy.rb
-- lib/chingu/traits/rotation_center.rb
 - lib/chingu/traits/timer.rb
 - lib/chingu/traits/velocity.rb
 - lib/chingu/window.rb

metadata.gz.sig

@@ -1 +1,4 @@
-	�k3Gc��b5]K�Ȇ�1�mV\��!=� DМ�(�%�7R�<Z[.[0���#\����4�C���W��9�L��@��Q�H�	ʠ�9��,��T�K	���-H�7�wS�	V�P`3T"t<W��6yL�z��Y,������EnVl_yP�e�6TC�Oe�+q'^����l=�%�|@
+Y�ֿi����J_$���q����/x[~��Q�}�h<5���ڛ�w_�����{
+ҼB�s�F��4��Þ9��Rۖ侎�F�
+�}��	2ɭ�"�mM����	�|�شN7��$����ǫq"�Z���Bf��&|	y᪸T�V����.̴P(5�
+�W���p)J��68�zj�`�PQ�IO5�hes�ZY�O�

data/lib/chingu/actor.rb

@@ -1,17 +0,0 @@
-module Chingu
-  #
-  # A game object class with most components included, nice for quick prototypes
-  #
-  # TODO: we probably wanna expand this concept or remove Actor as a whole.
-  #
-  class Actor < Chingu::GameObject
-    has_traits :effect, :velocity, :input
-
-    def update
-      # needed for traits to work
-      super     
-      
-      # your game logic Here
-    end    
-  end
-end