joybox 0.0.5 → 0.0.6

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

@@ -42,19 +42,17 @@ typedef enum {
  The progress can be Radial, Horizontal or vertical.
  @since v0.99.1
  */
-@interface CCProgressTimer : CCNode<CCRGBAProtocol> {
-	CCProgressTimerType	type_;
-	float				percentage_;
-	CCSprite			*sprite_;
+@interface CCProgressTimer : CCNodeRGBA {
+	CCProgressTimerType	_type;
+	float				_percentage;
+	CCSprite			*_sprite;
 
-	int					vertexDataCount_;
-	ccV2F_C4B_T2F		*vertexData_;
-	CGPoint				midpoint_;
-	CGPoint				barChangeRate_;
-	BOOL				reverseDirection_;
+	int					_vertexDataCount;
+	ccV2F_C4B_T2F		*_vertexData;
+	CGPoint				_midpoint;
+	CGPoint				_barChangeRate;
+	BOOL				_reverseDirection;
 }
-@property (nonatomic) ccColor3B color;
-@property (nonatomic) GLubyte opacity;
 /**	Change the percentage to change progress. */
 @property (nonatomic, readwrite) CCProgressTimerType type;
 @property (nonatomic, readwrite) BOOL reverseDirection;

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

@@ -25,33 +25,44 @@
 
 #import "ccMacros.h"
 #import "ccTypes.h"
-#import "CCTexture2D.h"
 
-#pragma mark -
-#pragma mark CCRGBAProtocol
+
+@class CCTexture2D;
+@class CCDirector;
+
+#pragma mark - CCRGBAProtocol
 
 /// CC RGBA protocol
 @protocol CCRGBAProtocol <NSObject>
-/** sets Color
+/** sets and returns the color (tint)
  @since v0.8
  */
--(void) setColor:(ccColor3B)color;
-/** returns the color
- @since v0.8
- */
--(ccColor3B) color;
+@property (nonatomic) ccColor3B color;
+/** returns the displayed color */
+@property (nonatomic, readonly) ccColor3B displayedColor;
+/** whether or not color should be propagated to its children */
+@property (nonatomic, getter = isCascadeColorEnabled) BOOL cascadeColorEnabled;
+
+/** recursive method that updates display color */
+- (void)updateDisplayedColor:(ccColor3B)color;
 
-/// returns the opacity
--(GLubyte) opacity;
-/** sets the opacity.
- @warning If the the texture has premultiplied alpha then, the R, G and B channels will be modifed.
+/** sets and returns the opacity.
+ @warning If the the texture has premultiplied alpha then, the R, G and B channels will be modified.
  Values goes from 0 to 255, where 255 means fully opaque.
  */
--(void) setOpacity: (GLubyte) opacity;
+@property (nonatomic) GLubyte opacity;
+/** returns the displayed opacity */
+@property (nonatomic, readonly) GLubyte displayedOpacity;
+/** whether or not opacity should be propagated to its children */
+@property (nonatomic, getter = isCascadeOpacityEnabled) BOOL cascadeOpacityEnabled;
+
+/** recursive method that updates the displayed opacity */
+- (void)updateDisplayedOpacity:(GLubyte)opacity;
+
 @optional
 /** sets the premultipliedAlphaOpacity property.
  If set to NO then opacity will be applied as: glColor(R,G,B,opacity);
- If set to YES then oapcity will be applied as: glColor(opacity, opacity, opacity, opacity );
+ If set to YES then opacity will be applied as: glColor(opacity, opacity, opacity, opacity );
  Textures with premultiplied alpha will have this property by default on YES. Otherwise the default value is NO
  @since v0.8
  */
@@ -62,10 +73,9 @@
  -(BOOL) doesOpacityModifyRGB;
 @end
 
-#pragma mark -
-#pragma mark CCBlendProtocol
+#pragma mark - CCBlendProtocol
 /**
- You can specify the blending fuction.
+ You can specify the blending function.
  @since v0.99.0
  */
 @protocol CCBlendProtocol <NSObject>
@@ -76,8 +86,7 @@
 @end
 
 
-#pragma mark -
-#pragma mark CCTextureProtocol
+#pragma mark - CCTextureProtocol
 
 /** CCNode objects that uses a Texture2D to render the images.
  The texture can have a blending function.
@@ -85,7 +94,7 @@
     src=GL_ONE dst= GL_ONE_MINUS_SRC_ALPHA
  else
 	src=GL_SRC_ALPHA dst= GL_ONE_MINUS_SRC_ALPHA
- But you can change the blending funtion at any time.
+ But you can change the blending function at any time.
  @since v0.8.0
  */
 @protocol CCTextureProtocol <CCBlendProtocol>
@@ -95,8 +104,7 @@
 -(void) setTexture:(CCTexture2D*)texture;
 @end
 
-#pragma mark -
-#pragma mark CCLabelProtocol
+#pragma mark - CCLabelProtocol
 /** Common interface for Labels */
 @protocol CCLabelProtocol <NSObject>
 /** sets a new label using an NSString.
@@ -114,19 +122,39 @@
 @end
 
 
-#pragma mark -
-#pragma mark CCDirectorDelegate
+#pragma mark - CCDirectorDelegate
 /** CCDirector delegate */
 @protocol CCDirectorDelegate <NSObject>
 
 @optional
-/** Called by CCDirector when the porjection is updated, and "custom" projection is used */
+/** Called by CCDirector when the projection is updated, and "custom" projection is used */
 -(void) updateProjection;
 
 #ifdef __CC_PLATFORM_IOS
 /** Returns a Boolean value indicating whether the CCDirector supports the specified orientation. Default value is YES (supports all possible orientations) */
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation;
 
+// Commented. See issue #1453 for further info: http://code.google.com/p/cocos2d-iphone/issues/detail?id=1453
+//- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration;
+
+/** Called when projection is resized (due to layoutSubviews on the view). This is important to respond to in order to setup your scene with the proper dimensions (which only exist after the first call to layoutSubviews) so that you can set your scene as early as possible to avoid startup flicker
+ */
+-(void) directorDidReshapeProjection:(CCDirector*)director;
+
 #endif // __CC_PLATFORM_IOS
 
 @end
+
+
+#pragma mark - CCAccelerometerDelegate
+
+#ifdef __CC_PLATFORM_IOS
+/** CCAccelerometerDelegate delegate */
+@class UIAcceleration;
+@class UIAccelerometer;
+@protocol CCAccelerometerDelegate <NSObject>
+
+@optional
+- (void)accelerometer:(UIAccelerometer *)accelerometer didAccelerate:(UIAcceleration *)acceleration;
+@end
+#endif // __CC_PLATFORM_IOS

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

@@ -45,7 +45,7 @@ typedef enum
 /**
  CCRenderTexture is a generic rendering target. To render things into it,
  simply construct a render target, call begin on it, call visit on any cocos2d
- scenes or objects to render them, and call end. For convienience, render texture
+ scenes or objects to render them, and call end. For convenience, render texture
  adds a sprite as its display child with the results, so you can simply add
  the render texture to your scene and treat it like any other CCNode.
  There are also functions for saving the render texture to disk in PNG or JPG format.
@@ -54,13 +54,19 @@ typedef enum
  */
 @interface CCRenderTexture : CCNode
 {
-	GLuint				fbo_;
-  GLuint depthRenderBufffer_;
-  GLint				oldFBO_;
-	CCTexture2D*		texture_;
-	CCSprite*			sprite_;
-
-	GLenum				pixelFormat_;
+	GLuint				_FBO;
+	GLuint				_depthRenderBufffer;
+	GLint				_oldFBO;
+	CCTexture2D*		_texture;
+	CCSprite*			_sprite;
+	GLenum				_pixelFormat;
+
+	// code for "auto" update
+	GLbitfield			_clearFlags;
+	ccColor4F			_clearColor;
+	GLclampf			_clearDepth;
+	GLint				_clearStencil;
+	BOOL				_autoDraw;
 }
 
 /** The CCSprite being used.
@@ -68,7 +74,21 @@ typedef enum
  The blending function can be changed in runtime by calling:
 	- [[renderTexture sprite] setBlendFunc:(ccBlendFunc){GL_ONE, GL_ONE_MINUS_SRC_ALPHA}];
 */
-@property (nonatomic,readwrite, assign) CCSprite* sprite;
+@property (nonatomic,readwrite, retain) CCSprite* sprite;
+
+/** Valid flags: GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT, GL_STENCIL_BUFFER_BIT. They can be OR'ed. Valid when "autoDraw is YES. */
+@property (nonatomic, readwrite) GLbitfield clearFlags;
+/** Clear color value. Valid only when "autoDraw" is YES. */
+@property (nonatomic, readwrite) ccColor4F clearColor;
+/** Value for clearDepth. Valid only when autoDraw is YES. */
+@property (nonatomic, readwrite) GLclampf clearDepth;
+/** Value for clear Stencil. Valid only when autoDraw is YES */
+@property (nonatomic, readwrite) GLint clearStencil;
+/** When enabled, it will render its children into the texture automatically. Disabled by default for compatiblity reasons.
+ Will be enabled in the future.
+ */
+@property (nonatomic, readwrite) BOOL autoDraw;
+
 
 /** initializes a RenderTexture object with width and height in Points and a pixel format( only RGB and RGBA formats are valid ) and depthStencil format*/
 +(id)renderTextureWithWidth:(int)w height:(int)h pixelFormat:(CCTexture2DPixelFormat) format depthStencilFormat:(GLuint)depthStencilFormat;

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

@@ -40,4 +40,8 @@
 @interface CCScene : CCNode
 {
 }
+/** initializes a node.
+ The node will be created as "autorelease".
+ */
+-(id) init;
 @end

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

@@ -42,44 +42,66 @@ typedef void (*TICK_IMP)(id, SEL, ccTime);
 /** Light weight timer */
 @interface CCTimer : NSObject
 {
-	id target;
-	TICK_IMP impMethod;
-
-	ccTime elapsed;
-	BOOL runForever;
-	BOOL useDelay;
-	uint nTimesExecuted;
-	uint repeat; //0 = once, 1 is 2 x executed
-	ccTime delay;
-
-@public					// optimization
-	ccTime interval;
-	SEL selector;
+	ccTime		_interval;
+	ccTime		_elapsed;
+	BOOL		_runForever;
+	BOOL		_useDelay;
+	uint		_nTimesExecuted;
+	uint		_repeat; //0 = once, 1 is 2 x executed
+	ccTime		_delay;
 }
+
 /** interval in seconds */
 @property (nonatomic,readwrite,assign) ccTime interval;
 
-/** Allocates a timer with a target and a selector.
-*/
+
+/** triggers the timer */
+-(void) update: (ccTime) dt;
+@end
+
+@interface CCTimerTargetSelector : CCTimer
+{
+	id			_target;
+	SEL			_selector;
+	TICK_IMP	_impMethod;
+}
+
+/** selector */
+@property (nonatomic,readonly)	SEL selector;
+
+/** Allocates a timer with a target and a selector. */
 +(id) timerWithTarget:(id) t selector:(SEL)s;
 
-/** Allocates a timer with a target, a selector and an interval in seconds.
-*/
+/** Allocates a timer with a target, a selector and an interval in seconds. */
 +(id) timerWithTarget:(id) t selector:(SEL)s interval:(ccTime)seconds;
 
-/** Initializes a timer with a target and a selector.
-*/
- -(id) initWithTarget:(id) t selector:(SEL)s;
+/** Initializes a timer with a target and a selector. */
+-(id) initWithTarget:(id) t selector:(SEL)s;
 
-/** Initializes a timer with a target, a selector, an interval in seconds, repeat in number of times to repeat, delay in seconds
-*/
+/** Initializes a timer with a target, a selector, an interval in seconds, repeat in number of times to repeat, delay in seconds */
 -(id) initWithTarget:(id)t selector:(SEL)s interval:(ccTime) seconds repeat:(uint) r delay:(ccTime) d;
+@end
 
 
-/** triggers the timer */
--(void) update: (ccTime) dt;
-@end
+@interface CCTimerBlock : CCTimer
+{
+	void (^_block)(ccTime delta);
+	NSString	*_key;
+	id			_target;
+}
+
+/** unique identifier of the block */
+@property (nonatomic, readonly) NSString *key;
 
+/** owner of the timer */
+@property (nonatomic, readonly, assign) id target;
+
+/** Allocates a timer with a target, interval in seconds, a key and a block */
++(id) timerWithTarget:(id)owner interval:(ccTime)seconds key:(NSString*)key block:(void(^)(ccTime delta)) block;
+
+/** Initializes a timer with a target(owner), interval in seconds, repeat in number of times to repeat, delay in seconds and a block */
+-(id) initWithTarget:(id)owner interval:(ccTime) seconds repeat:(uint) r delay:(ccTime)d key:(NSString*)key block:(void(^)(ccTime delta))block;
+@end
 
 
 //
@@ -103,7 +125,7 @@ struct _hashUpdateEntry;
 
 @interface CCScheduler : NSObject
 {
-	ccTime				timeScale_;
+	ccTime				_timeScale;
 
 	//
 	// "updates with priority" stuff
@@ -114,7 +136,7 @@ struct _hashUpdateEntry;
 	struct _hashUpdateEntry		*hashForUpdates;	// hash used to fetch quickly the list entries for pause,delete,etc.
 
 	// Used for "selectors with interval"
-	struct _hashSelectorEntry	*hashForSelectors;
+	struct _hashSelectorEntry	*hashForTimers;
 	struct _hashSelectorEntry	*currentTarget;
 	BOOL						currentTargetSalvaged;
 
@@ -123,17 +145,31 @@ struct _hashUpdateEntry;
 	SEL					updateSelector;
 
     BOOL updateHashLocked; // If true unschedule will not remove anything from a hash. Elements will only be marked for deletion.
+
+	BOOL				_paused;
 }
 
 /** Modifies the time of all scheduled callbacks.
- You can use this property to create a 'slow motion' or 'fast fordward' effect.
+ You can use this property to create a 'slow motion' or 'fast forward' effect.
  Default is 1.0. To create a 'slow motion' effect, use values below 1.0.
- To create a 'fast fordward' effect, use values higher than 1.0.
+ To create a 'fast forward' effect, use values higher than 1.0.
  @since v0.8
  @warning It will affect EVERY scheduled selector / action.
  */
 @property (nonatomic,readwrite) ccTime	timeScale;
 
+
+/** Will pause / resume the CCScheduler.
+ It won't dispatch any message to any target/selector, block if it is paused.
+
+ The difference between `pauseAllTargets` and `pause, is that `setPaused` will pause the CCScheduler,
+ while `pauseAllTargets` will pause all the targets, one by one.
+ `setPaused` will pause the whole Scheduler, meaning that calls to `resumeTargets:`, `resumeTarget:` won't affect it.
+
+ @since v2.1.0
+ */
+@property (nonatomic,readonly,getter=isPaused) BOOL paused;
+
 /** 'update' the scheduler.
  You should NEVER call this method, unless you know what you are doing.
  */
@@ -141,14 +177,14 @@ struct _hashUpdateEntry;
 
 /** The scheduled method will be called every 'interval' seconds.
  If paused is YES, then it won't be called until it is resumed.
- If 'interval' is 0, it will be called every frame, but if so, it recommened to use 'scheduleUpdateForTarget:' instead.
+ If 'interval' is 0, it will be called every frame, but if so, it recommended to use 'scheduleUpdateForTarget:' instead.
  If the selector is already scheduled, then only the interval parameter will be updated without re-scheduling it again.
- repeat let the action be repeated repeat + 1 times, use kCCRepeatForever to let the action run continiously
+ repeat lets the action be repeated repeat + 1 times, use kCCRepeatForever to let the action run continuously
  delay is the amount of time the action will wait before it'll start
 
  @since v0.99.3, repeat and delay added in v1.1
  */
--(void) scheduleSelector:(SEL)selector forTarget:(id)target interval:(ccTime)interval paused:(BOOL)paused repeat: (uint) repeat delay: (ccTime) delay;
+-(void) scheduleSelector:(SEL)selector forTarget:(id)target interval:(ccTime)interval repeat:(uint)repeat delay:(ccTime)delay paused:(BOOL)paused;
 
 /** calls scheduleSelector with kCCRepeatForever and a 0 delay */
 -(void) scheduleSelector:(SEL)selector forTarget:(id)target interval:(ccTime)interval paused:(BOOL)paused;
@@ -160,35 +196,53 @@ struct _hashUpdateEntry;
  */
 -(void) scheduleUpdateForTarget:(id)target priority:(NSInteger)priority paused:(BOOL)paused;
 
+/** The scheduled block will be called every 'interval' seconds.
+ 'key' is a unique identifier of the block. Needed to unschedule the block or update its interval.
+ 'target' is needed for all the method related to "target" like "pause" and "unschedule"
+ If 'interval' is 0, it will be called every frame, but if so, it recommended to use 'scheduleUpdateForTarget:' instead.
+ 'repeat' lets the action be repeated repeat + 1 times, use kCCRepeatForever to let the action run continuously.
+ 'delay' is the amount of time the action will wait before it'll start.
+  If paused is YES, then it won't be called until it is resumed.
+ If the block is already scheduled, then only the interval parameter will be updated without re-scheduling it again.
+ @since v2.1
+ */
+-(void) scheduleBlockForKey:(NSString*)key target:(id)target interval:(ccTime)interval repeat:(uint)repeat delay:(ccTime)delay paused:(BOOL)paused block:(void(^)(ccTime dt))block;
+
 /** Unshedules a selector for a given target.
  If you want to unschedule the "update", use unscheudleUpdateForTarget.
  @since v0.99.3
  */
 -(void) unscheduleSelector:(SEL)selector forTarget:(id)target;
 
+/** Unshedules a block for a given key / target pair.
+ If you want to unschedule the "update", use unscheudleUpdateForTarget.
+ @since v2.1
+ */
+-(void) unscheduleBlockForKey:(NSString*)key target:(id)target;
+
 /** Unschedules the update selector for a given target
  @since v0.99.3
  */
 -(void) unscheduleUpdateForTarget:(id)target;
 
-/** Unschedules all selectors for a given target.
+/** Unschedules all selectors and blocks for a given target.
  This also includes the "update" selector.
  @since v0.99.3
  */
--(void) unscheduleAllSelectorsForTarget:(id)target;
+-(void) unscheduleAllForTarget:(id)target;
 
-/** Unschedules all selectors from all targets.
+/** Unschedules all selectors and blocks from all targets.
  You should NEVER call this method, unless you know what you are doing.
 
  @since v0.99.3
  */
--(void) unscheduleAllSelectors;
+-(void) unscheduleAll;
 
-/** Unschedules all selectors from all targets with a minimum priority.
+/** Unschedules all selectors and blocks from all targets with a minimum priority.
   You should only call this with kCCPriorityNonSystemMin or higher.
   @since v2.0.0
   */
--(void) unscheduleAllSelectorsWithMinPriority:(NSInteger)minPriority;
+-(void) unscheduleAllWithMinPriority:(NSInteger)minPriority;
 
 /** Pauses the target.
  All scheduled selectors/update for a given target won't be 'ticked' until the target is resumed.
@@ -209,13 +263,13 @@ struct _hashUpdateEntry;
  */
 -(BOOL) isTargetPaused:(id)target;
 
-/** Pause all selectors from all targets.
+/** Pause all selectors and blocks from all targets.
   You should NEVER call this method, unless you know what you are doing.
  @since v2.0.0
   */
 -(NSSet*) pauseAllTargets;
 
-/** Pause all selectors from all targets with a minimum priority.
+/** Pause all selectors and blocks from all targets with a minimum priority.
   You should only call this with kCCPriorityNonSystemMin or higher.
   @since v2.0.0
   */

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

@@ -37,7 +37,7 @@
  */
 @interface CCShaderCache : NSObject {
 
-	NSMutableDictionary	*programs_;
+	NSMutableDictionary	*_programs;
 
 }
 

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

@@ -60,53 +60,50 @@
  *
  * The default anchorPoint in CCSprite is (0.5, 0.5).
  */
-@interface CCSprite : CCNode <CCRGBAProtocol, CCTextureProtocol>
+@interface CCSprite : CCNodeRGBA <CCTextureProtocol>
 {
 
 	//
 	// Data used when the sprite is rendered using a CCSpriteBatchNode
 	//
-	CCTextureAtlas			*textureAtlas_;			// Sprite Sheet texture atlas (weak reference)
-	NSUInteger				atlasIndex_;			// Absolute (real) Index on the batch node
-	CCSpriteBatchNode		*batchNode_;			// Used batch node (weak reference)
-	CGAffineTransform		transformToBatch_;		//
-	BOOL					dirty_;					// Sprite needs to be updated
-	BOOL					recursiveDirty_;		// Subchildren needs to be updated
-	BOOL					hasChildren_;			// optimization to check if it contain children
-	BOOL					shouldBeHidden_;		// should not be drawn because one of the ancestors is not visible
+	CCTextureAtlas			*_textureAtlas;			// Sprite Sheet texture atlas (weak reference)
+	NSUInteger				_atlasIndex;			// Absolute (real) Index on the batch node
+	CCSpriteBatchNode		*_batchNode;			// Used batch node (weak reference)
+	CGAffineTransform		_transformToBatch;		//
+	BOOL					_dirty;					// Sprite needs to be updated
+	BOOL					_recursiveDirty;		// Subchildren needs to be updated
+	BOOL					_hasChildren;			// optimization to check if it contain children
+	BOOL					_shouldBeHidden;		// should not be drawn because one of the ancestors is not visible
 
 	//
 	// Data used when the sprite is self-rendered
 	//
-	ccBlendFunc				blendFunc_;				// Needed for the texture protocol
-	CCTexture2D				*texture_;				// Texture used to render the sprite
+	ccBlendFunc				_blendFunc;				// Needed for the texture protocol
+	CCTexture2D				*_texture;				// Texture used to render the sprite
 
 	//
 	// Shared data
 	//
 
 	// sprite rectangle
-	CGRect	rect_;
+	CGRect	_rect;
 
 	// texture
-	BOOL	rectRotated_;
+	BOOL	_rectRotated;
 
 	// Offset Position (used by Zwoptex)
-	CGPoint	offsetPosition_;
-	CGPoint unflippedOffsetPositionFromCenter_;
+	CGPoint	_offsetPosition;
+	CGPoint _unflippedOffsetPositionFromCenter;
 
 	// vertex coords, texture coords and color info
-	ccV3F_C4B_T2F_Quad quad_;
+	ccV3F_C4B_T2F_Quad _quad;
 
 	// opacity and RGB protocol
-	GLubyte		opacity_;
-	ccColor3B	color_;
-	ccColor3B	colorUnmodified_;
-	BOOL		opacityModifyRGB_;
+	BOOL		_opacityModifyRGB;
 
 	// image is flipped
-	BOOL	flipX_;
-	BOOL	flipY_;
+	BOOL	_flipX;
+	BOOL	_flipY;
 }
 
 /** whether or not the Sprite needs to be updated in the Atlas */
@@ -135,10 +132,6 @@
 	sprite.scaleY *= -1;
  */
 @property (nonatomic,readwrite) BOOL flipY;
-/** opacity: conforms to CCRGBAProtocol protocol */
-@property (nonatomic,readwrite) GLubyte opacity;
-/** RGB colors: conforms to CCRGBAProtocol protocol */
-@property (nonatomic,readwrite) ccColor3B color;
 /** weak reference of the CCTextureAtlas used when the sprite is rendered using a CCSpriteBatchNode */
 @property (nonatomic,readwrite,assign) CCTextureAtlas *textureAtlas;
 /** weak reference to the CCSpriteBatchNode that renders the CCSprite */
@@ -187,7 +180,7 @@
 
 /** Creates an sprite with a CGImageRef and a key.
  The key is used by the CCTextureCache to know if a texture was already created with this CGImage.
- For example, a valid key is: @"sprite_frame_01".
+ For example, a valid key is: @"_spriteframe_01".
  If key is nil, then a new texture will be created each time by the CCTextureCache.
  @since v0.99.0
  */
@@ -235,7 +228,7 @@
 
 /** Initializes an sprite with a CGImageRef and a key
  The key is used by the CCTextureCache to know if a texture was already created with this CGImage.
- For example, a valid key is: @"sprite_frame_01".
+ For example, a valid key is: @"_spriteframe_01".
  If key is nil, then a new texture will be created each time by the CCTextureCache.
  @since v0.99.0
  */

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

@@ -53,11 +53,11 @@
  */
 @interface CCSpriteBatchNode : CCNode <CCTextureProtocol>
 {
-	CCTextureAtlas	*textureAtlas_;
-	ccBlendFunc		blendFunc_;
+	CCTextureAtlas	*_textureAtlas;
+	ccBlendFunc		_blendFunc;
 
-	// all descendants: chlidren, gran children, etc...
-	CCArray	*descendants_;
+	// all descendants: children, grandchildren, etc...
+	CCArray	*_descendants;
 }
 
 /** returns the TextureAtlas that is used */
@@ -66,7 +66,7 @@
 /** conforms to CCTextureProtocol protocol */
 @property (nonatomic,readwrite) ccBlendFunc blendFunc;
 
-/** descendants (children, gran children, etc) */
+/** descendants (children, grandchildren, etc) */
 @property (nonatomic,readonly) CCArray *descendants;
 
 /** creates a CCSpriteBatchNode with a texture2d and a default capacity of 29 children.
@@ -125,14 +125,21 @@
 @end
 
 @interface CCSpriteBatchNode (QuadExtensions)
-/** Adds a quad into the texture atlas but it won't be added into the children array.
+/** Inserts a quad at a certain index into the texture atlas. The CCSprite won't be added into the children array.
  This method should be called only when you are dealing with very big AtlasSrite and when most of the CCSprite won't be updated.
- For example: a tile map (CCTMXMap) or a label with lots of characgers (CCLabelBMFont)
+ For example: a tile map (CCTMXMap) or a label with lots of characters (CCLabelBMFont)
  */
--(id) addSpriteWithoutQuad:(CCSprite*)child z:(NSUInteger)z tag:(NSInteger)aTag;
+-(void) insertQuadFromSprite:(CCSprite*)sprite quadIndex:(NSUInteger)index;
+
+/** Updates a quad at a certain index into the texture atlas. The CCSprite won't be added into the children array.
+ This method should be called only when you are dealing with very big AtlasSrite and when most of the CCSprite won't be updated.
+ For example: a tile map (CCTMXMap) or a label with lots of characters (CCLabelBMFont)
+ */
+-(void) updateQuadFromSprite:(CCSprite*)sprite quadIndex:(NSUInteger)index;
 
 /* This is the opposite of "addQuadFromSprite".
  It adds the sprite to the children and descendants array, but it doesn't add it to the texture atlas.
  */
--(void) addQuadFromSprite:(CCSprite*)sprite quadIndex:(NSUInteger)index;
+-(id) addSpriteWithoutQuad:(CCSprite*)child z:(NSUInteger)z tag:(NSInteger)aTag;
+
 @end

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

@@ -40,20 +40,20 @@
  */
 @interface CCSpriteFrame : NSObject <NSCopying>
 {
-	CGRect			rect_;
-	CGRect			rectInPixels_;
-	BOOL			rotated_;
-    CGPoint			offset_;
-	CGPoint			offsetInPixels_;
-	CGSize			originalSize_;
-	CGSize			originalSizeInPixels_;
-	CCTexture2D		*texture_;
-	NSString		*textureFilename_;
+	CGRect			_rect;
+	CGRect			_rectInPixels;
+	BOOL			_rotated;
+    CGPoint			_offset;
+	CGPoint			_offsetInPixels;
+	CGSize			_originalSize;
+	CGSize			_originalSizeInPixels;
+	CCTexture2D		*_texture;
+	NSString		*_textureFilename;
 }
 /** rect of the frame in points. If it is updated, then rectInPixels will be updated too. */
 @property (nonatomic,readwrite) CGRect rect;
 
-/** rect of the frame in pixels. If it is updated, then rect (points) will be udpated too. */
+/** rect of the frame in pixels. If it is updated, then rect (points) will be updated too. */
 @property (nonatomic,readwrite) CGRect rectInPixels;
 
 /** whether or not the rect of the frame is rotated ( x = x+width, y = y+height, width = height, height = width ) */