ippa-chingu 0.5.3 → 0.5.4

data/lib/chingu/traits/effect.rb

@@ -1,6 +1,28 @@
+#--
+#
+# 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 Traits
-    class Effect
+    module Effect
       #
       # Adds .rotating .fading and .zooming to any GameObject.
       #
@@ -12,69 +34,80 @@ module Chingu
       # factor <-> growth? scale? automatic_zoom?
       # alpha <-> fade
       #
-      def initialize(parent_class, options)
-        @parent_class = parent_class        
-        @parent_class.class_eval do
-          attr_accessor :rotating, :fading, :zooming
-          
-          # Zoom - increase @factor_x and @factor_y at the same time.
-          def zoom(amount = 0.1)
-            @factor_x += amount
-            @factor_y += amount
-          end
+      attr_accessor :rotating, :fading, :zooming
+      
+      #def self.initialize_trait(options)
+      #  @effect_options = {:debug => false}.merge(options)
+      #  puts "Effect#initialize"    if @effect_options[:debug]
+      #  super
+      #end
+            
+      #
+      # Setup
+      #
+      def setup_trait(options)
+        @effect_options = {:debug => false}.merge(options)
+        puts "Effect#setup"     if @effect_options[:debug]
+        
+        @rotating = options[:rotating] || nil
+        @zooming = options[:zooming] || nil
+        @fading = options[:fading] || nil
+        super
+      end
+      
+      def draw
+        puts "Effect#draw"      if @effect_options[:debug]
+        super
+      end
+      
+      def update
+        puts "Effect#update"    if @effect_options[:debug]
+        
+        rotate(@rotating)    if @rotating
+        fade(@fading)        if @fading
+        zoom(@zooming)       if @zooming
+        super
+      end
+      
+      # Zoom - increase @factor_x and @factor_y at the same time.
+      def zoom(amount = 0.1)
+        @factor_x += amount
+        @factor_y += amount
+      end
           
-          # Zoom Out - decrease @factor_x and @factor_y at the same time.
-          def zoom_out(amount = 0.1)
-            @factor_x -= amount
-            @factor_y -= amount
-          end
+      # Zoom Out - decrease @factor_x and @factor_y at the same time.
+      def zoom_out(amount = 0.1)
+        @factor_x -= amount
+        @factor_y -= amount
+      end
     
-          # Rotate object 'amount' degrees
-          def rotate(amount = 1)
-            @angle += amount
-          end
+      # Rotate object 'amount' degrees
+      def rotate(amount = 1)
+        @angle += amount
+      end
   
-          # Fade object by decreasing/increasing color.alpha
-          def fade(amount = 1)
-            return if amount == 0
+      # Fade object by decreasing/increasing color.alpha
+      def fade(amount = 1)
+        return if amount == 0
             
-            new_alpha = @color.alpha + amount
-            if amount < 0
-              @color.alpha =  [0, new_alpha].max
-            else
-              @color.alpha =  [0, new_alpha].min
-            end
-          end
-
-          # Fade out objects color by decreasing color.alpha
-          def fade_out(amount = 1)
-            fade(-amount)
-          end
-
-          # Fade in objects color by increasing color.alpha
-          def fade_in(amount = 1)
-            fade(amount)
-          end
+        new_alpha = @color.alpha + amount
+        if amount < 0
+          @color.alpha =  [0, new_alpha].max
+        else
+          @color.alpha =  [0, new_alpha].min
         end
       end
-      
-      #
-      # Setup
-      #
-      def setup(parent_instance, options)
-        @parent_instance = parent_instance
-        @parent_instance.instance_eval do
-          @rotating = options[:rotating] || nil
-          @zooming = options[:zooming] || nil
-          @fading = options[:fading] || nil
-        end
+
+      # Fade out objects color by decreasing color.alpha
+      def fade_out(amount = 1)
+        fade(-amount)
       end
-      
-      def update(parent)
-        parent.rotate(parent.rotating)    if parent.rotating
-        parent.fade(parent.fading)        if parent.fading
-        parent.zoom(parent.zooming)       if parent.zooming
+
+      # Fade in objects color by increasing color.alpha
+      def fade_in(amount = 1)
+        fade(amount)
       end
+      
     end
   end
 end

data/lib/chingu/traits/effect_module.rb

@@ -0,0 +1,86 @@
+module Chingu
+  module Traits
+    module Effect
+      #
+      # Adds .rotating .fading and .zooming to any GameObject.
+      #
+      # TODO: better naming? suggestions:
+      #
+      # basic gosu unit <-> automation name
+      # ==============================================
+      # angle <-> rotation? rotating? automatic_angle?
+      # factor <-> growth? scale? automatic_zoom?
+      # alpha <-> fade
+      #
+      attr_accessor :rotating, :fading, :zooming
+      
+      def initialize(options)
+        puts "Effect#initialize"
+        super
+      end
+      
+      # Zoom - increase @factor_x and @factor_y at the same time.
+      def zoom(amount = 0.1)
+        @factor_x += amount
+        @factor_y += amount
+      end
+          
+      # Zoom Out - decrease @factor_x and @factor_y at the same time.
+      def zoom_out(amount = 0.1)
+        @factor_x -= amount
+        @factor_y -= amount
+      end
+    
+      # Rotate object 'amount' degrees
+      def rotate(amount = 1)
+        @angle += amount
+      end
+  
+      # Fade object by decreasing/increasing color.alpha
+      def fade(amount = 1)
+        return if amount == 0
+            
+        new_alpha = @color.alpha + amount
+        if amount < 0
+          @color.alpha =  [0, new_alpha].max
+        else
+          @color.alpha =  [0, new_alpha].min
+        end
+      end
+
+      # Fade out objects color by decreasing color.alpha
+      def fade_out(amount = 1)
+        fade(-amount)
+      end
+
+      # Fade in objects color by increasing color.alpha
+      def fade_in(amount = 1)
+        fade(amount)
+      end
+      
+      #
+      # Setup
+      #
+      def setup(options)
+        puts "Effect#setup"
+        @rotating = options[:rotating] || nil
+        @zooming = options[:zooming] || nil
+        @fading = options[:fading] || nil
+        super
+      end
+      
+      def draw
+        puts "Effect#draw"
+        super
+      end
+      
+      def update
+        puts "Effect#update"
+        rotate(@rotating)    if @rotating
+        fade(@fading)        if @fading
+        zoom(@zooming)       if @zooming
+        super
+      end
+    end
+  end
+end

data/lib/chingu/traits/input.rb

@@ -1,3 +1,25 @@
+#--
+#
+# 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 Traits
     module Input
@@ -10,6 +32,7 @@ module Chingu
       def input
         @input
       end
+      
     end
   end
 end

data/lib/chingu/traits/rotation_center.rb

@@ -1,3 +1,25 @@
+#--
+#
+# 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 Traits
     module RotationCenter

data/lib/chingu/traits/velocity.rb

@@ -1,59 +1,67 @@
+#--
+#
+# 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 Traits
     #
-    # A chingu component providing velocity and acceleration logic. 
+    # A chingu trait providing velocity and acceleration logic. 
     #
-    class Velocity
+    module Velocity
+      attr_accessor :velocity_x, :velocity_y, :acceleration_x, :acceleration_y, :max_velocity
       
-      def initialize(parent_class, options)
-        @parent_class = parent_class        
-        @parent_class.class_eval do
-          attr_accessor :velocity_x, :velocity_y, :acceleration_x, :acceleration_y, :max_velocity
-          
-          def stop
-            @acceleration_y = @acceleration_x = @velocity_y = @acceleration_y = 0
-          end
-        end
-      end
-      
-      #
-      # Setup
-      #
-      def setup(parent_instance, options)
-        @parent_instance = parent_instance
-        @parent_instance.instance_eval do
-          @velocity_x = options[:velocity_x] || 0
-          @velocity_y = options[:velocity_y] || 0
-          @acceleration_x = options[:acceleration_x] || 0
-          @acceleration_y = options[:acceleration_y] || 0
-          @max_velocity = options[:max_velocity] || 1000
-        end
+      #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
+        @acceleration_x = options[:acceleration_x] || 0
+        @acceleration_y = options[:acceleration_y] || 0
+        @max_velocity = options[:max_velocity] || 1000
+        super
       end
       
       #
       # Modifies X & Y of parent
       #
-      def update(parent)
-        #
-        # This is slower oddly enough?
-        #
-        #parent.velocity_y += parent.acceleration_y		if	(parent.velocity_y + parent.acceleration_y).abs < parent.max_velocity
-        #parent.velocity_x += parent.acceleration_x		if	(parent.velocity_x + parent.acceleration_x).abs < parent.max_velocity
-        #parent.y += parent.velocity_y
-        #parent.x += parent.velocity_x
+      def update
+        puts "Velocity#update"    if @velocity_options[:debug]
         
-        parent.instance_eval do
-          @velocity_y += @acceleration_y		if	(@velocity_y + @acceleration_y).abs < @max_velocity
-          @velocity_x += @acceleration_x		if	(@velocity_x + @acceleration_x).abs < @max_velocity
-          #vel_y = (@velocity_y + @acceleration_y).abs
-          #@velocity_y = vel_y		if vel_y  < @max_velocity
-          #vel_x = (@velocity_x + @acceleration_x).abs
-          #@velocity_x  = vel_x  if vel_x  < @max_velocity
-          
-          @y += @velocity_y
-          @x += @velocity_x
-        end
+        @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
+        super
       end
+      
+      def stop
+        @acceleration_y = @acceleration_x = @velocity_y = @acceleration_y = 0
+      end      
     end
   end
 end

data/lib/chingu/traits/velocity_module.rb

@@ -0,0 +1,44 @@
+module Chingu
+  module Traits
+    #
+    # A chingu component providing velocity and acceleration logic. 
+    #
+    module Velocity
+      attr_accessor :velocity_x, :velocity_y, :acceleration_x, :acceleration_y, :max_velocity
+      
+      def initialize(options)
+        puts "Velocity#initialize"
+        super
+      end
+      
+      def stop
+        @acceleration_y = @acceleration_x = @velocity_y = @acceleration_y = 0
+      end
+      
+      #
+      # Setup
+      #
+      def setup(options)
+        puts "Velocity#setup"
+        @velocity_x = options[:velocity_x] || 0
+        @velocity_y = options[:velocity_y] || 0
+        @acceleration_x = options[:acceleration_x] || 0
+        @acceleration_y = options[:acceleration_y] || 0
+        @max_velocity = options[:max_velocity] || 1000
+        super
+      end
+      
+      #
+      # Modifies X & Y of parent
+      #
+      def update
+        puts "Velocity#update"
+        @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
+        super
+      end
+    end
+  end
+end