chingu 0.5.9.3 → 0.5.9.4

data/chingu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.5.9.3"
+  s.version = "0.5.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-11-11}
+  s.date = %q{2009-11-16}
   s.description = %q{OpenGL accelerated 2D game framework for Ruby.
 Builds on the awesome Gosu (Ruby/C++) which provides all the core functionality.
 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.}

data/lib/chingu.rb

@@ -28,5 +28,5 @@ require File.join(CHINGU_ROOT,"chingu","require_all") # Thanks to http://github.
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.5.9.3"
+  VERSION = "0.5.9.4"
 end

data/lib/chingu/basic_game_object.rb

@@ -10,17 +10,14 @@ module Chingu
     attr_accessor :parent
         
     #
-    # adds a trait or traits to a certain game class
-    # 
-    # Executes a ruby "include" the specified module
+    # Adds a trait or traits to a certain game class
+    # Executes a standard ruby "include" the specified module
     #
     def self.has_trait(*traits)
       has_traits(*traits)
     end
     
-    #
     # See #has_trait
-    #
     def self.has_traits(*traits)
       Array(traits).each do |trait|
         if trait.is_a?(::Symbol) || trait.is_a?(::String)

data/lib/chingu/game_state.rb

@@ -58,6 +58,24 @@ module Chingu
     attr_reader :options
     attr_accessor :game_state_manager, :game_objects
     
+    #
+    # Adds a trait or traits to a certain game class
+    # Executes a standard ruby "include" the specified module
+    #
+    def self.has_trait(*traits)
+      has_traits(*traits)
+    end
+    
+    # See #has_trait
+    def self.has_traits(*traits)
+      Array(traits).each do |trait|
+        if trait.is_a?(::Symbol) || trait.is_a?(::String)
+          include Chingu::Traits.const_get(Chingu::Inflector.camelize(trait))
+        end
+      end
+    end
+
+
     def initialize(options = {})
       @options = options
       @game_objects = GameObjectList.new
@@ -67,6 +85,8 @@ module Chingu
       if defined?($window) && $window.respond_to?(:game_state_manager)
         $window.game_state_manager.inside_state = self
       end
+      
+      setup_trait(options)
     end
         
     #
@@ -100,7 +120,7 @@ module Chingu
       dispatch_button_up(id, self)
       @input_clients.each { |object| dispatch_button_up(id, object) }   if @input_clients
     end
-    
+        
     #
     # Calls update on each game object that has current game state as parent (created inside that game state)
     #
@@ -118,6 +138,11 @@ module Chingu
     def draw
       @game_objects.draw
     end
+
+    # Placeholder for trait-system to override
+    def setup_trait(options);end
+    def update_trait;end
+    def draw_trait;end
         
     #
     # Closes game state by poping it off the stack (and activating the game state below)

data/lib/chingu/game_state_manager.rb

@@ -262,7 +262,10 @@ module Chingu
     # If you're using Chingu::Window instead of Gosu::Window this will automaticly be called.
     #
     def update
-      current_game_state.update         if current_game_state
+      if current_game_state
+        current_game_state.update_trait
+        current_game_state.update
+      end
     end
 
     #
@@ -272,7 +275,10 @@ module Chingu
     # If you're using Chingu::Window instead of Gosu::Window this will automaticly be called.
     #
     def draw
-      current_game_state.draw           if current_game_state
+      if current_game_state
+        current_game_state.draw_trait
+        current_game_state.draw
+      end
     end
     
     private

data/lib/chingu/game_states/edit.rb

@@ -42,6 +42,7 @@ module Chingu
         self.input =  { :left_mouse_button => :left_mouse_button, 
                         :released_left_mouse_button => :released_left_mouse_button,
                         :delete => :destroy_selected_game_objects,
+                        :backspace => :destroy_selected_game_objects,
                         :e => :save_and_quit,
                         :s => :save,
                         :esc => :quit,

data/lib/chingu/game_states/fade_to.rb

@@ -37,7 +37,10 @@ module Chingu
       
       def initialize(new_game_state, options = {})
         @options = {:speed => 3}.merge(options)
+        
         @new_game_state = new_game_state
+        @new_game_state = new_game_state.new if new_game_state.is_a? Class
+        
         @manager = options[:game_state_manager] || self
         #@manager = game_state_manager
       end

data/lib/chingu/helpers/gfx.rb

@@ -48,12 +48,12 @@ module Chingu
     #   :orientation  - Either :vertical (top to bottom) or :horizontal (left to right)
     #
     
-    def fill(options)
+    def fill(options, zorder = 99)
       #
       # if only 1 color-argument is given, assume fullscreen simple color fill.
       #
       if options.is_a?(Gosu::Color)
-        $window.draw_quad(0, 0, color,
+        $window.draw_quad(0, 0, options,
                         $window.width, 0, options,
                         $window.width, $window.height, options,
                         0, $window.height, options, 0, :default)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: 0.5.9.3
+  version: 0.5.9.4
 platform: ruby
 authors: 
 - ippa
@@ -30,7 +30,7 @@ cert_chain:
   hxtMlw==
   -----END CERTIFICATE-----
 
-date: 2009-11-11 00:00:00 +01:00
+date: 2009-11-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency