chingu 0.5.9.4 → 0.6

data/lib/chingu/traits/effect.rb

@@ -42,14 +42,11 @@ module Chingu
 
     module Effect
       attr_accessor :rotation_rate, :fade_rate, :scale_rate
-                  
+                        
       #
       # Setup
       #
-      def setup_trait(options)
-        @effect_options = {:debug => false}.merge(options)
-        puts "Effect#setup"     if @effect_options[:debug]
-        
+      def setup_trait(options)        
         @rotation_rate = options[:rotation_rate] || nil
         @scale_rate = options[:scale_rate] || nil
         @fade_rate = options[:fade_rate] || nil
@@ -60,9 +57,7 @@ module Chingu
         super
       end
       
-      def update_trait
-        puts "Effect#update"    if @effect_options[:debug]
-        
+      def update_trait        
         rotate(@rotation_rate)  if @rotation_rate
         fade(@fade_rate)        if @fade_rate
         scale(@scale_rate)      if @scale_rate

data/lib/chingu/traits/radius.rb

@@ -0,0 +1,55 @@
+#--
+#
+# Chingu -- OpenGL accelerated 2D game framework for Ruby
+# 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 Traits
+    #
+    # Providing a bounding_box and keeps it up to date by reading:
+    # image, factor_x, factor_y
+    #
+    # ...only makes sense with rotation_center = :center
+    #
+    module Radius
+    
+      module ClassMethods
+        def initialize_trait(options = {})
+          @trait_options[:radius] = options
+        end
+      end
+      
+      def radius
+        width = self.image.width * self.factor_x.abs
+        height = self.image.height * self.factor_y.abs
+        radius = (width + height) / 2
+        radius = radius * trait_options[:radius][:scale] if  trait_options[:radius][:scale]
+        return radius
+      end
+      
+      def draw_trait
+        if trait_options[:radius][:debug]
+          $window.draw_circle(self.x, self.y, self.radius, Chingu::DEBUG_COLOR)
+        end
+        super
+      end
+      
+    end
+  end
+end

data/lib/chingu/traits/retrofy.rb

@@ -23,38 +23,37 @@ module Chingu
   module Traits
     #
     # A chingu trait providing easier handling of the "retrofy" effect (non-blurry zoom)
-    # Aims to help out when using zoom-factor to create a retrofeeling with big pixels.
-    # Provides screen_x and screen_y which takes the zoom into account
+    # Aims to help out when using scaling with "factor" to create a retrofeeling with big pixels.
+    # Provides screen_x and screen_y which takes the scaling into account
     # Also provides new code for draw() which uses screen_x / screen_y instead of x / y
     #
     module Retrofy
-      
+    
       def setup_trait(options)
         @retrofy_options = {:debug => false}.merge(options)        
-
         super
       end
       
       def screen_width
-        (@image.width * self.factor).to_i
+        (self.image.width * self.factor).to_i
       end
 
       def screen_height
-        (@image.heigt * self.factor).to_i
+        (self.image.heigt * self.factor).to_i
       end
 
       def screen_x
-        (@x * self.factor).to_i
+        (self.x * self.factor).to_i
       end
 
       def screen_y
-        (@y * self.factor).to_i
+        (self.y * self.factor).to_i
       end
-      
+
       # Returns true if object is inside the game window, false if outside
       # this special version takes @factor into consideration
       def inside_window?
-        @x >= 0 && @x <= $window.width/self.factor && @y >= 0 && @y <= $window.height/self.factor
+        self.x >= 0 && self.x <= $window.width/self.factor && self.y >= 0 && self.y <= $window.height/self.factor
       end
 
       # Returns true object is outside the game window 
@@ -66,7 +65,6 @@ module Chingu
       def draw
         @image.draw_rot(self.screen_x, self.screen_y, @zorder, @angle, @center_x, @center_y, @factor_x, @factor_y, @color, @mode)
       end
-      
     end
   end
 end

data/lib/chingu/traits/timer.rb

@@ -31,10 +31,9 @@ module Chingu
     # All the above can be combined with a 'then { do_something }'. For example, a classic shmup damage effect:
     #   during(100) { @color.alpha = 100 }.then { @color.alpha = 255 }
     #
-    module Timer 
-      def setup_trait(options)
-        @timer_options = {:debug => false}.merge(options)        
-        
+    module Timer
+    
+      def setup_trait(options)        
         #
         # Timers are saved as an array of arrays where each entry contains:
         # [start_time, end_time (or nil if one-shot), &block]

data/lib/chingu/traits/velocity.rb

@@ -27,15 +27,8 @@ module Chingu
     module Velocity
       attr_accessor :velocity_x, :velocity_y, :acceleration_x, :acceleration_y, :max_velocity
       
-      #def self.initialize_trait(options)
-      #  @velocity_options = {:debug => false}.merge(options)
-      #  puts "Velocity#initialize"    if @velocity_options[:debug]
-      #  super
-      #end
-            
       def setup_trait(options)
         @velocity_options = {:debug => false}.merge(options)        
-        puts "Velocity#setup"   if @velocity_options[:debug]
         
         @velocity_x = options[:velocity_x] || 0
         @velocity_y = options[:velocity_y] || 0
@@ -48,13 +41,11 @@ module Chingu
       #
       # Modifies X & Y of parent
       #
-      def update_trait
-        puts "Velocity#update"    if @velocity_options[:debug]
-        
+      def update_trait        
         @velocity_y += @acceleration_y		if	(@velocity_y + @acceleration_y).abs < @max_velocity
         @velocity_x += @acceleration_x		if	(@velocity_x + @acceleration_x).abs < @max_velocity
-        @y += @velocity_y
-        @x += @velocity_x
+        self.y += @velocity_y
+        self.x += @velocity_x
         super
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: 0.5.9.4
+  version: "0.6"
 platform: ruby
 authors: 
 - ippa
@@ -30,7 +30,7 @@ cert_chain:
   hxtMlw==
   -----END CERTIFICATE-----
 
-date: 2009-11-16 00:00:00 +01:00
+date: 2009-11-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,7 @@ files:
 - examples/example11.rb
 - examples/example12.rb
 - examples/example13.rb
+- examples/example14.rb
 - examples/example2.rb
 - examples/example3.rb
 - examples/example4.rb
@@ -143,8 +144,10 @@ files:
 - lib/chingu/rect.rb
 - lib/chingu/require_all.rb
 - lib/chingu/text.rb
+- lib/chingu/traits/bounding_box.rb
 - lib/chingu/traits/collision_detection.rb
 - lib/chingu/traits/effect.rb
+- lib/chingu/traits/radius.rb
 - lib/chingu/traits/retrofy.rb
 - lib/chingu/traits/timer.rb
 - lib/chingu/traits/velocity.rb