joybox 1.0.0 → 1.1.0

data/motion/joybox-ios/core/layer.rb

@@ -8,32 +8,26 @@ module Joybox
       touch_states.each do |touch_state|
 
         define_method("on_touches_#{touch_state}") do |&block|
-
-        self.touchEnabled = true if block_given?
-
-        instance_variable_set("@on_touches_#{touch_state}_block", block)
+          self.touchEnabled = true if block_given?
+          instance_variable_set("@on_touches_#{touch_state}_block", block)
         end
       end
 
       # These methods can't be autogenerated using metaprogramming
       # because Objective-C will call them
       def ccTouchesBegan(touches, withEvent: event)
-
         @on_touches_began_block.call(touches, event) if @on_touches_began_block
       end
 
       def ccTouchesMoved(touches, withEvent: event)
-
         @on_touches_moved_block.call(touches, event) if @on_touches_moved_block
       end
 
       def ccTouchesEnded(touches, withEvent: event)
-
         @on_touches_ended_block.call(touches, event) if @on_touches_ended_block
       end
 
       def ccTouchesCancelled(touches, withEvent: event)
-
         @on_touches_cancelled_block.call(touches, event) if @on_touches_cancelled_block
       end
 

data/motion/joybox-ios/debug/proxy_view.rb

@@ -5,9 +5,9 @@ module Joybox
 
       attr_accessor :node
 
-  	  def to_s
-  	  	@node.to_s
-  	  end
+      def to_s
+        @node.to_s
+      end
 
       def position
         @node.position
@@ -25,7 +25,7 @@ module Joybox
         end
       end
       
-  	end
+    end
 
   end
- end
+end

data/motion/joybox-ios/debug/{node.rb → repl.rb}

@@ -1,30 +1,17 @@
 module Joybox
   module Debug
-    module Node
+    module REPL
+
+      class << self
+        attr_accessor :active
+        attr_accessor :bounding_box
+      end
 
       def self.included(base)
         base.send(:attr_accessor, :proxy_view)
         base.send(:attr_accessor, :bounding_box_layer)
       end
 
-      def initialize
-        @proxy_view = ProxyView.alloc.initWithFrame(translated_bounding_box)
-        @proxy_view.userInteractionEnabled = false
-        @proxy_view.node = self
-        Joybox.director.view.addSubview(@proxy_view)
-
-        initialize_bounding_box_layer if Joybox::Debug.bounding_box
-      end
-
-      def initialize_bounding_box_layer
-        @bounding_box_layer = CALayer.layer
-        @bounding_box_layer.borderColor = UIColor.greenColor.CGColor
-        @bounding_box_layer.borderWidth = 2
-        @bounding_box_layer.frame = translated_bounding_box
-
-        @proxy_view.layer.addSublayer(@bounding_box_layer)
-      end
-
       def cleanup
         @proxy_view.removeFromSuperview
         super
@@ -57,10 +44,29 @@ module Joybox
       private
 
       def update_bounding_box
+        initialize_proxy_view if @proxy_view.nil?
         @proxy_view.frame = translated_bounding_box unless @proxy_view.nil?
         @bounding_box_layer.frame = @proxy_view.bounds unless @bounding_box_layer.nil?
       end
 
+      def initialize_proxy_view
+        @proxy_view = ProxyView.alloc.initWithFrame(translated_bounding_box)
+        @proxy_view.userInteractionEnabled = false
+        @proxy_view.node = self
+        Joybox.director.view.addSubview(@proxy_view)
+
+        initialize_bounding_box_layer if Joybox::Debug::REPL.bounding_box
+      end
+
+      def initialize_bounding_box_layer
+        @bounding_box_layer = CALayer.layer
+        @bounding_box_layer.borderColor = UIColor.greenColor.CGColor
+        @bounding_box_layer.borderWidth = 2
+        @bounding_box_layer.frame = translated_bounding_box
+
+        @proxy_view.layer.addSublayer(@bounding_box_layer)
+      end
+
     end
   end
 end

data/motion/joybox-ios/director.rb

@@ -1,6 +1,8 @@
 module Joybox
   class Director < CCDirectorDisplayLink
 
+    attr_accessor :should_enable_retina_display
+
     alias_method :push_scene, :pushScene
     alias_method :pop_scene, :popScene
     alias_method :pop_to_root_scene, :popToRootScene
@@ -8,7 +10,9 @@ module Joybox
     alias_method :stop_animation, :stopAnimation
     alias_method :start_animation, :startAnimation
     alias_method :purge_cached_data, :purgeCachedData
-    alias_method :set_next_delta_time_zero, :setNextDeltaTimeZero
+
+    Projection2D = KCCDirectorProjection2D
+    Projection3D = KCCDirectorProjection3D
 
     def self.default_configuration
       {
@@ -25,18 +29,25 @@ module Joybox
       options = options.nil? ? default_configuration : default_configuration.merge!(options)
 
       director = Director.sharedDirector
-
       director.wantsFullScreenLayout = options[:wants_full_screen_layout]
       director.displayStats = options[:display_stats]
       director.animationInterval = options[:animation_interval]
       director.projection = options[:projection]
-      director.enableRetinaDisplay(options[:enable_retina_display])
+      director.should_enable_retina_display = options[:enable_retina_display]
       director.delegate = options[:delegate]
     end
 
+    def view=(view)
+      super
+      enableRetinaDisplay(@should_enable_retina_display)
+    end
 
     def << (scene)
-      self.push_scene(scene)
+      push_scene(scene)
+    end
+
+    def set_next_delta_time_zero(delta_time_zero)
+      setNextDeltaTimeZero(delta_time_zero)
     end
 
   end

data/motion/joybox-osx/common/ats_point.rb

@@ -1,48 +1,78 @@
 # We need this class to help the framework recognize 
 # CGPointMake
-class CGPoint; end
+CGPoint = ATSPoint
 
 class ATSPoint
 
-  def to_opengl_coordinates
+  def coerce(other)
+    [self, other]
+  end
 
+  def to_opengl_coordinates
     Joybox.director.convertToGL(self)
   end
 
-
   def from_opengl_coordinates
-
     Joybox.director.convertToUI(self)
   end
 
+  def from_pixel_coordinates
+    CGPointMake(self.x.from_pixels, self.y.from_pixels)
+  end
 
   def to_pixel_coordinates
-
     CGPointMake(self.x.to_pixels, self.y.to_pixels)
   end
 
-
-  def from_pixel_coordinates
-
-    CGPointMake(self.x.from_pixels, self.y.from_pixels)
+  def to_local_coordinates(node)
+    node.convertToNodeSpace(self)
   end
 
+  def from_local_coordinates(node)
+    node.convertToWorldSpace(self)
+  end
 
   def == (point)
-
-    point.is_a?(CGPoint) && CGPointEqualToPoint(self, point)
+    point.is_a?(ATSPoint) && CGPointEqualToPoint(self, point)
   end 
 
+  def +(other)
+    case other
+    when Numeric
+      return CGPointMake(self.x + other, self.y + other)
+    when ATSPoint || CGPoint
+      return CGPointMake(self.x + other.x, self.y + other.y)
+    end
+  end
 
-  def + (point)
+  def -@
+    CGPointMake(-x, -y)   
+  end
 
-    CGPointMake(self.x + point.x, self.y + point.y)
+  def -(other)
+    self.+(-other)
   end
 
+  def *(other)
+    case other
+    when Numeric
+      return CGPointMake(self.x * other, self.y * other)
+    when ATSPoint || CGPoint
+      return CGPointMake(self.x * other.x, self.y * other.y)
+    end
+  end
 
-  def - (point)
+  def /(other)
+    case other
+    when Numeric
+      return CGPointMake(self.x / other, self.y / other)
+    when ATSPoint || CGPoint
+      return CGPointMake(self.x / other.x, self.y / other.y)
+    end
+  end
 
-    CGPointMake(self.x - point.x, self.y - point.y)
+  def half
+    self / 2
   end
 
 end

data/motion/joybox-osx/common/device.rb

@@ -0,0 +1,30 @@
+module Joybox
+  module Common
+
+    module Device
+
+      module_function
+
+      def self.retina?
+        false
+      end
+
+      def self.scale_factor
+        1
+      end
+
+      def self.os_version
+        major = Pointer.new(:int)
+        Gestalt(GestaltSystemVersionMajor, major)
+        minor = Pointer.new(:int)
+        Gestalt(GestaltSystemVersionMinor, minor)
+        bug_fix = Pointer.new(:int)
+        Gestalt(GestaltSystemVersionBugFix, bug_fix)
+
+        "#{major[0]}.#{minor[0]}.#{bug_fix[0]}"
+      end
+
+    end
+
+  end
+end

data/motion/joybox-osx/common/ns_event.rb

@@ -1,7 +1,6 @@
 class NSEvent
 
   def location
-
     Joybox.director.convertEventToGL(self)
   end
   

data/motion/joybox-osx/configuration/configuration.rb

@@ -4,52 +4,32 @@ module Joybox
     module_function
 
     def setup(&block)
-
       instance_eval(&block) if block_given?
       configure
 
       Director.sharedDirector
     end
 
-
     def configure
-
       director unless @is_director_configured
       opengl_view unless @is_opengl_view_configured
       debug unless @is_debug_configured
     end
 
-
-    def director(*hash)
-
-      hash = hash.pop
-
-      Director.configure(hash)
-
+    def director(options = {})
+      Director.configure(options)
       @is_director_configured = true
     end
 
-
-    def opengl_view(*hash)
-
-      hash = hash.pop
-
-      opengl_view = GLView.new(hash)
-
+    def opengl_view(options = {})
+      opengl_view = GLView.new(options)
       director = Director.sharedDirector
-
       director.view = opengl_view
-
       @is_opengl_view_configured = true
     end
 
-
-    def debug(*hash)
-
-      hash = hash.pop
-
-      Debug.configure(hash)
-
+    def debug(options = {})
+      Debug.configure(options)
       @is_debug_configured = true
     end
 

data/motion/joybox-osx/configuration/gl_view.rb

@@ -12,27 +12,32 @@ module Joybox
         }
       end
 
-
       def self.new(options)
-
-        bounds_provided = options.include?(:bounds) unless options.nil?
-  
+        bounds_provided = options.include?(:bounds)
         options = options.nil? ? defaults : defaults.merge!(options)
-
         bounds = options[:bounds]
 
         if bounds.class == Hash
-
           bounds = [[bounds[:x], bounds[:y]], [bounds[:width], bounds[:height]]]
         end
 
-        opengl_view = self.alloc.initWithFrame(bounds)
+        opengl_view = alloc.initWithFrame(bounds)
         opengl_view.setAutoresizingMask(options[:auto_resize_mask])
-        opengl_view.resize_to_superview = bounds_provided
-
+        opengl_view.resize_to_superview = !bounds_provided
         opengl_view
       end
 
+      def initWithFrame(frame)
+        if super
+          tracking_options = NSTrackingMouseEnteredAndExited | NSTrackingActiveAlways | NSTrackingInVisibleRect
+          tracking_area = NSTrackingArea.alloc.initWithRect(self.bounds,
+                                                            options: tracking_options,
+                                                            owner: self,
+                                                            userInfo: nil)
+          addTrackingArea(tracking_area)
+        end
+        self
+      end
 
       # This method will be called when we insert the view in the content view
       # of the window.
@@ -42,15 +47,12 @@ module Joybox
       # => In the case the user provides the bounds in the setup, it will honor
       #    it.
       def viewDidMoveToSuperview
-
-        unless @resize_to_superview and superview.nil?
-          self.frame = superview.bounds
+        if @resize_to_superview
+          self.frame = superview.bounds unless superview.nil?
           Joybox.director.originalWinSize = self.frame.size
-
           @resize_to_superview = false
         end
       end
-
     end
     
   end

data/motion/joybox-osx/core/layer.rb

@@ -8,89 +8,73 @@ module Joybox
       mouse_states = [:down, :dragged, :up, :moved, :entered, :exited, :scroll]
 
       mouse_states.each do |mouse_state|
-
         define_method("on_mouse_#{mouse_state}") do |&block|
-
-        self.mouseEnabled = true if block_given?
-
-        instance_variable_set("@on_mouse_#{mouse_state}_block", block)
+          self.mouseEnabled = true if block_given?
+          instance_variable_set("@on_mouse_#{mouse_state}_block", block)
         end
       end
 
       # These methods can't be autogenerated using metaprogramming
       # because Objective-C will call them
       def ccMouseDown(event)
-
         @on_mouse_down_block.call(event, :left) if @on_mouse_down_block
         @on_mouse_down_block ? true : false
       end
 
       def ccRightMouseDown(event)
-
         @on_mouse_down_block.call(event, :right) if @on_mouse_down_block
         @on_mouse_down_block ? true : false
       end
 
       def ccOtherMouseDown(event)
-
         @on_mouse_down_block.call(event, :other) if @on_mouse_down_block
         @on_mouse_down_block ? true : false
       end
 
       def ccMouseDragged(event)
-
         @on_mouse_dragged_block.call(event, :left) if @on_mouse_dragged_block
         @on_mouse_dragged_block ? true : false
       end
 
       def ccRightMouseDragged(event)
-
         @on_mouse_dragged_block.call(event, :right) if @on_mouse_dragged_block
         @on_mouse_dragged_block ? true : false
       end
 
       def ccOtherMouseDragged(event)
-
         @on_mouse_dragged_block.call(event, :other) if @on_mouse_dragged_block
         @on_mouse_dragged_block ? true : false
       end
 
       def ccMouseUp(event)
-
         @on_mouse_up_block.call(event, :left) if @on_mouse_up_block
         @on_mouse_up_block ? true : false
       end
 
       def ccRightMouseUp(event)
-
         @on_mouse_up_block.call(event, :right) if @on_mouse_up_block
         @on_mouse_up_block ? true : false
       end
 
       def ccOtherMouseUp(event)
-
         @on_mouse_up_block.call(event, :other) if @on_mouse_up_block
         @on_mouse_up_block ? true : false
       end
 
       def ccMouseMoved(event)
-
         @on_mouse_moved_block.call(event) if @on_mouse_moved_block
         @on_mouse_moved_block ? true : false
       end
 
       def ccMouseEntered(event)
-
         @on_mouse_entered_block.call(event) if @on_mouse_entered_block
       end
 
       def ccMouseExited(event)
-        
         @on_mouse_exited_block.call(event) if @on_mouse_exited_block
       end
 
       def ccScrollWheel(event)
-
         @on_mouse_scroll_block.call(event) if @on_mouse_scroll_block
         @on_mouse_scroll_block ? true : false
       end
@@ -100,35 +84,70 @@ module Joybox
       key_states = [:down, :up, :flag_changed]
 
       key_states.each do |key_state|
-
         define_method("on_key_#{key_state}") do |&block|
-
-        self.keyboardEnabled = true if block_given?
-
-        instance_variable_set("@on_key_#{key_state}_block", block)
+          self.keyboardEnabled = true if block_given?
+          instance_variable_set("@on_key_#{key_state}_block", block)
         end
       end
 
       # These methods can't be autogenerated using metaprogramming
       # because Objective-C will call them
       def ccKeyDown(event)
-
         @on_key_down_block.call(event) if @on_key_down_block
         @on_key_down_block ? true : false
       end
 
       def ccKeyUp(event)
-
         @on_key_up_block.call(event) if @on_key_up_block
         @on_key_up_block ? true : false
       end
 
       def ccFlagsChanged(event)
-
         @on_key_flag_changed_block.call(event) if @on_key_flag_changed_block
         @on_key_flag_changed_block ? true : false
       end
 
+
+      # Gesture Events
+      gesture_states = [:begin, :magnify, :smart_magnify, :rotate, :swipe, :end]
+
+      gesture_states.each do |gesture_state|
+        define_method("on_gesture_#{gesture_state}") do |&block|
+          self.gestureEnabled = true if block_given?
+          instance_variable_set("@on_gesture_#{gesture_state}_block", block)
+        end
+      end
+
+      def ccBeginGestureWithEvent(event)
+        @on_gesture_begin_block.call(event) if @on_gesture_begin_block
+        @on_gesture_begin_block ? true : false
+      end
+
+      def ccMagnifyWithEvent(event)
+        @on_gesture_magnify_block.call(event) if @on_gesture_magnify_block
+        @on_gesture_magnify_block ? true : false
+      end
+
+      def ccSmartMagnifyWithEvent(event)
+        @on_gesture_smart_magnify_block.call(event) if @on_gesture_smart_magnify_block
+        @on_gesture_smart_magnify_block ? true : false
+      end
+
+      def ccRotateWithEvent(event)
+        @on_gesture_rotate_block.call(event) if @on_gesture_rotate_block
+        @on_gesture_rotate_block ? true : false
+      end
+
+      def ccSwipeWithEvent(event)
+        @on_gesture_swipe_block.call(event) if @on_gesture_swipe_block
+        @on_gesture_swipe_block ? true : false
+      end
+
+      def ccEndGestureWithEvent(event)
+        @on_gesture_end_block.call(event) if @on_gesture_end_block
+        @on_gesture_end_block ? true : false
+      end
+
     end
 
   end