Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop

Author: jtwigg

cocos2d-ui-tests/tests/CCRendererTest.m

@@ -175,7 +175,10 @@ -(void)setupInfiniteWindowTest
 	CCNode *contentNode = self.contentNode;
 	CGSize size = [CCDirector sharedDirector].designSize;
 
-	[self scheduleBlock:^(CCTimer *timer) {
+	CCNode *node = [CCNode node];
+	[self.contentNode addChild:node];
+	
+	[node scheduleBlock:^(CCTimer *timer) {
 		CCRenderTexture *rt = [CCRenderTexture renderTextureWithWidth:size.width height:size.height];
 
 		[rt begin];
@@ -383,7 +386,7 @@ - (void)setupProgressNodeTest
 
 	// Radial timer
 	{
-		NSString *image = @"Tiles/05.png";
+		NSString *image = @"Tiles/06.png";
 		CGPoint position = ccp(0.1, 0.25);
 		CCTime interval = 1.0/60.0;
 
@@ -407,7 +410,7 @@ - (void)setupProgressNodeTest
 
 	// Radial timer with animating midpoint.
 	{
-		NSString *image = @"Tiles/05.png";
+		NSString *image = @"Tiles/06.png";
 		CGPoint position = ccp(0.1, 0.5);
 		CCTime interval = 1.0/60.0;
 
@@ -432,7 +435,7 @@ - (void)setupProgressNodeTest
 	}
 
 	{
-		NSString *image = @"Tiles/05.png";
+		NSString *image = @"Tiles/06.png";
 		CGPoint position = ccp(0.2, 0.25);
 		CCTime interval = 1.0/60.0;
 
@@ -458,7 +461,7 @@ - (void)setupProgressNodeTest
 	}
 
 	{
-		NSString *image = @"Tiles/05.png";
+		NSString *image = @"Tiles/06.png";
 		CGPoint position = ccp(0.2, 0.5);
 		CCTime interval = 1.0/60.0;
 
@@ -484,7 +487,7 @@ - (void)setupProgressNodeTest
 	}
 
 	{
-		NSString *image = @"Tiles/05.png";
+		NSString *image = @"Tiles/06.png";
 		CGPoint position = ccp(0.3, 0.25);
 		CCTime interval = 1.0/60.0;
 
@@ -510,7 +513,7 @@ - (void)setupProgressNodeTest
 	}
 
 	{
-		NSString *image = @"Tiles/05.png";
+		NSString *image = @"Tiles/06.png";
 		CGPoint position = ccp(0.3, 0.5);
 		CCTime interval = 1.0/60.0;
 
@@ -536,7 +539,7 @@ - (void)setupProgressNodeTest
 	}
 
 	{
-		NSString *image = @"Tiles/05.png";
+		NSString *image = @"Tiles/06.png";
 		CGPoint position = ccp(0.4, 0.25);
 		CCTime interval = 1.0/60.0;
 
@@ -562,7 +565,7 @@ - (void)setupProgressNodeTest
 	}
 
 	{
-		NSString *image = @"Tiles/05.png";
+		NSString *image = @"Tiles/06.png";
 		CGPoint position = ccp(0.4, 0.5);
 		CCTime interval = 1.0/60.0;
 
@@ -588,7 +591,7 @@ - (void)setupProgressNodeTest
 	}
 
 	{
-		NSString *image = @"Tiles/05.png";
+		NSString *image = @"Tiles/06.png";
 		CGPoint position = ccp(0.5, 3.0/8.0);
 
 		CCSprite *sprite = [CCSprite spriteWithImageNamed:image];

cocos2d-ui/CCBReader/CCAnimationManager.h

@@ -30,14 +30,24 @@
 
 #pragma mark Animation Manager Delegate
 
+/**
+ * The animation manager delegate receives callbacks when animation sequences finishes playing.
+ */
 @protocol CCBAnimationManagerDelegate <NSObject>
 
+/**
+ * Called when an animation sequence has finished playing.
+ * @param name The name of the sequence that just finished playing.
+ */
 - (void) completedAnimationSequenceNamed:(NSString*)name;
 
 @end
 
 #pragma mark Animation Manager
 
+/**
+ * The animation manager plays back animations, usually created by a tool such as SpriteBuilder. Any animation can have an arbitrary number of sequences (timelines) which each have keyframes for different properties.
+ */
 @interface CCAnimationManager : NSObject <CCSchedulerTarget>
 {
     NSMutableDictionary* _nodeSequences;
@@ -56,39 +66,56 @@
 
 }
 
-// Animation manager updates on a fixed timestep.
+/// If set to true the animation manager will run on a fixed time step, this is required to run animations toghether with physics.
 @property (nonatomic,assign) bool fixedTimestep;
 
 
-// Delegate.
+/// The animation manager delegate receives updates about the animations currently being played.
 @property (nonatomic,weak) NSObject<CCBAnimationManagerDelegate>* delegate;
 
-// Currently running sequence name.
+/// The name of the currently running sequence (timeline).
 @property (unsafe_unretained, nonatomic,readonly) NSString* runningSequenceName;
 
-// Last sequence name completed.
+/// The name of the last completed sequence (timeline).
 @property (nonatomic,readonly) NSString* lastCompletedSequenceName;
 
-// Speed.
+/// Playback speed, default is 1 and corresponds to the normal playback speed. Use this property for fast forward or slow motion playback.
 @property (nonatomic,assign) float playbackSpeed;
 
-// Pause.
+/// Set to true to pause the animation currently being run.
 @property (nonatomic,assign) bool paused;
 
 
 
-// Run an animation.
+/**
+ * Plays an animation sequence (timeline) by its name.
+ * @param name The name of the sequence to play.
+ */
 - (void) runAnimationsForSequenceNamed:(NSString*)name;
+
+/**
+ * Plays an animation sequence (timeline) by its name, tweens smoothly to the new sequence.
+ * @param name The name of the sequence to play.
+ * @param tweenDuration Time to tween to the new sequence.
+ */
 - (void) runAnimationsForSequenceNamed:(NSString*)name tweenDuration:(float)tweenDuration;
 
-// Animation call back.
+/**
+ * Sets a block to be called when an animation sequence has finished playing.
+ * @param b The block to call.
+ */
 -(void) setCompletedAnimationCallbackBlock:(void(^)(id sender))b;
 
 #pragma mark Time Controls
 
 //Renamed to jumpToSequenceNamed:time
-- (void)timeSeekForSequenceNamed:(NSString*)name time:(float)time __attribute__((deprecated));
+//- (void)timeSeekForSequenceNamed:(NSString*)name time:(float)time __attribute__((deprecated));
 
+/**
+ * Jumps to a specific time in a specific sequence (timeline).
+ * @param name The name of the sequence to jump to.
+ * @param time The time in the sequence.
+ */
 - (void)jumpToSequenceNamed:(NSString*)name time:(float)time;
 
 @end

cocos2d-ui/CCButton.m

@@ -343,7 +343,7 @@ - (void) stateChanged
 - (void) setHitAreaExpansion:(float)hitAreaExpansion
 {
     _originalHitAreaExpansion = hitAreaExpansion;
-    [super hitAreaExpansion];
+    [super setHitAreaExpansion:hitAreaExpansion];
 }
 
 - (float) hitAreaExpansion

cocos2d/CCNode.h

@@ -410,7 +410,7 @@ A common user pattern in building a Cocos2d game is to subclass CCNode, add it t
 
 /** 
  *  Expands ( or contracts ) the hit area of the node.
- *  The expansion is in normalized content size. Ie a hit area expansion of 2, will result in the hit area being double width, and double height.
+ *  The expansion is calculated as a margin around the sprite, in points.
  */
 @property (nonatomic, assign) float hitAreaExpansion;
 

cocos2d/CCProgressNode.m

@@ -38,11 +38,7 @@
 
 #import "CCTexture_Private.h"
 
-#define kProgressTextureCoordsCount 4
-//  kProgressTextureCoords holds points {0,1} {0,0} {1,0} {1,1} we can represent it as bits
-const char kCCProgressTextureCoords = 0x4b;
-
-@interface CCProgressNode () {
+@implementation CCProgressNode {
 	CCProgressNodeType _type;
 	float _percentage;
 	CCSprite *_sprite;
@@ -57,15 +53,6 @@ @interface CCProgressNode () {
 	BOOL _needsUpdateProgress;
 }
 
--(void)updateProgress;
--(void)updateBar;
--(void)updateRadial;
--(void)updateColor;
--(CGPoint)boundaryTexCoord:(char)index;
-@end
-
-
-@implementation CCProgressNode
 @synthesize percentage = _percentage;
 @synthesize sprite = _sprite;
 @synthesize type = _type;
@@ -200,8 +187,6 @@ -(GLKVector2)textureCoordFromAlphaPoint:(CGPoint) alpha
     CC_SWAP(alpha.x, alpha.y);
   }
 
-	// As of 3.1, the x alpha needs to be flipped. Not really sure why.
-	alpha.x = 1.0 - alpha.x;
 	return GLKVector2Make(min.x * (1.f - alpha.x) + max.x * alpha.x, min.y * (1.f - alpha.y) + max.y * alpha.y);
 }
 
@@ -271,6 +256,13 @@ -(void)setMidpoint:(CGPoint)midPoint
 	_midpoint = ccpClamp(midPoint, CGPointZero, ccp(1,1));
 }
 
+static inline CGPoint
+BoundryTexCoord(int index)
+{
+	static const CGPoint points[] = {{1,1}, {1,0}, {0,0}, {0,1}};
+	return points[index];
+}
+
 ///
 //	Update does the work of mapping the texture onto the triangles
 //	It now doesn't occur the cost of free/alloc data every update cycle.
@@ -317,11 +309,11 @@ -(void)updateRadial
 
 		float min_t = FLT_MAX;
 
-		for (int i = 0; i <= kProgressTextureCoordsCount; ++i) {
-			int pIndex = (i + (kProgressTextureCoordsCount - 1))%kProgressTextureCoordsCount;
+		for (int i = 0; i <= 4; ++i) {
+			int pIndex = (i + 3)%4;
 
-			CGPoint edgePtA = [self boundaryTexCoord:i % kProgressTextureCoordsCount];
-			CGPoint edgePtB = [self boundaryTexCoord:pIndex];
+			CGPoint edgePtA = BoundryTexCoord(i % 4);
+			CGPoint edgePtB = BoundryTexCoord(pIndex);
 
 			//	Remember that the top edge is split in half for the 12 o'clock position
 			//	Let's deal with that here by finding the correct endpoints
@@ -391,7 +383,7 @@ -(void)updateRadial
 		_verts[1].position = [self vertexFromAlphaPoint:topMid];
 
 		for(int i = 0; i < index; ++i){
-			CGPoint alphaPoint = [self boundaryTexCoord:i];
+			CGPoint alphaPoint = BoundryTexCoord(i);
 			_verts[i+2].texCoord1 = [self textureCoordFromAlphaPoint:alphaPoint];
 			_verts[i+2].position = [self vertexFromAlphaPoint:alphaPoint];
 		}
@@ -504,18 +496,6 @@ -(void)updateBar
 	[self updateColor];
 }
 
--(CGPoint)boundaryTexCoord:(char)index
-{
-	if (index < kProgressTextureCoordsCount) {
-		if (_reverseDirection) {
-			return ccp((kCCProgressTextureCoords>>(7-(index<<1)))&1,(kCCProgressTextureCoords>>(7-((index<<1)+1)))&1);
-		} else {
-			return ccp((kCCProgressTextureCoords>>((index<<1)+1))&1,(kCCProgressTextureCoords>>(index<<1))&1);
-		}
-	}
-	return CGPointZero;
-}
-
 -(void)visit:(CCRenderer *)renderer parentTransform:(const GLKMatrix4 *)parentTransform
 {
 	[super visit:renderer parentTransform:parentTransform];

cocos2d/CCSpriteFrame.m

@@ -33,6 +33,10 @@
 #import "CCSpriteFrameCache.h"
 
 @implementation CCSpriteFrame
+{
+	__weak CCTexture *_lazyTexture;
+}
+
 @synthesize textureFilename = _textureFilename;
 @synthesize rotated = _rotated;
 
@@ -137,15 +141,18 @@ -(void) setTexture:(CCTexture *)texture
 	}
 }
 
--(CCTexture*) texture
+-(CCTexture *)lazyTexture
 {
-	if( _texture )
-		return _texture;
-
-	if( _textureFilename )
-		return [[CCTextureCache sharedTextureCache] addImage:_textureFilename];
+	CCTexture *texture = _lazyTexture;
+	if(!texture && _textureFilename){
+		_lazyTexture = texture = [[CCTextureCache sharedTextureCache] addImage:_textureFilename];
+	}
+	
+	return texture;
+}
 
-	// no texture or texture filename
-	return nil;
+-(CCTexture*) texture
+{
+	return (_texture ?: self.lazyTexture);
 }
 @end

cocos2d/Platforms/CCGL.h

@@ -62,6 +62,9 @@ static inline void __CC_CHECK_GL_ERROR_DEBUG(const char *function, int line)
 #define CC_CHECK_GL_ERROR_DEBUG()
 #endif
 
+__attribute__((deprecated)) static const GLenum CC_BLEND_SRC = GL_ONE;
+__attribute__((deprecated)) static const GLenum CC_BLEND_DST = GL_ONE_MINUS_SRC_ALPHA;
+
 // iOS
 #if __CC_PLATFORM_IOS
 #define	glClearDepth				glClearDepthf

cocos2d/ccMacros.h

@@ -132,12 +132,21 @@ CCRANDOM_ON_UNIT_CIRCLE()
 /** @def CC_DEGREES_TO_RADIANS
  converts degrees to radians
  */
-#define CC_DEGREES_TO_RADIANS(__ANGLE__) ((__ANGLE__) * 0.01745329252f) // PI / 180
+static inline float
+CC_DEGREES_TO_RADIANS(const float angle)
+{
+	return angle*0.01745329252f;
+} 
 
 /** @def CC_RADIANS_TO_DEGREES
  converts radians to degrees
  */
-#define CC_RADIANS_TO_DEGREES(__ANGLE__) ((__ANGLE__) * 57.29577951f) // PI * 180
+static inline float
+CC_RADIANS_TO_DEGREES(const float angle)
+{
+	return angle*57.29577951f;
+} 
+
 
 
 /** @def CC_CONTENT_SCALE_FACTOR

cocos2d/ccTypes.h

@@ -468,16 +468,14 @@ static inline CCSizeType CCSizeTypeMake(CCSizeUnit widthUnit, CCSizeUnit heightU
     return cst;
 }
 
-#define CCPositionTypePoints CCPositionTypeMake(CCPositionUnitPoints, CCPositionUnitPoints, CCPositionReferenceCornerBottomLeft)
+static const CCPositionType CCPositionTypePoints = {CCPositionUnitPoints, CCPositionUnitPoints, CCPositionReferenceCornerBottomLeft};
+static const CCPositionType CCPositionTypeUIPoints = {CCPositionUnitUIPoints, CCPositionUnitUIPoints, CCPositionReferenceCornerBottomLeft};
+static const CCPositionType CCPositionTypeNormalized = {CCPositionUnitNormalized, CCPositionUnitNormalized, CCPositionReferenceCornerBottomLeft};
 
-#define CCPositionTypeUIPoints CCPositionTypeMake(CCPositionUnitUIPoints, CCPositionUnitUIPoints, CCPositionReferenceCornerBottomLeft)
 
-#define CCPositionTypeNormalized CCPositionTypeMake(CCPositionUnitNormalized, CCPositionUnitNormalized, CCPositionReferenceCornerBottomLeft)
-
-
-#define CCSizeTypePoints CCSizeTypeMake(CCSizeUnitPoints, CCSizeUnitPoints)
-#define CCSizeTypeUIPoints CCSizeTypeMake(CCSizeUnitUIPoints, CCSizeUnitUIPoints)
-#define CCSizeTypeNormalized CCSizeTypeMake(CCSizeUnitNormalized, CCSizeUnitNormalized)
+static const CCSizeType CCSizeTypePoints = {CCSizeUnitPoints, CCSizeUnitPoints};
+static const CCSizeType CCSizeTypeUIPoints = {CCSizeUnitUIPoints, CCSizeUnitUIPoints};
+static const CCSizeType CCSizeTypeNormalized = {CCSizeUnitNormalized, CCSizeUnitNormalized};
 
 typedef NS_ENUM(char, CCScaleType) {
     CCScaleTypePoints,