ippa-chingu 0.5.5 → 0.5.5.1

data/README.rdoc

@@ -65,7 +65,7 @@ For example, inside game state Menu you call push_game_state(Level). When Level
 === Traits
 Traits are extensions (or plugins if you so will) to BasicGameObjects. 
 The aim is so encapsulate common behaivor into modules for easy inclusion in your game classes.
-Making a trait is easy, just an ordinary module with the methods setup_trait(), update() and/or draw().
+Making a trait is easy, just an ordinary module with the methods setup_trait(), update_trait() and/or draw_trait().
 It currently has to be namespaced to Chingu::Traits for "has_trait" to work inside GameObject-classes.
 
 == OTHER CLASSES / HELPERS

data/chingu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.5.5"
+  s.version = "0.5.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-09-22}
+  s.date = %q{2009-09-26}
   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"]

data/examples/example10.rb

@@ -56,8 +56,6 @@ class Thing < Chingu::GameObject
       @velocity_x = -@velocity_x
       @rotating = -@rotating
     end
-    
-    super
   end
   
   def draw

data/examples/example9.rb

@@ -11,7 +11,7 @@ class Game < Chingu::Window
     super(800,800)
     self.input = {:esc => :exit}
     self.caption = "Example of game object traits 'velocity' and 'effect'"
-    push_game_state(Particles)
+    push_game_state(ParticleState)
   end
   
   def next_effect; pop_game_state; end
@@ -30,7 +30,7 @@ class FireCube < Chingu::GameObject
   attr_accessor :color, :radius
   
   def initialize(options)
-    super    
+    super
     @mode = :additive
     
     # initialize with a rightwards velocity with some damping to look more realistic
@@ -51,7 +51,6 @@ class FireCube < Chingu::GameObject
   
   def update
     @color = @blue
-    super
   end
   
   def collides?(object2)
@@ -64,7 +63,7 @@ class FireCube < Chingu::GameObject
   
 end
 
-class Particles < Chingu::GameState
+class ParticleState < Chingu::GameState
   def setup    
     self.input = { :space => :new_fire_cube }
     100.times { new_fire_cube }

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.5"
+  VERSION = "0.5.5.1"
 end

data/lib/chingu/animation.rb

@@ -32,7 +32,7 @@ module Chingu
       
       if options[:size]
         @width = options[:size][0]
-        @height = options[:size][0]
+        @height = options[:size][1]
       end
       
       @frame_actions = []

data/lib/chingu/basic_game_object.rb

@@ -36,6 +36,13 @@ module Chingu
     def initialize(options = {})
       @options = options
       
+      #
+      # A GameObject either belong to a GameState or our mainwindow ($window)
+      #
+      if $window && $window.respond_to?(:game_state_manager)
+        @parent = $window.game_state_manager.inside_state || $window
+      end
+      
       # This will call #setup_trait on the latest trait mixed in
       # which then will pass it on to the next setup_trait() with a super-call.
       setup_trait(options)
@@ -53,13 +60,9 @@ module Chingu
       instance = self.new(options)
       
       #
-      # A GameObject either belong to a GameState or our mainwindow ($window)
+      # Add to parents list of game objects
       #
-      if $window && $window.respond_to?(:game_state_manager)
-        if (instance.parent = $window.game_state_manager.inside_state || $window)
-          instance.parent.add_game_object(instance)
-        end
-      end
+      instance.parent.add_game_object(instance) if instance.parent
       
       return instance
     end
@@ -67,12 +70,19 @@ module Chingu
     def setup_trait(options)
     end
     
-    def update
+    def update_trait
 		end
     
-    def draw
+    def draw_trait
     end    
         
+    def update
+    end
+
+    def draw
+    end
+    
+        
     #
     # Returns an array with all objects of current class.
     # BasicGameObject#all is state aware so only objects belonging to the current state will be returned.

data/lib/chingu/game_object.rb

@@ -81,8 +81,8 @@ module Chingu
     end
           
     # Quick way of setting both center_x and center_y
-    def center=(factor)
-      @center_x = @center_y = factor
+    def center=(center)
+      @center_x = @center_y = center
     end
 
     # Returns true if object is inside the game window, false if outside
@@ -101,7 +101,6 @@ module Chingu
     end
     
     def draw
-      super
       @image.draw_rot(@x, @y, @zorder, @angle, @center_x, @center_y, @factor_x, @factor_y, @color, @mode)
     end
   end  

data/lib/chingu/game_object_list.rb

@@ -67,10 +67,12 @@ module Chingu
     end
     
     def draw
+      @game_objects.each { |object| object.draw_trait }
       @game_objects.each { |object| object.draw }
     end
     
     def update
+      @game_objects.each { |object| object.update_trait }
       @game_objects.each { |object| object.update }
     end
     

data/lib/chingu/traits/collision_detection.rb

@@ -87,7 +87,7 @@ module Chingu
       #
       # Have bounding box follow game objects x/y
       #
-      def update
+      def update_trait
         if defined?(@bounding_box) && @bounding_box.is_a?(Rect)
           @bounding_box.x = self.x
           @bounding_box.y = self.y
@@ -103,13 +103,23 @@ module Chingu
       def each_collision(klasses = [])
         Array(klasses).each do |klass|        
           klass.all.each do |object|
-            if object.detect_collisions
-              yield(self, object)   if collides?(object)
-            end
+            yield(self, object)   if collides?(object)
+          end
+        end
+      end
+      
+      #
+      # Works like each_collsion but with inline-code for speedups
+      #
+      def each_radius_collision(klasses = [])
+        Array(klasses).each do |klass|
+          klass.all.each do |object|
+            yield(self, object) if distance(@x, @y, object.x, object.y) < @radius
           end
         end
       end
 
+
       
       module ClassMethods
       
@@ -126,7 +136,7 @@ module Chingu
                 yield object1, object2  if distance(object1.x, object1.y, object2.x, object2.y) < object1.radius
               end
             end
-          end          
+          end
         end
         
         #

data/lib/chingu/traits/effect.rb

@@ -55,12 +55,12 @@ module Chingu
         super
       end
       
-      def draw
+      def draw_trait
         puts "Effect#draw"      if @effect_options[:debug]
         super
       end
       
-      def update
+      def update_trait
         puts "Effect#update"    if @effect_options[:debug]
         
         rotate(@rotating)    if @rotating

data/lib/chingu/traits/velocity.rb

@@ -49,7 +49,7 @@ module Chingu
       #
       # Modifies X & Y of parent
       #
-      def update
+      def update_trait
         puts "Velocity#update"    if @velocity_options[:debug]
         
         @velocity_y += @acceleration_y		if	(@velocity_y + @acceleration_y).abs < @max_velocity

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ippa-chingu
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.5.1
 platform: ruby
 authors: 
 - ippa
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 -07:00
+date: 2009-09-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency