joybox 1.0.0 → 1.1.0

data/motion/joybox/actions/fade.rb

@@ -11,26 +11,50 @@ module Joybox
       end
 
       def self.in(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
         CCFadeIn.actionWithDuration(options[:duration])
       end
 
       def self.out(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
-        CCFadeOut.actionWithDuration(options[:duration])
+        return fade_out(options) unless options[:tiled]
+        return fade_out_tiled(options) if options[:tiled]
       end
 
       def self.to(options = {})
         options = options.nil? ? defaults : defaults.merge!(options)
-
         CCFadeTo.actionWithDuration(options[:duration],
                                     opacity: options[:opacity])
       end
 
+
+      private
+
+        def self.fade_out(options = {})
+          CCFadeOut.actionWithDuration(options[:duration])
+        end
+
+        def self.fade_out_tiled(options = {})
+          # Todo print error message on the console
+          return unless options.has_key? :grid_size
+
+          klass = case options[:from]
+          when :top_right
+            CCFadeOutBLTiles
+          when :bottom_left
+            CCFadeOutTRTiles
+          when :bottom
+            CCFadeOutUpTiles
+          when :top
+            CCFadeOutDownTiles
+          else
+            CCFadeOutBLTiles
+          end
+
+          klass.actionWithSize(options[:grid_size], duration: options[:duration])
+        end
+
     end
+
   end
 end

data/motion/joybox/actions/jump.rb

@@ -13,20 +13,15 @@ module Joybox
       end
 
       def self.by(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
         CCJumpBy.actionWithDuration(options[:duration], 
                                     position: options[:position], 
                                     height: options[:height], 
                                     jumps: options[:jumps])
       end
 
-
       def self.to(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
         CCJumpTo.actionWithDuration(options[:duration], 
                                     position: options[:position], 
                                     height: options[:height], 

data/motion/joybox/actions/liquid.rb

@@ -0,0 +1,28 @@
+module Joybox
+  module Actions
+
+    class Liquid
+
+      def self.defaults
+        {
+          duration: 0.3,
+          waves: 1,
+          amplitude: 10
+        }
+      end
+
+      def self.with(options = {})
+        # Todo print error message on the console
+        return unless options.has_key? :grid_size
+
+        options = options.nil? ? defaults : defaults.merge!(options)
+        CCLiquid.actionWithWaves(options[:waves],
+                                 amplitude: options[:amplitude],
+                                 grid: options[:grid_size],
+                                 duration: options[:duration])
+      end
+
+    end
+
+  end
+end

data/motion/joybox/actions/move.rb

@@ -11,20 +11,13 @@ module Joybox
       end
 
       def self.by(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
-        CCMoveBy.actionWithDuration(options[:duration], 
-                                    position: options[:position])
+        CCMoveBy.actionWithDuration(options[:duration], position: options[:position])
       end
 
-
       def self.to(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
-        CCMoveTo.actionWithDuration(options[:duration], 
-                                    position: options[:position])
+        CCMoveTo.actionWithDuration(options[:duration], position: options[:position])
       end
 
     end

data/motion/joybox/actions/place.rb

@@ -10,9 +10,7 @@ module Joybox
       end
 
       def self.in(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
         CCPlace.actionWithPosition(options[:position])
       end
 

data/motion/joybox/actions/repeat.rb

@@ -13,14 +13,12 @@ module Joybox
       #TODO: Revisar esto, no estoy completamente seguro que deba de cambiar la implementacion
       #      original (nombre del metodo)
       def self.forever(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
 
         CCRepeatForever.actionWithAction(options[:action])
       end
 
       def self.with(options = {})
-        
         options = options.nil? ? defaults : defaults.merge!(options)
 
         CCRepeat.actionWithAction(options[:action], 

data/motion/joybox/actions/rotate.rb

@@ -11,20 +11,13 @@ module Joybox
       end
 
       def self.by(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
-        CCRotateBy.actionWithDuration(options[:duration], 
-                                      angle: options[:angle])
+        CCRotateBy.actionWithDuration(options[:duration], angle: options[:angle])
       end
 
-
       def self.to(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
-        CCRotateTo.actionWithDuration(options[:duration], 
-                                      angle: options[:angle])
+        CCRotateTo.actionWithDuration(options[:duration], angle: options[:angle])
       end
 
     end

data/motion/joybox/actions/scale.rb

@@ -11,20 +11,13 @@ module Joybox
       end
 
       def self.by(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
-        CCScaleBy.actionWithDuration(options[:duration], 
-                                      scale: options[:scale])
+        CCScaleBy.actionWithDuration(options[:duration], scale: options[:scale])
       end
 
-
       def self.to(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
-        CCScaleTo.actionWithDuration(options[:duration],
-                                      scale: options[:scale])
+        CCScaleTo.actionWithDuration(options[:duration], scale: options[:scale])
       end
 
     end

data/motion/joybox/actions/sequence.rb

@@ -10,7 +10,6 @@ module Joybox
       end
 
       def self.with(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
 
         CCSequence.actionWithArray(options[:actions])

data/motion/joybox/actions/shuffle.rb

@@ -0,0 +1,26 @@
+module Joybox
+  module Actions
+
+    class Shuffle
+
+      def self.defaults
+        {
+          duration: 0.3
+        }
+      end
+
+      def self.with(options = {})
+        # Todo print error message on the console
+        return unless options.has_key? :grid_size
+
+        options = options.nil? ? defaults : defaults.merge!(options)
+        seed = options.delete(:seed) || Joybox.generate_seed
+        CCShuffleTiles.actionWithDuration(options[:duration],
+                                          size: options[:grid_size],
+                                          seed: seed)
+      end
+
+    end
+
+  end
+end

data/motion/joybox/actions/skew.rb

@@ -12,22 +12,13 @@ module Joybox
       end
 
       def self.by(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
-        CCSkewBy.actionWithDuration(options[:duration], 
-          skewX: options[:x],
-          skewY: options[:y])
+        CCSkewBy.actionWithDuration(options[:duration], skewX: options[:x], skewY: options[:y])
       end
 
-
       def self.to(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
-        CCSkewTo.actionWithDuration(options[:duration], 
-          skewX: options[:x],
-          skewY: options[:y])
+        CCSkewTo.actionWithDuration(options[:duration], skewX: options[:x], skewY: options[:y])
       end
 
     end

data/motion/joybox/actions/spawn.rb

@@ -10,7 +10,6 @@ module Joybox
       end
 
       def self.with(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
 
         CCSpawn.actionWithArray(options[:actions])

data/motion/joybox/actions/split.rb

@@ -0,0 +1,24 @@
+module Joybox
+  module Actions
+
+    class Split
+
+      def self.defaults
+        {
+          duration: 0.3
+        }
+      end
+
+      def self.with(options = {})
+        # Todo print error message on the console
+        return unless [:columns, :rows].any? { |k| options.has_key? k }
+
+        options = options.nil? ? defaults : defaults.merge!(options)
+        return CCSplitCols.actionWithCols(options[:columns], duration: options[:duration]) if options.has_key? :columns
+        return CCSplitRows.actionWithRows(options[:rows], duration: options[:duration]) if options.has_key? :rows
+      end
+
+    end
+
+  end
+end

data/motion/joybox/actions/tint.rb

@@ -11,20 +11,15 @@ module Joybox
       end
 
       def self.by(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
         CCTintBy.actionWithDuration(options[:duration], 
                                     red: options[:color].red, 
                                     green: options[:color].green, 
                                     blue: options[:color].blue)
       end
 
-
       def self.to(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
-
         CCTintTo.actionWithDuration(options[:duration], 
                                     red: options[:color].red, 
                                     green: options[:color].green, 

data/motion/joybox/actions/turn.rb

@@ -0,0 +1,24 @@
+module Joybox
+  module Actions
+
+    class Turn
+
+      def self.defaults
+        {
+          duration: 0.3
+        }
+      end
+
+      def self.off(options = {})
+        # Todo print error message on the console
+        return unless options.has_key? :grid_size
+
+        options = options.nil? ? defaults : defaults.merge!(options)
+        seed = options.delete(:seed) || Joybox.generate_seed
+        CCTurnOffTiles.actionWithSeed(seed, grid: options[:grid_size], duration: options[:duration])
+      end
+
+    end
+
+  end
+end

data/motion/joybox/actions/twirl.rb

@@ -0,0 +1,30 @@
+module Joybox
+  module Actions
+
+    class Twirl
+
+      def self.defaults
+        {
+          duration: 0.3,
+          twirls: 1,
+          amplitude: 3
+        }
+      end
+
+      def self.with(options = {})
+        # Todo print error message on the console
+        return unless options.has_key? :grid_size
+
+        options = options.nil? ? defaults : defaults.merge!(options)
+        position = options.delete(:position) || [Common::Screen.half_width, Common::Screen.half_height]
+        CCTwirl.actionWithPosition(position,
+                                   twirls: options[:twirls],
+                                   amplitude: options[:amplitude],
+                                   grid: options[:grid_size],
+                                   duration: options[:duration])
+      end
+
+    end
+
+  end
+end

data/motion/joybox/actions/visibility.rb

@@ -0,0 +1,21 @@
+module Joybox
+  module Actions
+
+    class Visibility
+
+      def self.show
+        CCShow.action
+      end
+
+      def self.hide
+        CCHide.action
+      end
+
+      def self.toggle
+        CCToggleVisibility.action
+      end
+      
+    end
+  
+  end
+end

data/motion/joybox/actions/wave.rb

@@ -0,0 +1,32 @@
+module Joybox
+  module Actions
+
+    class Wave
+
+      def self.defaults
+        {
+          duration: 0.3,
+          waves: 1,
+          amplitude: 10,
+          horizontal: true,
+          vertical: true
+        }
+      end
+
+      def self.with(options = {})
+        # Todo print error message on the console
+        return unless options.has_key? :grid_size
+
+        options = options.nil? ? defaults : defaults.merge!(options)
+        CCWaves.actionWithWaves(options[:waves],
+                                amplitude: options[:amplitude],
+                                horizontal: options[:horizontal],
+                                vertical: options[:vertical],
+                                grid: options[:grid_size],
+                                duration: options[:duration])
+      end
+
+    end
+
+  end
+end

data/motion/joybox/animations/animation.rb

@@ -3,32 +3,28 @@ module Joybox
 
   	class Animation < CCAnimation
 
-      alias_method :total_delay, :totalDelayUnits
-      alias_method :delay, :delayPerUnit
+      alias_method :delay_units, :totalDelayUnits
+      alias_method :delay_per_unit, :delayPerUnit
       alias_method :restore_original_frame, :restoreOriginalFrame
 
       def self.defaults
         {
-          frames: nil
+          frames: nil,
+          delay_per_unit: 0.1
         }
       end
 
-
       def self.new(options = {})
-
         options = options.nil? ? defaults : defaults.merge!(options)
 
         animation = self.animationWithSpriteFrames(options[:frames])
-        animation.delayPerUnit = options[:delay] if options.include?(:delay)
-        animation.totalDelayUnits = options[:total_delay] if options.include?(:total_delay)
-        animation.duration = options[:duration] if options.include?(:duration)
+        animation.delayPerUnit = options[:delay_per_unit] if options.include?(:delay_per_unit)
+        animation.totalDelayUnits = options[:delay_units] if options.include?(:delay_units)
         animation.restoreOriginalFrame = options[:restore_original_frame] if options.include?(:restore_original_frame)
         animation.loops = options[:loops] if options.include?(:loops)
-
         animation
       end
 
-
       def add_frame(options = {})
 
         if options.has_key? (:frame)
@@ -42,6 +38,7 @@ module Joybox
         elsif options.has_key? (:texture) and options.has_key? (:rect)
 
           addSpriteFrameWithTexture(options[:texture], rect: options[:rect])
+          
         end
 
         # Check if it should fail silently or crash if any of the options
@@ -50,7 +47,6 @@ module Joybox
 
 
       def action
-
         CCAnimate.actionWithAnimation(self)
       end