joybox 0.0.5 → 0.0.6

data/vendor/{Cocos2D → vendor-ios/cocos_2d}/include/CCTransition.h

@@ -43,24 +43,30 @@
  */
 typedef enum {
 	/// An horizontal orientation where the Left is nearer
-	kOrientationLeftOver = 0,
+	kCCTransitionOrientationLeftOver = 0,
 	/// An horizontal orientation where the Right is nearer
-	kOrientationRightOver = 1,
+	kCCTransitionOrientationRightOver = 1,
 	/// A vertical orientation where the Up is nearer
-	kOrientationUpOver = 0,
+	kCCTransitionOrientationUpOver = 0,
 	/// A vertical orientation where the Bottom is nearer
-	kOrientationDownOver = 1,
+	kCCTransitionOrientationDownOver = 1,
+
+	// Deprecated
+//	kOrientationLeftOver = kCCTransitionOrientationLeftOver,
+//	kOrientationRightOver = kCCTransitionOrientationRightOver,
+//	kOrientationUpOver = kCCTransitionOrientationUpOver,
+//	kOrientationDownOver = kCCTransitionOrientationDownOver,
 } tOrientation;
 
 /** Base class for CCTransition scenes
  */
 @interface CCTransitionScene : CCScene
 {
-	CCScene	*inScene_;
-	CCScene	*outScene_;
-	ccTime	duration_;
-	BOOL	inSceneOnTop_;
-	BOOL	sendCleanupToScene_;
+	CCScene	*_inScene;
+	CCScene	*_outScene;
+	ccTime	_duration;
+	BOOL	_inSceneOnTop;
+	BOOL	_sendCleanupToScene;
 }
 /** creates a base transition with duration and incoming scene */
 +(id) transitionWithDuration:(ccTime) t scene:(CCScene*)s;
@@ -68,7 +74,7 @@ typedef enum {
 -(id) initWithDuration:(ccTime) t scene:(CCScene*)s;
 /** called after the transition finishes */
 -(void) finish;
-/** used by some transitions to hide the outter scene */
+/** used by some transitions to hide the outer scene */
 -(void) hideOutShowIn;
 @end
 
@@ -91,6 +97,8 @@ typedef enum {
  */
 @interface CCTransitionRotoZoom : CCTransitionScene
 {}
+// needed for BrdigeSupport
+-(id) init;
 @end
 
 /** CCTransitionJumpZoom:
@@ -98,6 +106,8 @@ typedef enum {
 */
 @interface CCTransitionJumpZoom : CCTransitionScene
 {}
+// needed for BrdigeSupport
+-(id) init;
 @end
 
 /** CCTransitionMoveInL:
@@ -116,6 +126,8 @@ typedef enum {
  */
 @interface CCTransitionMoveInR : CCTransitionMoveInL
 {}
+// Needed for BridgeSupport
+-(void) initScenes;
 @end
 
 /** CCTransitionMoveInT:
@@ -123,6 +135,8 @@ typedef enum {
  */
 @interface CCTransitionMoveInT : CCTransitionMoveInL
 {}
+// Needed for BridgeSupport
+-(void) initScenes;
 @end
 
 /** CCTransitionMoveInB:
@@ -130,6 +144,8 @@ typedef enum {
  */
 @interface CCTransitionMoveInB : CCTransitionMoveInL
 {}
+// Needed for BridgeSupport
+-(void) initScenes;
 @end
 
 /** CCTransitionSlideInL:
@@ -139,7 +155,7 @@ typedef enum {
 {}
 /** initializes the scenes */
 -(void) initScenes;
-/** returns the action that will be performed by the incomming and outgoing scene */
+/** returns the action that will be performed by the incoming and outgoing scene */
 -(CCActionInterval*) action;
 @end
 
@@ -148,6 +164,8 @@ typedef enum {
  */
 @interface CCTransitionSlideInR : CCTransitionSlideInL
 {}
+// Needed for BridgeSupport
+-(void) initScenes;
 @end
 
 /** CCTransitionSlideInB:
@@ -155,6 +173,8 @@ typedef enum {
  */
 @interface CCTransitionSlideInB : CCTransitionSlideInL
 {}
+// Needed for BridgeSupport
+-(void) initScenes;
 @end
 
 /** CCTransitionSlideInT:
@@ -162,6 +182,8 @@ typedef enum {
  */
 @interface CCTransitionSlideInT : CCTransitionSlideInL
 {}
+// Needed for BridgeSupport
+-(void) initScenes;
 @end
 
 /**
@@ -169,6 +191,8 @@ typedef enum {
  */
 @interface CCTransitionShrinkGrow : CCTransitionScene <CCTransitionEaseScene>
 {}
+// needed for BrdigeSupport
+-(id) init;
 @end
 
 /** CCTransitionFlipX:
@@ -177,6 +201,8 @@ typedef enum {
  */
 @interface CCTransitionFlipX : CCTransitionSceneOriented
 {}
+// needed for BrdigeSupport
+-(id) init;
 @end
 
 /** CCTransitionFlipY:
@@ -185,6 +211,8 @@ typedef enum {
  */
 @interface CCTransitionFlipY : CCTransitionSceneOriented
 {}
+// needed for BrdigeSupport
+-(id) init;
 @end
 
 /** CCTransitionFlipAngular:
@@ -193,6 +221,8 @@ typedef enum {
  */
 @interface CCTransitionFlipAngular : CCTransitionSceneOriented
 {}
+// needed for BrdigeSupport
+-(id) init;
 @end
 
 /** CCTransitionZoomFlipX:
@@ -201,6 +231,8 @@ typedef enum {
  */
 @interface CCTransitionZoomFlipX : CCTransitionSceneOriented
 {}
+// needed for BrdigeSupport
+-(id) init;
 @end
 
 /** CCTransitionZoomFlipY:
@@ -209,6 +241,8 @@ typedef enum {
  */
 @interface CCTransitionZoomFlipY : CCTransitionSceneOriented
 {}
+// needed for BrdigeSupport
+-(id) init;
 @end
 
 /** CCTransitionZoomFlipAngular:
@@ -217,6 +251,8 @@ typedef enum {
  */
 @interface CCTransitionZoomFlipAngular : CCTransitionSceneOriented
 {}
+// needed for BrdigeSupport
+-(id) init;
 @end
 
 /** CCTransitionFade:
@@ -242,6 +278,8 @@ typedef enum {
 @class CCRenderTexture;
 @interface CCTransitionCrossFade : CCTransitionScene
 {}
+// needed for BrdigeSupport
+-(id) init;
 @end
 
 /** CCTransitionTurnOffTiles:
@@ -249,6 +287,8 @@ typedef enum {
  */
 @interface CCTransitionTurnOffTiles : CCTransitionScene <CCTransitionEaseScene>
 {}
+// needed for BrdigeSupport
+-(id) init;
 @end
 
 /** CCTransitionSplitCols:
@@ -264,6 +304,8 @@ typedef enum {
  */
 @interface CCTransitionSplitRows : CCTransitionSplitCols
 {}
+// Needed for BridgeSupport
+-(CCActionInterval*) action;
 @end
 
 /** CCTransitionFadeTR:
@@ -271,7 +313,7 @@ typedef enum {
  */
 @interface CCTransitionFadeTR : CCTransitionScene <CCTransitionEaseScene>
 {}
--(CCActionInterval*) actionWithSize:(ccGridSize) vector;
+-(CCActionInterval*) actionWithSize:(CGSize) vector;
 @end
 
 /** CCTransitionFadeBL:
@@ -279,6 +321,7 @@ typedef enum {
  */
 @interface CCTransitionFadeBL : CCTransitionFadeTR
 {}
+-(CCActionInterval*) actionWithSize:(CGSize) vector;
 @end
 
 /** CCTransitionFadeUp:
@@ -286,6 +329,7 @@ typedef enum {
  */
 @interface CCTransitionFadeUp : CCTransitionFadeTR
 {}
+-(CCActionInterval*) actionWithSize: (CGSize) v;
 @end
 
 /** CCTransitionFadeDown:
@@ -293,4 +337,5 @@ typedef enum {
  */
 @interface CCTransitionFadeDown : CCTransitionFadeTR
 {}
+-(CCActionInterval*) actionWithSize: (CGSize) v;
 @end

data/vendor/{Cocos2D → vendor-ios/cocos_2d}/include/CCTransitionPageTurn.h

@@ -39,7 +39,7 @@
  */
 @interface CCTransitionPageTurn : CCTransitionScene
 {
-	BOOL	back_;
+	BOOL	_back;
 }
 /**
  * creates a base transition with duration and incoming scene
@@ -55,6 +55,6 @@
  */
 -(id) initWithDuration:(ccTime) t scene:(CCScene*)s backwards:(BOOL) back;
 
--(CCActionInterval*) actionWithSize:(ccGridSize) vector;
+-(CCActionInterval*) actionWithSize:(CGSize) vector;
 
 @end

data/vendor/{Cocos2D → vendor-ios/cocos_2d}/include/CCTransitionProgress.h

@@ -27,36 +27,58 @@
 
 #import "CCTransition.h"
 
+@class CCProgressTimer;
+
 @interface CCTransitionProgress : CCTransitionScene
 {
-	float to_, from_;
-	CCScene *sceneToBeModified_;
+	float _to, _from;
+	CCScene *_sceneToBeModified;
 }
+// Needed for BridgeSupport
+-(CCProgressTimer*) progressTimerNodeWithRenderTexture:(CCRenderTexture*)texture;
 @end
 
 /** CCTransitionRadialCCW transition.
- A counter colock-wise radial transition to the next scene
+ A counter clock-wise radial transition to the next scene
  */
 @interface CCTransitionProgressRadialCCW : CCTransitionProgress
+{}
+// Needed for BridgeSupport
+-(CCProgressTimer*) progressTimerNodeWithRenderTexture:(CCRenderTexture*)texture;
 @end
 
 /** CCTransitionRadialCW transition.
- A counter colock-wise radial transition to the next scene
+ A counter clock-wise radial transition to the next scene
 */
 @interface CCTransitionProgressRadialCW : CCTransitionProgress
+{}
+// Needed for BridgeSupport
+-(CCProgressTimer*) progressTimerNodeWithRenderTexture:(CCRenderTexture*)texture;
 @end
 
 /** CCTransitionProgressHorizontal transition.
- A  colock-wise radial transition to the next scene
+ A  clock-wise radial transition to the next scene
  */
 @interface CCTransitionProgressHorizontal : CCTransitionProgress
+{}
+// Needed for BridgeSupport
+-(CCProgressTimer*) progressTimerNodeWithRenderTexture:(CCRenderTexture*)texture;
 @end
 
 @interface CCTransitionProgressVertical : CCTransitionProgress
+{}
+// Needed for BridgeSupport
+-(CCProgressTimer*) progressTimerNodeWithRenderTexture:(CCRenderTexture*)texture;
 @end
 
 @interface CCTransitionProgressInOut : CCTransitionProgress
+{}
+// Needed for BridgeSupport
+-(CCProgressTimer*) progressTimerNodeWithRenderTexture:(CCRenderTexture*)texture;
 @end
 
 @interface CCTransitionProgressOutIn : CCTransitionProgress
+{}
+// Needed for BridgeSupport
+-(CCProgressTimer*) progressTimerNodeWithRenderTexture:(CCRenderTexture*)texture;
 @end

data/vendor/{Cocos2D/include → vendor-ios/cocos_2d/include/Platforms}/CCGL.h

@@ -49,13 +49,15 @@
 #define glDeleteVertexArrays		glDeleteVertexArraysOES
 #define glGenVertexArrays			glGenVertexArraysOES
 #define glBindVertexArray			glBindVertexArrayOES
+#define glMapBuffer					glMapBufferOES
+#define glUnmapBuffer				glUnmapBufferOES
 
-#define CC_GL_DEPTH24_STENCIL8		GL_DEPTH24_STENCIL8_OES
+#define GL_DEPTH24_STENCIL8			GL_DEPTH24_STENCIL8_OES
+#define GL_WRITE_ONLY				GL_WRITE_ONLY_OES
 
 // Mac
 #elif __CC_PLATFORM_MAC
 
-#define CC_GL_DEPTH24_STENCIL8		GL_DEPTH24_STENCIL8
 
 #if 1
 #define glDeleteVertexArrays		glDeleteVertexArraysAPPLE

data/vendor/vendor-ios/cocos_2d/include/Platforms/Mac/CCDirectorMac.h

@@ -0,0 +1,110 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2010 Ricardo Quesada
+ * Copyright (c) 2011 Zynga Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+// Only compile this code on Mac. These files should not be included on your iOS project.
+// But in case they are included, it won't be compiled.
+#import "../../ccMacros.h"
+#ifdef __CC_PLATFORM_MAC
+
+#import <QuartzCore/CVDisplayLink.h>
+#import "../../CCDirector.h"
+
+@class CCEventDispatcher;
+
+enum  {
+	/// If the window is resized, it won't be autoscaled
+	kCCDirectorResize_NoScale,
+	/// If the window is resized, it will be autoscaled (default behavior)
+	kCCDirectorResize_AutoScale,
+};
+
+@interface CCDirector (MacExtension)
+/** sets the CCEventDispatcher (Mac only) */
+@property (nonatomic, readwrite, retain) CCEventDispatcher* eventDispatcher;
+
+/** converts an NSEvent to GL coordinates (Mac only) */
+-(CGPoint) convertEventToGL:(NSEvent*)event;
+@end
+
+/** Base class of Mac directors
+ @since v0.99.5
+ */
+@interface CCDirectorMac : CCDirector
+{
+	BOOL			_isFullScreen;
+	int				_resizeMode;
+	CGPoint			_winOffset;
+    CGSize			_originalWinSize;
+
+	NSWindow		*_fullScreenWindow;
+
+	// Event Dispatcher
+	CCEventDispatcher	*_eventDispatcher;
+
+	// cache
+	NSWindow		*_windowGLView;
+    NSView          *_superViewGLView;
+    NSRect          _originalWinRect; // Original size and position
+}
+
+// whether or not the view is in fullscreen mode
+@property (nonatomic, readonly) BOOL isFullScreen;
+
+// resize mode: with or without scaling
+@property (nonatomic, readwrite) int resizeMode;
+
+@property (nonatomic, readwrite) CGSize originalWinSize;
+
+/** Sets the view in fullscreen or window mode */
+- (void) setFullScreen:(BOOL)fullscreen;
+
+/** Converts window size coordinates to logical coordinates.
+ Useful only if resizeMode is kCCDirectorResize_Scale.
+ If resizeMode is kCCDirectorResize_NoScale, then no conversion will be done.
+*/
+- (CGPoint) convertToLogicalCoordinates:(CGPoint)coordinates;
+@end
+
+
+/** DisplayLinkDirector is a Director that synchronizes timers with the refresh rate of the display.
+ *
+ * Features and Limitations:
+ * - Only available on 3.1+
+ * - Scheduled timers & drawing are synchronizes with the refresh rate of the display
+ * - Only supports animation intervals of 1/60 1/30 & 1/15
+ *
+ * It is the recommended Director if the SDK is 3.1 or newer
+ *
+ * @since v0.8.2
+ */
+@interface CCDirectorDisplayLink : CCDirectorMac
+{
+	CVDisplayLinkRef displayLink;
+}
+@end
+
+#endif // __CC_PLATFORM_MAC
+