joybox 0.0.5 → 0.0.6

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

@@ -28,29 +28,75 @@
  cocos2d (cc) configuration file
 */
 
+/** @def CC_ENABLE_CHIPMUNK_INTEGRATION
+ If enabled, it will include CCPhysicsScript and CCPhysicsDebugNode with Chipmunk Physics support.
+ If you enable it, make sure that Chipmunk is in the search path.
+ Disabled by default
+
+ @since v2.1
+ */
+#ifndef CC_ENABLE_CHIPMUNK_INTEGRATION
+#define CC_ENABLE_CHIPMUNK_INTEGRATION 0
+#endif
+
+/** @def CC_CHIPMUNK_IMPORT
+ Which file to import if using Chipmunk.
+ Change it to "ObjectiveChipmunk.h" or define it as a preprocessor macro if you are using ObjectiveChipmunk.
+ @since v2.1
+ */
+#if CC_ENABLE_CHIPMUNK_INTEGRATION && !defined(CC_CHIPMUNK_IMPORT)
+#define CC_CHIPMUNK_IMPORT "chipmunk.h"
+#endif
+
+/** @def CC_ENABLE_BOX2D_INTEGRATION
+ If enabled, it will include CCPhysicsScript with Box2D Physics support.
+ If you enable it, make sure that Box2D is in the search path.
+ 
+ Disabled by default
+ 
+ @since v2.1
+ */
+#ifndef CC_ENABLE_BOX2D_INTEGRATION
+#define CC_ENABLE_BOX2D_INTEGRATION 0
+#endif
+
+/** @def CC_ENABLE_STACKABLE_ACTIONS
+ If enabled, actions that alter the position property (eg: CCMoveBy, CCJumpBy, CCBezierBy, etc..) will be stacked.
+ If you run 2 or more 'position' actions at the same time on a node, then end position will be the sum of all the positions. 
+ If disabled, only the last run action will take effect.
+ 
+ Enabled by default. Disable to be compatible with v2.0 and older versions.
+
+ @since v2.1
+ */
+#ifndef CC_ENABLE_STACKABLE_ACTIONS
+#define CC_ENABLE_STACKABLE_ACTIONS 1
+#endif
+
+
 /** @def CC_ENABLE_GL_STATE_CACHE
  If enabled, cocos2d will maintain an OpenGL state cache internally to avoid unnecessary switches.
- In order to use them, you have to use the following functions, insead of the the GL ones:
+ In order to use them, you have to use the following functions, instead of the the GL ones:
 	- ccGLUseProgram() instead of glUseProgram()
 	- ccGLDeleteProgram() instead of glDeleteProgram()
 	- ccGLBlendFunc() instead of glBlendFunc()
 
  If this functionality is disabled, then ccGLUseProgram(), ccGLDeleteProgram(), ccGLBlendFunc() will call the GL ones, without using the cache.
 
- It is recommened to enable it whenever possible to improve speed.
+ It is recommended to enable it whenever possible to improve speed.
  If you are migrating your code from GL ES 1.1, then keep it disabled. Once all your code works as expected, turn it on.
 
- Default value: Disabled by default
+ Default value: Enabled by default
 
  @since v2.0.0
  */
 #ifndef CC_ENABLE_GL_STATE_CACHE
-#define CC_ENABLE_GL_STATE_CACHE 0
+#define CC_ENABLE_GL_STATE_CACHE 1
 #endif
 
 /** @def CC_ENABLE_DEPRECATED
  If enabled, cocos2d will compile all deprecated methods, classes and free functions. Also, renamed constants will be active as well.
- Enable it only when migrating a v1.0 or earlier v2.0 versions to the most recent cocdos2d version.
+ Enable it only when migrating a v1.0 or earlier v2.0 versions to the most recent cocos2d version.
  
  Default value: Enabled by default
  
@@ -108,7 +154,7 @@
 /** @def CC_DIRECTOR_IOS_USE_BACKGROUND_THREAD
  If enabled, cocos2d-ios will run on a background thread. If disabled cocos2d-ios will run the main thread.
 
- To enable set it to a 1, to disable it set to 0. Enabled by default.
+ To enable set it to a 1, to disable it set to 0. Disabled by default.
 
  Only valid for cocos2d-ios. Not supported on cocos2d-mac.
  
@@ -200,7 +246,7 @@
 
 /** @def CC_SPRITE_DEBUG_DRAW
  If enabled, all subclasses of CCSprite will draw a bounding box.
- Useful for debugging purposes only. It is recommened to leave it disabled.
+ Useful for debugging purposes only. It is recommended to leave it disabled.
 
  If the CCSprite is being drawn by a CCSpriteBatchNode, the bounding box might be a bit different.
  To enable set it to a value different than 0. Disabled by default:
@@ -215,7 +261,7 @@
 
 /** @def CC_LABELBMFONT_DEBUG_DRAW
  If enabled, all subclasses of CCLabelBMFont will draw a bounding box
- Useful for debugging purposes only. It is recommened to leave it disabled.
+ Useful for debugging purposes only. It is recommended to leave it disabled.
 
  To enable set it to a value different than 0. Disabled by default.
  */
@@ -225,7 +271,7 @@
 
 /** @def CC_LABELATLAS_DEBUG_DRAW
  If enabled, all subclasses of CCLabeltAtlas will draw a bounding box
- Useful for debugging purposes only. It is recommened to leave it disabled.
+ Useful for debugging purposes only. It is recommended to leave it disabled.
 
  To enable set it to a value different than 0. Disabled by default.
  */
@@ -243,3 +289,4 @@
 #ifndef CC_ENABLE_PROFILERS
 #define CC_ENABLE_PROFILERS 0
 #endif
+

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

@@ -44,6 +44,8 @@
 #import "Platforms/Mac/CCDirectorMac.h"
 #import "Platforms/iOS/CCTouchDispatcher.h"
 #import "Platforms/iOS/CCDirectorIOS.h"
+#import "CCActionTiledGrid.h"
+#import "CCActionGrid3D.h"
 
 
 /*
@@ -57,6 +59,9 @@
 // CCLOGERROR is no longer supported.
 #define CCLOGERROR CCLOGWARN
 
+#define ccGridSize CGSize
+#define ccg CGSizeMake
+
 // ccTypes.h
 enum {
 #ifdef __CC_PLATFORM_IOS
@@ -107,9 +112,18 @@ DEPRECATED_ATTRIBUTE @interface MacView : CCGLView
 #define GLProgram CCGLProgram
 
 // Extensions
+
 @interface CCScheduler (Deprecated)
 // new: [director scheduler]
 +(CCScheduler*) sharedScheduler DEPRECATED_ATTRIBUTE;
+// new: -(void) scheduleSelector:(SEL)selector forTarget:(id)target interval:(ccTime)interval repeat: (uint) repeat delay: (ccTime) delay paused:(BOOL)paused;
+-(void) scheduleSelector:(SEL)selector forTarget:(id)target interval:(ccTime)interval paused:(BOOL)paused repeat:(uint)repeat delay:(ccTime)delay DEPRECATED_ATTRIBUTE;
+// new: unscheduleAllForTarget
+-(void) unscheduleAllSelectorsForTarget:(id)target DEPRECATED_ATTRIBUTE;
+// new: unscheduleAll
+-(void) unscheduleAllSelectors DEPRECATED_ATTRIBUTE;
+// new: unscheduleAllWithMinPriority:
+-(void) unscheduleAllSelectorsWithMinPriority:(NSInteger)minPriority DEPRECATED_ATTRIBUTE;
 @end
 
 @interface CCActionManager (Deprecated)
@@ -130,6 +144,8 @@ DEPRECATED_ATTRIBUTE @interface MacView : CCGLView
 #endif // __CC_PLATFORM_MAC
 
 @interface CCDirector (Deprecated)
+// new: [director isPaused]
+-(BOOL) getIsPaused DEPRECATED_ATTRIBUTE;
 // new: setView:
 -(void) setOpenGLView:(CCGLView*)view DEPRECATED_ATTRIBUTE;
 // new: view
@@ -143,6 +159,26 @@ DEPRECATED_ATTRIBUTE @interface MacView : CCGLView
 -(BOOL) isRelativeAnchorPoint DEPRECATED_ATTRIBUTE;
 @end
 
+@interface CCLayer (Deprecated)
+#if __CC_PLATFORM_IOS
+// new: setTouchEnabled:
+-(void) setIsTouchEnabled:(BOOL)enabled DEPRECATED_ATTRIBUTE;
+// new: setAccelerometerEnabled:
+-(void) setIsAccelerometerEnabled:(BOOL)enabled DEPRECATED_ATTRIBUTE;
+#elif __CC_PLATFORM_MAC
+-(void) setIsTouchEnabled:(BOOL)enabled DEPRECATED_ATTRIBUTE;
+-(void) setIsKeyboardEnabled:(BOOL)enabled DEPRECATED_ATTRIBUTE;
+-(void) setIsMouseEnabled:(BOOL)enabled DEPRECATED_ATTRIBUTE;
+// new: setMouseEnabled:priority:
+-(NSInteger) mouseDelegatePriority DEPRECATED_ATTRIBUTE;
+// new: setKeyboardEnabled:priority:
+-(NSInteger) keyboardDelegatePriority DEPRECATED_ATTRIBUTE;
+// new: setTouchEnabled:priority:
+-(NSInteger) touchDelegatePriority DEPRECATED_ATTRIBUTE;
+#endif // __CC_PLATFORM_MAC
+@end
+
+
 @interface CCSprite (Deprecated)
 // new: spriteWithTexture:rect:
 +(id) spriteWithBatchNode:(CCSpriteBatchNode*)node rect:(CGRect)rect DEPRECATED_ATTRIBUTE;
@@ -152,6 +188,12 @@ DEPRECATED_ATTRIBUTE @interface MacView : CCGLView
 -(CCSpriteFrame*) displayedFrame DEPRECATED_ATTRIBUTE;
 @end
 
+@interface CCMenuItem (Deprecated)
+// new: -(CGRect) activeArea;
+-(CGRect) rect DEPRECATED_ATTRIBUTE;
+-(void) setRect:(CGRect)rect DEPRECATED_ATTRIBUTE;
+@end
+
 @interface CCMenuItemAtlasFont (Deprecated)
 // new itemWithStirng:charmapFile:itemWidth:itemHeight:startCharMap
 +(id) itemFromString: (NSString*) value charMapFile:(NSString*) charMapFile itemWidth:(int)itemWidth itemHeight:(int)itemHeight startCharMap:(char)startCharMap DEPRECATED_ATTRIBUTE;
@@ -285,6 +327,12 @@ DEPRECATED_ATTRIBUTE @interface MacView : CCGLView
 + (id) labelWithString:(NSString*)string dimensions:(CGSize)dimensions alignment:(CCTextAlignment)alignment fontName:(NSString*)name fontSize:(CGFloat)size DEPRECATED_ATTRIBUTE;
 // new: + (id) labelWithString:(NSString*)string dimensions:hAlignment:lineBreakMode:fontName:fontSize:
 + (id) labelWithString:(NSString*)string dimensions:(CGSize)dimensions alignment:(CCTextAlignment)alignment lineBreakMode:(CCLineBreakMode)lineBreakMode fontName:(NSString*)name fontSize:(CGFloat)size DEPRECATED_ATTRIBUTE;
+
++ (id) labelWithString:(NSString*)string dimensions:(CGSize)dimensions hAlignment:(CCTextAlignment)alignment fontName:(NSString*)name fontSize:(CGFloat)size DEPRECATED_ATTRIBUTE;
++ (id) labelWithString:(NSString*)string dimensions:(CGSize)dimensions hAlignment:(CCTextAlignment)alignment lineBreakMode:(CCLineBreakMode)lineBreakMode fontName:(NSString*)name fontSize:(CGFloat)size DEPRECATED_ATTRIBUTE;
++ (id) labelWithString:(NSString*)string dimensions:(CGSize)dimensions hAlignment:(CCTextAlignment)alignment vAlignment:(CCVerticalTextAlignment)vertAlignment lineBreakMode:(CCLineBreakMode)lineBreakMode fontName:(NSString*)name fontSize:(CGFloat)size DEPRECATED_ATTRIBUTE;
++ (id) labelWithString:(NSString*)string dimensions:(CGSize)dimensions hAlignment:(CCTextAlignment)alignment vAlignment:(CCVerticalTextAlignment)vertAlignment fontName:(NSString*)name fontSize:(CGFloat)size DEPRECATED_ATTRIBUTE;
+
 // new: + (id) initWithString:(NSString*)string dimensions:hAlignment:fontName:fontSize:
 - (id) initWithString:(NSString*)string dimensions:(CGSize)dimensions alignment:(CCTextAlignment)alignment fontName:(NSString*)name fontSize:(CGFloat)size DEPRECATED_ATTRIBUTE;
 // new: + (id) initWithString:(NSString*)string dimensions:hAlignment:lineBreakMode:fontName:fontSize:
@@ -296,5 +344,88 @@ DEPRECATED_ATTRIBUTE @interface MacView : CCGLView
 - (id) initWithString:(NSString*)string dimensions:(CGSize)dimensions alignment:(CCTextAlignment)alignment fontName:(NSString*)name fontSize:(CGFloat)size DEPRECATED_ATTRIBUTE;
 @end
 
+// Effects
+#pragma mark - Effects
+
+@interface CCGridAction (Deprecated)
++(id) actionWithSize:(CGSize)size duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id) initWithSize:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCWaves3D (Deprecated)
++(id)actionWithWaves:(int)wav amplitude:(float)amp grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithWaves:(int)wav amplitude:(float)amp grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCLens3D (Deprecated)
++(id)actionWithPosition:(CGPoint)pos radius:(float)r grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithPosition:(CGPoint)pos radius:(float)r grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCRipple3D (Deprecated)
++(id)actionWithPosition:(CGPoint)pos radius:(float)r waves:(int)wav amplitude:(float)amp grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithPosition:(CGPoint)pos radius:(float)r waves:(int)wav amplitude:(float)amp grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCShaky3D (Deprecated)
++(id)actionWithRange:(int)range shakeZ:(BOOL)shakeZ grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithRange:(int)range shakeZ:(BOOL)shakeZ grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCLiquid (Deprecated)
++(id)actionWithWaves:(int)wav amplitude:(float)amp grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithWaves:(int)wav amplitude:(float)amp grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCWaves (Deprecated)
++(id)actionWithWaves:(int)wav amplitude:(float)amp horizontal:(BOOL)h vertical:(BOOL)v grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithWaves:(int)wav amplitude:(float)amp horizontal:(BOOL)h vertical:(BOOL)v grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCTwirl (Deprecated)
++(id)actionWithPosition:(CGPoint)pos twirls:(int)t amplitude:(float)amp grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithPosition:(CGPoint)pos twirls:(int)t amplitude:(float)amp grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCShakyTiles3D (Deprecated)
++(id)actionWithRange:(int)range shakeZ:(BOOL)shakeZ grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithRange:(int)range shakeZ:(BOOL)shakeZ grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCShatteredTiles3D  (Deprecated)
++(id)actionWithRange:(int)range shatterZ:(BOOL)shatterZ grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithRange:(int)range shatterZ:(BOOL)shatterZ grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCShuffleTiles (Deprecated)
++(id)actionWithSeed:(int)s grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithSeed:(int)s grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCTurnOffTiles (Deprecated)
++(id)actionWithSeed:(int)s grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithSeed:(int)s grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCWavesTiles3D  (Deprecated)
++(id)actionWithWaves:(int)wav amplitude:(float)amp grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithWaves:(int)wav amplitude:(float)amp grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCJumpTiles3D (Deprecated)
++(id)actionWithJumps:(int)j amplitude:(float)amp grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+-(id)initWithJumps:(int)j amplitude:(float)amp grid:(CGSize)gridSize duration:(ccTime)d DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCSplitRows (Deprecated)
++(id)actionWithRows:(int)rows duration:(ccTime)duration DEPRECATED_ATTRIBUTE;
+-(id)initWithRows:(int)rows duration:(ccTime)duration DEPRECATED_ATTRIBUTE;
+@end
+
+@interface CCSplitCols  (Deprecated)
++(id)actionWithCols:(int)cols duration:(ccTime)duration DEPRECATED_ATTRIBUTE;
+-(id)initWithCols:(int)cols duration:(ccTime)duration DEPRECATED_ATTRIBUTE;
+@end
+
 #endif // CC_ENABLE_DEPRECATED
 

data/vendor/vendor-ios/cocos_2d/include/ccFPSImages.h

@@ -0,0 +1,39 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2012 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.
+ */
+
+extern unsigned char cc_fps_images_png[];
+extern unsigned char cc_fps_images_hd_png[];
+extern unsigned char cc_fps_images_ipadhd_png[];
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+unsigned int cc_fps_images_len(void);
+unsigned int cc_fps_images_hd_len(void);
+unsigned int cc_fps_images_ipadhd_len(void);
+
+#ifdef __cplusplus
+}
+#endif

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

@@ -32,11 +32,11 @@
 /** vertex attrib flags */
 enum {
 	kCCVertexAttribFlag_None		= 0,
-
+	
 	kCCVertexAttribFlag_Position	= 1 << 0,
 	kCCVertexAttribFlag_Color		= 1 << 1,
 	kCCVertexAttribFlag_TexCoords	= 1 << 2,
-
+	
 	kCCVertexAttribFlag_PosColorTex = ( kCCVertexAttribFlag_Position | kCCVertexAttribFlag_Color | kCCVertexAttribFlag_TexCoords ),
 };
 
@@ -45,20 +45,21 @@ typedef enum {
 //	CC_GL_SCISSOR_TEST = 1 << 0,
 //	CC_GL_STENCIL_TEST = 1 << 1,
 //	CC_GL_DEPTH_TEST = 1 << 2,
-	CC_GL_BLEND = 1 << 3,
+//	CC_GL_BLEND = 1 << 3,
 //	CC_GL_DITHER = 1 << 4,
 
 //	CC_GL_ALL = ( CC_GL_SCISSOR_TEST | CC_GL_STENCIL_TEST | CC_GL_DEPTH_TEST | CC_GL_BLEND | CC_GL_DITHER ),
-	CC_GL_ALL = ( CC_GL_BLEND ),
-
+//	CC_GL_ALL = ( CC_GL_BLEND ),
+	CC_GL_ALL = 0,
+	
 } ccGLServerState;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-
+	
 /** @file ccGLStateCache.h
-*/
+ */
 
 /** Invalidates the GL state cache.
  If CC_ENABLE_GL_STATE_CACHE it will reset the GL state cache.
@@ -84,6 +85,12 @@ void ccGLDeleteProgram( GLuint program );
  */
 void ccGLBlendFunc(GLenum sfactor, GLenum dfactor);
 
+/** Resets the blending mode back to the cached state in case you used glBlendFuncSeparate() or glBlendEquation().
+ If CC_ENABLE_GL_STATE_CACHE is disabled, it will just set the default blending mode using GL_FUNC_ADD.
+ @since v2.0.0
+ */
+void ccGLBlendResetToCache(void);
+
 /** sets the projection matrix as dirty
  @since v2.0.0
  */
@@ -91,48 +98,59 @@ void ccSetProjectionMatrixDirty( void );
 
 /** Will enable the vertex attribs that are passed as flags.
  Possible flags:
-
-	* kCCVertexAttribFlag_Position
-	* kCCVertexAttribFlag_Color
-	* kCCVertexAttribFlag_TexCoords
-
+ 
+ * kCCVertexAttribFlag_Position
+ * kCCVertexAttribFlag_Color
+ * kCCVertexAttribFlag_TexCoords
+ 
  These flags can be ORed. The flags that are not present, will be disabled.
-
+ 
  @since v2.0.0
  */
 void ccGLEnableVertexAttribs( unsigned int flags );
 
-/** If the active texture is not textureEnum, then it will active it.
- If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glActiveTexture() directly.
- @since v2.0.0
+/** If the texture is not already bound to texture unit 0 and if target is GL_TEXTURE_2D, it binds it.
+ If CC_ENABLE_GL_STATE_CACHE is disabled or if target != GL_TEXTURE_2D it will call glBindTexture() directly.
+ @since v2.1
  */
-void ccGLActiveTexture(GLenum textureEnum );
+void ccGLBindTexture( GLenum target, GLuint textureId );
 
-/** Returns the active texture.
- If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glGetIntegerv(GL_ACTIVE_TEXTURE);
+/** If the texture is not already bound to texture unit 0, it binds it.
+ If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glBindTexture() directly.
  @since v2.0.0
  */
-GLenum ccGLGetActiveTexture( void );
-
+void ccGLBindTexture2D( GLuint textureId );
 
-/** If the texture is not already bound, it binds it.
+/** If the texture is not already bound to a given unit, it binds it.
  If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glBindTexture() directly.
- @since v2.0.0
+ @since v2.1.0
  */
-void ccGLBindTexture2D(GLuint textureId );
+void ccGLBindTexture2DN( GLuint textureUnit, GLuint textureId );
 
-/** It will delete a given texture. If the texture was bound, it will invalidate the cached.
+/** It will delete a given texture. If the texture was bound, it will invalidate the cached for texture unit 0.
  If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glDeleteTextures() directly.
  @since v2.0.0
  */
 void ccGLDeleteTexture(GLuint textureId);
 
+/** It will delete a given texture. If the texture was bound, it will invalidate the cached for the given texture unit.
+ If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glDeleteTextures() directly.
+ @since v2.1.0
+ */
+void ccGLDeleteTextureN( GLuint textureUnit, GLuint textureId );
+
+/** If the vertex array is not already bound, it binds it.
+ If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glBindVertexArray() directly.
+ @since v2.0.0
+ */
+void ccGLBindVAO(GLuint vaoId);
+
 /** It will enable / disable the server side GL states.
  If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glEnable() directly.
  @since v2.0.0
  */
 void ccGLEnable( ccGLServerState flags );
-
+	
 #ifdef __cplusplus
 }
 #endif

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

@@ -47,12 +47,12 @@
  *
  * if COCOS2D_DEBUG==1 then:
  *		CCLOG() will be enabled
- *		CCLOGERROR() will be enabled
+ *		CCLOGWARN() will be enabled
  *		CCLOGINFO()	will be disabled
  *
  * if COCOS2D_DEBUG==2 or higher then:
  *		CCLOG() will be enabled
- *		CCLOGERROR() will be enabled
+ *		CCLOGWARN() will be enabled
  *		CCLOGINFO()	will be enabled
  */
 
@@ -110,7 +110,7 @@ simple macro that swaps 2 variables
  */
 #define CC_RADIANS_TO_DEGREES(__ANGLE__) ((__ANGLE__) * 57.29577951f) // PI * 180
 
-#define kCCRepeatForever UINT_MAX -1
+#define kCCRepeatForever (UINT_MAX -1)
 /** @def CC_BLEND_SRC
 default gl blend src function. Compatible with premultiplied alpha images.
 */
@@ -120,7 +120,7 @@ default gl blend src function. Compatible with premultiplied alpha images.
 /** @def CC_DIRECTOR_INIT
 	- Initializes an CCGLView with 0-bit depth format, and RGB565 render buffer.
 	- The CCGLView view will have multiple touches disabled.
-	- It will create a UIWindow and it will assign it the 'window_' ivar. 'window_' must be declared before calling this marcro.
+	- It will create a UIWindow and it will assign it the 'window_' ivar. 'window_' must be declared before calling this macro.
     - It will create a UINavigationController and it will assign it the 'navigationController_' ivar. 'navController_' must be declared before using this macro.
     - The director_ will be the root view controller of the navController.
 	- It will connect the CCGLView to the Director
@@ -188,10 +188,10 @@ do	{																							\
  */
 #define CC_NODE_DRAW_SETUP()																	\
 do {																							\
-	ccGLEnable( glServerState_ );																\
-    NSAssert1(shaderProgram_, @"No shader program set for node: %@", self);						\
-	[shaderProgram_ use];																		\
-	[shaderProgram_ setUniformForModelViewProjectionMatrix];									\
+	ccGLEnable( _glServerState );																\
+    NSAssert1(_shaderProgram, @"No shader program set for node: %@", self);						\
+	[_shaderProgram use];																		\
+	[_shaderProgram setUniformsForBuiltins];									\
 } while(0)
 
 
@@ -337,7 +337,7 @@ CGSizeMake( (__size_in_points__).width * CC_CONTENT_SCALE_FACTOR(), (__size_in_p
 #define CC_ARC_UNSAFE_RETAINED
 #endif
 
-/** @def CC_INCREMENT_GL_DRAWS_BY_ONE
+/** @def CC_INCREMENT_GL_DRAWS
  Increments the GL Draws counts by one.
  The number of calls per frame are displayed on the screen when the CCDirector's stats are enabled.
  */

data/vendor/vendor-ios/cocos_2d/include/ccShader_PositionColorLengthTexture_frag.h

@@ -0,0 +1,41 @@
+/* Copyright (c) 2012 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+"																															\n\
+#extension GL_OES_standard_derivatives : enable																				\n\
+																															\n\
+#ifdef GL_ES																												\n\
+varying mediump vec4 v_color;																								\n\
+varying mediump vec2 v_texcoord;																							\n\
+#else																														\n\
+varying vec4 v_color;																										\n\
+varying vec2 v_texcoord;																									\n\
+#endif																														\n\
+																															\n\
+void main()																													\n\
+{																															\n\
+#if defined GL_OES_standard_derivatives																						\n\
+	gl_FragColor = v_color*smoothstep(0.0, length(fwidth(v_texcoord)), 1.0 - length(v_texcoord));							\n\
+#else																														\n\
+	gl_FragColor = v_color*step(0.0, 1.0 - length(v_texcoord));																\n\
+#endif																														\n\
+}																															\n\
+";

data/vendor/vendor-ios/cocos_2d/include/ccShader_PositionColorLengthTexture_vert.h

@@ -0,0 +1,47 @@
+/* Copyright (c) 2012 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+"																	\n\
+#ifdef GL_ES														\n\
+attribute mediump vec4 a_position;									\n\
+attribute mediump vec2 a_texcoord;									\n\
+attribute mediump vec4 a_color;										\n\
+																	\n\
+varying mediump vec4 v_color;										\n\
+varying mediump vec2 v_texcoord;									\n\
+																	\n\
+#else																\n\
+attribute vec4 a_position;											\n\
+attribute vec2 a_texcoord;											\n\
+attribute vec4 a_color;												\n\
+																	\n\
+varying vec4 v_color;												\n\
+varying vec2 v_texcoord;											\n\
+#endif																\n\
+																	\n\
+void main()															\n\
+{																	\n\
+	v_color = vec4(a_color.rgb * a_color.a, a_color.a);				\n\
+	v_texcoord = a_texcoord;										\n\
+																	\n\
+	gl_Position = CC_MVPMatrix * a_position;						\n\
+}																	\n\
+";

data/vendor/vendor-ios/cocos_2d/include/ccShader_PositionColor_frag.h

@@ -0,0 +1,37 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2011 Ricardo Quesada
+ * Copyright (c) 2012 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.
+ */
+
+"													\n\
+#ifdef GL_ES										\n\
+precision lowp float;								\n\
+#endif												\n\
+													\n\
+varying vec4 v_fragmentColor;						\n\
+													\n\
+void main()											\n\
+{													\n\
+	gl_FragColor = v_fragmentColor;					\n\
+}													\n\
+";