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

Former-commit-id: 9098301

Author: jjxtra

VERSION

@@ -0,0 +1 @@
+3.0.0

cocos2d-ui-tests/tests/CCRendererTest.m

@@ -1,10 +1,53 @@
 #import "TestBase.h"
+#import "CCTextureCache.h"
 
 @interface CCRendererTest : TestBase @end
 @implementation CCRendererTest
 
+- (void)setupMotionStreakNodeTest
+{
+	self.subTitle = @"Testing CCMotionStreak";
+	
+	CCNode *stage = [CCNode node];
+	stage.anchorPoint = ccp(0.5, 0.5);
+	stage.positionType = CCPositionTypeNormalized;
+	stage.position = ccp(0.5, 0.5);
+	stage.contentSizeType = CCSizeTypeNormalized;
+	stage.contentSize = CGSizeMake(0.75, 0.75);
+	[self.contentNode addChild:stage];
+	
+	// Maybe want to find a better texture than a random tile graphic?
+	{
+		CCMotionStreak *streak = [CCMotionStreak streakWithFade:15.0 minSeg:5 width:3 color:[CCColor whiteColor] textureFilename:@"Tiles/05.png"];
+		[stage addChild:streak];
+		
+		[streak scheduleBlock:^(CCTimer *timer) {
+			CCTime t = timer.invokeTime;
+			CGSize size = stage.contentSizeInPoints;
+			
+			streak.position = ccp(size.width*(0.5 + 0.5*sin(3.1*t)), size.height*(0.5 + 0.5*cos(4.3*t)));
+			
+			[timer repeatOnceWithInterval:0.01];
+		} delay:0.0];
+	}{
+		CCMotionStreak *streak = [CCMotionStreak streakWithFade:0.5 minSeg:5 width:3 color:[CCColor redColor] textureFilename:@"Tiles/05.png"];
+		[stage addChild:streak];
+		
+		[streak scheduleBlock:^(CCTimer *timer) {
+			CCTime t = timer.invokeTime;
+			CGSize size = stage.contentSizeInPoints;
+			
+			streak.position = ccp(size.width*(0.5 + 0.5*sin(1.6*t)), size.height*(0.5 + 0.5*cos(5.1*t)));
+			
+			[timer repeatOnceWithInterval:0.01];
+		} delay:0.0];
+	}
+}
+
 - (void)setupProgressNodeTest
 {
+	self.subTitle = @"Testing various CCProgressNode setups.";
+	
 	// Radial timer
 	{
 		NSString *image = @"Tiles/05.png";
@@ -158,10 +201,64 @@ - (void)setupProgressNodeTest
 			[timer repeatOnceWithInterval:interval];
 		} delay:interval];
 	}
+	
+	{
+		NSString *image = @"Tiles/05.png";
+		CGPoint position = ccp(0.4, 0.25);
+		CCTime interval = 1.0/60.0;
+		
+		CCSprite *sprite = [CCSprite spriteWithImageNamed:image];
+		sprite.positionType = CCPositionTypeNormalized;
+		sprite.position = position;
+		sprite.color = [CCColor grayColor];
+		[self.contentNode addChild:sprite];
+		
+		CCProgressNode *progress = [CCProgressNode progressWithSprite:[CCSprite spriteWithImageNamed:image]];
+		progress.type = CCProgressNodeTypeBar;
+		progress.midpoint = ccp(0.5, 0.5);
+		progress.barChangeRate = ccp(1, 1);
+		progress.positionType = CCPositionTypeNormalized;
+		progress.position = position;
+		[self.contentNode addChild:progress];
+		
+		[self scheduleBlock:^(CCTimer *timer) {
+			progress.percentage = 100.0*(0.5 + 0.5*sin(timer.invokeTime*M_PI));
+			
+			[timer repeatOnceWithInterval:interval];
+		} delay:interval];
+	}
+	
+	{
+		NSString *image = @"Tiles/05.png";
+		CGPoint position = ccp(0.4, 0.5);
+		CCTime interval = 1.0/60.0;
+		
+		CCSprite *sprite = [CCSprite spriteWithImageNamed:image];
+		sprite.positionType = CCPositionTypeNormalized;
+		sprite.position = position;
+		sprite.color = [CCColor grayColor];
+		[self.contentNode addChild:sprite];
+		
+		CCProgressNode *progress = [CCProgressNode progressWithSprite:[CCSprite spriteWithImageNamed:image]];
+		progress.type = CCProgressNodeTypeBar;
+		progress.midpoint = ccp(0.5, 0.5);
+		progress.barChangeRate = ccp(0, 0);
+		progress.positionType = CCPositionTypeNormalized;
+		progress.position = position;
+		[self.contentNode addChild:progress];
+		
+		[self scheduleBlock:^(CCTimer *timer) {
+			progress.percentage = 100.0*(0.5 + 0.5*sin(timer.invokeTime*M_PI));
+			
+			[timer repeatOnceWithInterval:interval];
+		} delay:interval];
+	}
 }
 
 - (void)setupDrawNodeTest
 {
+	self.subTitle = @"Testing CCDrawNode";
+	
 	CCDrawNode *draw = [CCDrawNode node];
 
 	[draw drawDot:ccp(100, 100) radius:50 color:[CCColor redColor]];

cocos2d-ui-tests/tests/VertexZTest.m

@@ -73,14 +73,20 @@ - (void)setupVertexZTest
     // add a card node to hold the cards
     _cardNode = [CCSpriteBatchNode batchNodeWithFile:@"Cards/cards.classic.png"];
     _cardNode.contentSize = [CCDirector sharedDirector].viewSize;
+		
+		_cardNode.shaderProgram = [[CCShaderCache sharedShaderCache] programForKey:kCCShader_PositionTextureColorAlphaTest];
+		GLint location = [_cardNode.shaderProgram uniformLocationForName:@(kCCUniformAlphaTestValue_s)];
+		[_cardNode.shaderProgram setUniformLocation:location withF1:0.5];
+		
     [self.contentNode addChild:_cardNode];
 
     // add an array of cards
     for (int count = 0; count < NUMBER_OF_CARDS; count ++)
     {
         CCSprite *card = [CCSprite spriteWithImageNamed:[self randomCard]];
+				
         card.positionType = CCPositionTypeNormalized;
-        card.position = ccp(0.5 + (count - NUMBER_OF_CARDS / 2) * 0.02, 0.5);
+        card.position = ccp(0.5 + (count - NUMBER_OF_CARDS / 2) * 0.02, 0.5 + (count - NUMBER_OF_CARDS / 2) * 0.01);
         [_cardNode addChild:card];
     }
 }

cocos2d/CCLayoutBox.m

@@ -84,7 +84,7 @@ - (void) layout
 
         // Position the nodes
         float height = 0;
-        for (CCNode* child in [[self.children reverseObjectEnumerator] allObjects])
+        for (CCNode* child in self.children)
         {
             CGSize childSize = child.contentSizeInPoints;