Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos2d/CCEffect.m

Author: osinoleg

cocos2d-ui-tests/tests/CCRendererTest.m

@@ -330,6 +330,12 @@ - (void)setupMotionStreakNodeTest
 	}
 }
 
+static float
+ProgressPercent(CCTime t)
+{
+	return 100.0*fmod(t, 1.0);
+}
+
 - (void)setupProgressNodeTest
 {
 	self.subTitle = @"Testing various CCProgressNode setups.";
@@ -353,7 +359,7 @@ - (void)setupProgressNodeTest
 		[self.contentNode addChild:progress];
 
 		[self scheduleBlock:^(CCTimer *timer) {
-			progress.percentage = 100.0*(0.5 + 0.5*sin(timer.invokeTime*M_PI));
+			progress.percentage = ProgressPercent(timer.invokeTime);
 			[timer repeatOnceWithInterval:interval];
 		} delay:interval];
 	}
@@ -378,7 +384,7 @@ - (void)setupProgressNodeTest
 
 		[self scheduleBlock:^(CCTimer *timer) {
 			progress.midpoint = ccpAdd(ccp(0.5, 0.5), ccpMult(ccpForAngle(timer.invokeTime), 0.25));
-			progress.percentage = 100.0*(0.5 + 0.5*sin(timer.invokeTime*M_PI));
+			progress.percentage = ProgressPercent(timer.invokeTime);
 
 			[timer repeatOnceWithInterval:interval];
 		} delay:interval];
@@ -404,7 +410,7 @@ - (void)setupProgressNodeTest
 		[self.contentNode addChild:progress];
 
 		[self scheduleBlock:^(CCTimer *timer) {
-			progress.percentage = 100.0*(0.5 + 0.5*sin(timer.invokeTime*M_PI));
+			progress.percentage = ProgressPercent(timer.invokeTime);
 
 			[timer repeatOnceWithInterval:interval];
 		} delay:interval];
@@ -430,7 +436,7 @@ - (void)setupProgressNodeTest
 		[self.contentNode addChild:progress];
 
 		[self scheduleBlock:^(CCTimer *timer) {
-			progress.percentage = 100.0*(0.5 + 0.5*sin(timer.invokeTime*M_PI));
+			progress.percentage = ProgressPercent(timer.invokeTime);
 
 			[timer repeatOnceWithInterval:interval];
 		} delay:interval];
@@ -456,7 +462,7 @@ - (void)setupProgressNodeTest
 		[self.contentNode addChild:progress];
 
 		[self scheduleBlock:^(CCTimer *timer) {
-			progress.percentage = 100.0*(0.5 + 0.5*sin(timer.invokeTime*M_PI));
+			progress.percentage = ProgressPercent(timer.invokeTime);
 
 			[timer repeatOnceWithInterval:interval];
 		} delay:interval];
@@ -482,7 +488,7 @@ - (void)setupProgressNodeTest
 		[self.contentNode addChild:progress];
 
 		[self scheduleBlock:^(CCTimer *timer) {
-			progress.percentage = 100.0*(0.5 + 0.5*sin(timer.invokeTime*M_PI));
+			progress.percentage = ProgressPercent(timer.invokeTime);
 
 			[timer repeatOnceWithInterval:interval];
 		} delay:interval];
@@ -508,7 +514,7 @@ - (void)setupProgressNodeTest
 		[self.contentNode addChild:progress];
 
 		[self scheduleBlock:^(CCTimer *timer) {
-			progress.percentage = 100.0*(0.5 + 0.5*sin(timer.invokeTime*M_PI));
+			progress.percentage = ProgressPercent(timer.invokeTime);
 
 			[timer repeatOnceWithInterval:interval];
 		} delay:interval];
@@ -534,7 +540,7 @@ - (void)setupProgressNodeTest
 		[self.contentNode addChild:progress];
 
 		[self scheduleBlock:^(CCTimer *timer) {
-			progress.percentage = 100.0*(0.5 + 0.5*sin(timer.invokeTime*M_PI));
+			progress.percentage = ProgressPercent(timer.invokeTime);
 
 			[timer repeatOnceWithInterval:interval];
 		} delay:interval];
@@ -548,6 +554,10 @@ - (void)setupDrawNodeTest
 	CCDrawNode *draw = [CCDrawNode node];
 
 	[draw drawDot:ccp(100, 100) radius:50 color:[CCColor colorWithRed:0.5 green:0.0 blue:0.0 alpha:0.75]];
+	
+	// This yellow dot should not be visible.
+	[draw drawDot:ccp(150, 150) radius:50 color:[CCColor colorWithRed:0.5 green:0.5 blue:0.0 alpha:0.0]];
+	
 	[draw drawSegmentFrom:ccp(100, 200) to:ccp(200, 200) radius:25 color:[CCColor colorWithRed:0.0 green:0.0 blue:0.5 alpha:0.75]];
 
 	CGPoint points1[] = {

cocos2d-ui-tests/tests/VertexZTest.m

@@ -107,7 +107,7 @@ - (void)setupGlobalSortTest
     [[CCSpriteFrameCache sharedSpriteFrameCache] addSpriteFramesWithFile:@"Cards/cards.classic.plist"];
 
     // add a card node to hold the cards
-    _cardNode = [CCSpriteBatchNode batchNodeWithFile:@"Cards/cards.classic.png"];
+    _cardNode = [CCNode node];
     _cardNode.contentSize = [CCDirector sharedDirector].viewSize;
 
     [self.contentNode addChild:_cardNode];

cocos2d-ui/CCBReader/CCBAnimationManager.m

@@ -766,7 +766,7 @@ - (NSMutableArray*)findFrames:(float)time sequenceProperty:(CCBSequenceProperty*
 
     CCBKeyframe* startKeyFrame = [seqProp.keyframes objectAtIndex:0];
     CCBKeyframe* endKeyFrame   = [seqProp.keyframes objectAtIndex:0];
-    
+  
     NSUInteger frameCount = [seqProp.keyframes count];
 
     // Find KeyFrames

cocos2d/CCDrawNode.m

@@ -134,9 +134,16 @@ -(void)draw:(CCRenderer *)renderer transform:(const GLKMatrix4 *)transform
 
 #pragma mark Immediate Mode
 
+static inline GLKVector4
+Premultiply(GLKVector4 c)
+{
+	return GLKVector4Make(c.r*c.a, c.g*c.a, c.b*c.a, c.a);
+}
+
 -(void)drawDot:(CGPoint)pos radius:(CGFloat)radius color:(CCColor *)color;
 {
-	GLKVector4 color4 = color.glkVector4;
+	GLKVector4 color4 = Premultiply(color.glkVector4);
+	
 	GLKVector2 zero2 = GLKVector2Make(0, 0);
 
 	CCRenderBuffer buffer = [self bufferVertexes:4 andTriangleCount:2];
@@ -159,7 +166,7 @@ -(void)drawDot:(CGPoint)pos radius:(CGFloat)radius color:(CCColor *)color;
 
 -(void)drawSegmentFrom:(CGPoint)_a to:(CGPoint)_b radius:(CGFloat)radius color:(CCColor*)color;
 {
-	GLKVector4 color4 = color.glkVector4;
+	GLKVector4 color4 = Premultiply(color.glkVector4);
 	GLKVector2 a = GLKVector2Make(_a.x, _a.y);
 	GLKVector2 b = GLKVector2Make(_b.x, _b.y);
 
@@ -189,8 +196,8 @@ -(void)drawSegmentFrom:(CGPoint)_a to:(CGPoint)_b radius:(CGFloat)radius color:(
 
 -(void)drawPolyWithVerts:(const CGPoint *)_verts count:(NSUInteger)count fillColor:(CCColor*)fill  borderWidth:(CGFloat)width borderColor:(CCColor*)line;
 {
-	GLKVector4 fill4 = fill.glkVector4;
-	GLKVector4 line4 = line.glkVector4;
+	GLKVector4 fill4 = Premultiply(fill.glkVector4);
+	GLKVector4 line4 = Premultiply(line.glkVector4);
 
 	GLKVector2 verts[count];
 	for(int i=0; i<count; i++) verts[i] = GLKVector2Make(_verts[i].x, _verts[i].y);

cocos2d/CCEffect.h

@@ -10,7 +10,7 @@
 #import "CCSprite.h"
 #import "CCShader.h"
 #import "ccConfig.h"
-#import <ccTypes.h>
+#import "ccTypes.h"
 
 #if CC_ENABLE_EXPERIMENTAL_EFFECTS
 @interface CCEffectFunction : NSObject

cocos2d/CCNode.h

@@ -115,10 +115,27 @@ A common user pattern in building a Cocos2d game is to subclass CCNode, add it t
 
 	// Used to preserve sequence while sorting children with the same zOrder.
 	NSUInteger _orderOfArrival;
+	
+	// True when visible.
+	BOOL _visible;
 
+    // True to ensure reorder.
+	BOOL _isReorderChildDirty;
+	
+	// DisplayColor and Color are kept separate to allow for cascading color and alpha changes through node children.
+	// Alphas tend to be multiplied together so you can fade groups of objects that are colored differently.
+	ccColor4F	_displayColor, _color;
+
+	// Opacity/Color propagates into children that conform to if cascadeOpacity/cascadeColor is enabled.
+	BOOL		_cascadeColorEnabled, _cascadeOpacityEnabled;
+	
+@private
+	// Physics Body.
+	CCPhysicsBody* _physicsBody;
+	
 	// Scheduler used to schedule timers and updates/
 	CCScheduler		*_scheduler;
-
+	
 	// ActionManager used to handle all the actions.
 	CCActionManager	*_actionManager;
 
@@ -130,22 +147,6 @@ A common user pattern in building a Cocos2d game is to subclass CCNode, add it t
 
 	// Number of paused parent or ancestor nodes.
 	int _pausedAncestors;
-	
-	// True when visible.
-	BOOL _visible;
-
-    // True to ensure reorder.
-	BOOL _isReorderChildDirty;
-    
-    // Physics Body.
-    CCPhysicsBody* _physicsBody;
-	
-    // DisplayColor and Color are kept separate to allow for cascading color and alpha changes through node children.
-    // Alphas tend to be multiplied together so you can fade groups of objects that are colored differently.
-	ccColor4F	_displayColor, _color;
-
-	// Opacity/Color propagates into children that conform to if cascadeOpacity/cascadeColor is enabled.
-	BOOL		_cascadeColorEnabled, _cascadeOpacityEnabled;
 }
 
 

cocos2d/CCParticleSystemBase.m

@@ -502,13 +502,6 @@ -(void) update: (CCTime) dt
 			[self stopSystem];
 	}
 
-	CGPoint currentPosition = CGPointZero;
-	if( _particlePositionType == CCParticleSystemPositionTypeFree )
-		currentPosition = [self convertToWorldSpace:CGPointZero];
-
-	else if( _particlePositionType == CCParticleSystemPositionTypeRelative )
-		currentPosition = _position;
-
 	if (_visible)
 	{
 		for(int i=0; i < _particleCount;)

cocos2d/CCProgressNode.m

@@ -191,6 +191,8 @@ -(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);
 }
 
@@ -203,6 +205,9 @@ -(GLKVector4)vertexFromAlphaPoint:(CGPoint) alpha
 	const CCSpriteVertexes *verts = _sprite.vertexes;
 	GLKVector4 min = verts->br.position;
 	GLKVector4 max = verts->tl.position;
+	
+	// As of 3.1, the x alpha needs to be flipped. Not really sure why.
+	alpha.x = 1.0 - alpha.x;
 	return GLKVector4Make(min.x * (1.f - alpha.x) + max.x * alpha.x, min.y * (1.f - alpha.y) + max.y * alpha.y, 0.0f, 1.0f);
 }
 

cocos2d/CCShader.m

@@ -57,8 +57,12 @@
 const NSString *CCShaderUniformAlphaTestValue = @"cc_AlphaTestValue";
 
 
+// Stringify macros
+#define STR(s) #s
+#define XSTR(s) STR(s)
+
 /*
-	main texture size points/pixels
+	main texture size points/pixels?
 */
 static const GLchar *CCShaderHeader =
 	"#ifndef GL_ES\n"
@@ -84,6 +88,7 @@
 	"#ifdef GL_ES\n"
 	"precision highp float;\n\n"
 	"#endif\n\n"
+	"#define CC_NODE_RENDER_SUBPIXEL " XSTR(CC_NODE_RENDER_SUBPIXEL) "\n"
 	"attribute highp vec4 cc_Position;\n"
 	"attribute highp vec2 cc_TexCoord1;\n"
 	"attribute highp vec2 cc_TexCoord2;\n"
@@ -99,6 +104,10 @@
 static NSString *CCDefaultVShader =
 	@"void main(){\n"
 	@"	gl_Position = cc_Position;\n"
+	@"#if !CC_NODE_RENDER_SUBPIXEL\n"
+	@"	vec2 pixelPos = (0.5*gl_Position.xy/gl_Position.w + 0.5)*cc_ViewSizeInPixels;\n"
+	@"	gl_Position.xy = (2.0*floor(pixelPos)/cc_ViewSizeInPixels - 1.0)*gl_Position.w;\n"
+	@"#endif\n\n"
 	@"	cc_FragColor = clamp(cc_Color, 0.0, 1.0);\n"
 	@"	cc_FragTexCoord1 = cc_TexCoord1;\n"
 	@"	cc_FragTexCoord2 = cc_TexCoord2;\n"

cocos2d/CCSprite.m

@@ -435,6 +435,13 @@ -(void)updateDisplayedOpacity:(CGFloat)parentOpacity
 }
 
 #if CC_ENABLE_EXPERIMENTAL_EFFECTS
+-(CCEffect *)effect
+{
+    // work in progress, since I added mutli pass rendering for efffects, sprite are no longer working with all effects.
+    // taking this out for now.
+	return nil;
+}
+
 -(void)setEffect:(CCEffect *)effect
 {
     // work in progress, since I added mutli pass rendering for efffects, sprite are no longer working with all effects.