joybox 1.0.0 → 1.1.0

data/lib/joybox.rb

@@ -26,4 +26,6 @@ Motion::Project::App.setup do |app|
   Dir.glob(File.join(joybox, '**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
+
+  app.files_dependencies File.join(joybox, 'physics/aabb.rb') => File.join(joybox, 'physics/world.rb')
 end

data/lib/joybox/joybox-ios.rb

@@ -1,5 +1,4 @@
 Motion::Project::App.setup do |app|
-
   # Extracted from Teacup: https://github.com/rubymotion/teacup
   # Thanks Colin! (@colinta)
   platform = app.respond_to?(:template) ? app.template : :ios
@@ -11,7 +10,7 @@ Motion::Project::App.setup do |app|
   app.frameworks += ["QuartzCore", 
                      "CoreGraphics", 
                      "Foundation", 
-                     "ApplicationServices", 
+                     "OpenGLES",
                      "OpenAL", 
                      "AVFoundation", 
                      "AudioToolbox", 
@@ -21,7 +20,10 @@ Motion::Project::App.setup do |app|
   
 
   cocos2d_vendor = File.expand_path(File.join(platform_vendor, "cocos_2d"))
+  cocos_denshion_vendor = File.expand_path(File.join(platform_vendor, "cocos_denshion"))
+  cocos_builder_reader_vendor = File.expand_path(File.join(platform_vendor, "cocos_builder_reader"))
   box2d_vendor = File.expand_path(File.join(platform_vendor, "box_2d"))
+  kazmath_vendor = File.expand_path(File.join(platform_vendor, "kazmath"))
 
   app.vendor_project(cocos2d_vendor,
                      :static,
@@ -29,10 +31,23 @@ Motion::Project::App.setup do |app|
                      :bridgesupport_cflags => "-D__CC_PLATFORM_IOS -ISupport -IPlatforms -IPlatforms/iOS",
                      :bridgesupport_exceptions => ["cocos_2d_exceptions.bridgesupport"])
 
+  app.vendor_project(cocos_denshion_vendor,
+                     :static,
+                     :products => ['libCocosDenshion.a'],
+                     :bridgesupport_cflags => "-DNDEBUG")
+
+  app.vendor_project(cocos_builder_reader_vendor,
+                     :static,
+                     :products => ['libCocosBuilderReader.a'],
+                     :bridgesupport_cflags => "-DNDEBUG -I../../cocos_2d/cocos_2d_include/.")
+
   app.vendor_project(box2d_vendor,
                      :static,
                      :products => ['libBox2D.a'])
 
+  app.vendor_project(kazmath_vendor,
+                     :static,
+                     :products => ['libkazmath.a'])
 
   # Scans app.files until it finds app/ (the default)
   # if found, it inserts just before those files, otherwise it will insert to
@@ -42,4 +57,4 @@ Motion::Project::App.setup do |app|
   Dir.glob(File.join(platform_joybox, '**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
-end
+end

data/lib/joybox/joybox-osx.rb

@@ -1,5 +1,4 @@
 Motion::Project::App.setup do |app|
-
   # Extracted from Teacup: https://github.com/rubymotion/teacup
   # Thanks Colin! (@colinta)
   platform = app.respond_to?(:template) ? app.template : :ios
@@ -9,7 +8,8 @@ Motion::Project::App.setup do |app|
 
 
   app.frameworks += ["Cocoa", 
-                     "OpenGL", 
+                     "OpenGL",
+                     "OpenAL", 
                      "QuartzCore", 
                      "ApplicationServices",
                      "AppKit",
@@ -23,18 +23,34 @@ Motion::Project::App.setup do |app|
   
 
   cocos2d_vendor = File.expand_path(File.join(platform_vendor, "cocos_2d"))
+  cocos_denshion_vendor = File.expand_path(File.join(platform_vendor, "cocos_denshion"))
+  cocos_builder_reader_vendor = File.expand_path(File.join(platform_vendor, "cocos_builder_reader"))
   box2d_vendor = File.expand_path(File.join(platform_vendor, "box_2d"))
+  kazmath_vendor = File.expand_path(File.join(platform_vendor, "kazmath"))
 
   app.vendor_project(cocos2d_vendor,
                      :static,
                      :products => ["libcocos2d.a"],
                      :bridgesupport_cflags => "-D__CC_PLATFORM_MAC -ISupport -IPlatforms -IPlatforms/Mac")
 
+  app.vendor_project(cocos_denshion_vendor,
+                     :static,
+                     :products => ['libCocosDenshion.a'],
+                     :bridgesupport_cflags => "-DNDEBUG")
+
+  app.vendor_project(cocos_builder_reader_vendor,
+                     :static,
+                     :products => ['libCocosBuilderReader.a'],
+                     :bridgesupport_cflags => "-DNDEBUG -I../../cocos_2d/cocos_2d_include/.")
+
   app.vendor_project(box2d_vendor,
                      :static,
                      :products => ['libBox2D.a'],
                      :bridgesupport_cflags => "-D__CC_PLATFORM_MAC -ISupport -IPlatforms -IPlatforms/Mac")
 
+  app.vendor_project(kazmath_vendor,
+                     :static,
+                     :products => ['libkazmath.a'])
 
   # Scans app.files until it finds app/ (the default)
   # if found, it inserts just before those files, otherwise it will insert to

data/lib/joybox/version.rb

@@ -1,3 +1,3 @@
 module Joybox
-  VERSION = '1.0.0' unless defined?(Joybox::VERSION)
+  VERSION = '1.1.0' unless defined?(Joybox::VERSION)
 end

data/motion/joybox-ios/common/cg_point.rb

@@ -1,44 +1,74 @@
 class CGPoint
 
-  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)
+  def ==(other)
+    other.is_a?(CGPoint) && CGPointEqualToPoint(self, other)
   end 
 
+  def +(other)
+    case other
+    when Numeric
+      return CGPointMake(self.x + other, self.y + other)
+    when CGPoint
+      return CGPointMake(self.x + other.x, self.y + other.y)
+    end
+  end
 
-  def + (point)
-
-    CGPointMake(self.x + point.x, self.y + point.y)
+  def -@
+    CGPointMake(-x, -y)   
   end
 
+  def -(other)
+    self.+(-other)
+  end
 
-  def - (point)
+  def *(other)
+    case other
+    when Numeric
+      return CGPointMake(self.x * other, self.y * other)
+    when CGPoint
+      return CGPointMake(self.x * other.x, self.y * other.y)
+    end
+  end
 
-    CGPointMake(self.x - point.x, self.y - point.y)
+  def /(other)
+    case other
+    when Numeric
+      return CGPointMake(self.x / other, self.y / other)
+    when CGPoint
+      return CGPointMake(self.x / other.x, self.y / other.y)
+    end
   end
 
+  def half
+    self / 2
+  end
+  
 end

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

@@ -0,0 +1,56 @@
+# Borrowed from Bubble-wrap: https://github.com/rubymotion/BubbleWrap
+# Thank you guys! http://bubble-wrap.io
+module Joybox
+  module Common
+
+    module Device
+
+      module_function
+
+      def self.simulator?
+        @simulator_state ||= !(UIDevice.currentDevice.model =~ /simulator/i).nil?
+      end
+
+      def self.iphone?
+        UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone
+      end
+
+      def self.ipad?
+        UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad
+      end
+
+      def self.retina?
+        scale_factor == 2
+      end
+
+      def self.scale_factor
+        Joybox.director.contentScaleFactor
+      end
+
+      def orientation(device_orientation=UIDevice.currentDevice.orientation, fallback=true)
+        case device_orientation
+        when UIDeviceOrientationPortrait then :portrait
+        when UIDeviceceOrientationPortraitUpsideDown then :portrait_upside_down
+        when UIDeviceOrientationLandscapeLeft then :landscape_left
+        when UIDeviceOrientationLandscapeRight then :landscape_right
+        when UIDeviceOrientationFaceUp then :face_up
+        when UIDeviceOrientationFaceDown then :face_down
+        else
+          # In some cases, the accelerometer can't get an accurate read of orientation so we fall back on the orientation of
+          # the status bar.
+          if fallback && (device_orientation != UIApplication.sharedApplication.statusBarOrientation)
+            orientation(UIApplication.sharedApplication.statusBarOrientation)
+          else
+            :unknown
+          end
+        end
+      end
+
+      def self.os_version
+        UIDevice.currentDevice.systemVersion
+      end
+
+    end
+
+  end
+end

data/motion/joybox-ios/common/ui_touch.rb

@@ -3,12 +3,10 @@ class UITouch
   # We need a method instead of the alias method because of 
   # the 'Type `{CGPoint=ff}@:@' not precompiled' error
   def location_in_view(view)
-
     locationInView(view)
   end
 
   def location
-
     Joybox.director.convertTouchToGL(self)
   end
 

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

@@ -4,16 +4,13 @@ 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
       texture_2d unless @is_texture_2d_configured
@@ -21,57 +18,30 @@ module Joybox
       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 texture_2d(*hash)
-
-      hash = hash.pop
-
-      Texture2D.configure(hash)
-
+    def texture_2d(options = {})
+      Texture2D.configure(options)
       @is_texture_2d_configured = true
     end
 
-
-    def file_utils(*hash)
-
-      hash = hash.pop
-
-      FileUtils.configure(hash)
-
+    def file_utils(options = {})
+      FileUtils.configure(options)
       @is_file_utils_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-ios/configuration/file_utils.rb

@@ -8,17 +8,13 @@ module Joybox
           set_iphone_retina_display_suffix: "-hd",
           set_ipad_suffix: "-ipad",
           set_ipad_retina_display_suffix: "-ipadhd"
-
         }
       end
 
-
       def self.configure(options = {})
-
         options = options.nil? ? default_configuration : default_configuration.merge!(options)
 
         file_utils = FileUtils.sharedFileUtils
-
         file_utils.setiPhoneRetinaDisplaySuffix(options[:set_iphone_retina_display_suffix])
         file_utils.setiPadSuffix(options[:set_ipad_suffix])
         file_utils.setiPadRetinaDisplaySuffix(options[:set_ipad_retina_display_suffix])

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

@@ -3,9 +3,10 @@ module Joybox
 
     class GLView < CCGLView
 
-      def self.defaults
-        {
+      extend Joybox::Common::Initialize
 
+      def defaults
+        {
           bounds: UIScreen.mainScreen.bounds,
           pixel_format: KEAGLColorFormatRGB565,
           depth_format: 0,
@@ -16,29 +17,22 @@ module Joybox
         }
       end
 
-
-      def self.new(options)
-
+      def initialize(options)
         options = options.nil? ? defaults : defaults.merge!(options)
-
         bounds = options[:bounds]
 
-        if bounds.class == Hash
-
-          bounds = [[bounds[:x], bounds[:y]], [bounds[:width], bounds[:height]]]
-        end
+        bounds = [[bounds[:x], bounds[:y]], [bounds[:width], bounds[:height]]] if bounds.class == Hash
 
-
-        GLView.viewWithFrame(UIScreen.mainScreen.bounds,
-         pixelFormat: options[:pixel_format],
-         depthFormat: options[:depth_format],
-         preserveBackbuffer: options[:preserve_backbuffer],
-         sharegroup: options[:share_group],
-         multiSampling: options[:multi_sampling],
-         numberOfSamples: options[:number_of_samples])
+        initWithFrame(UIScreen.mainScreen.bounds,
+                      pixelFormat: options[:pixel_format],
+                      depthFormat: options[:depth_format],
+                      preserveBackbuffer: options[:preserve_backbuffer],
+                      sharegroup: options[:share_group],
+                      multiSampling: options[:multi_sampling],
+                      numberOfSamples: options[:number_of_samples])
       end
 
     end
-    
+
   end
-end
+end

data/motion/joybox-ios/configuration/texture_2d.rb

@@ -5,16 +5,12 @@ module Joybox
 
       def self.default_configuration
         {
-
           default_alpha_pixel_format: KCCTexture2DPixelFormat_RGBA8888,
           pvr_images_have_premultiplied_alpha: true
-
         }
       end
 
-
       def self.configure(options = {})
-
         options = options.nil? ? default_configuration : default_configuration.merge!(options)
 
         defaultAlphaPixelFormat = options[:default_alpha_pixel_format]