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

Author: jtwigg

cocos2d/CCDirector.h

@@ -134,18 +134,12 @@ and when to execute the Scenes.
 	/* projection used */
 	CCDirectorProjection _projection;
 
-	/* CCDirector delegate */
-	__weak id<CCDirectorDelegate> _delegate;
-
 	/* window size in points */
 	CGSize	_winSizeInPoints;
 
 	/* window size in pixels */
 	CGSize	_winSizeInPixels;
 
-	/* the cocos2d running thread */
-	__weak NSThread *_runningThread;
-
 	/* scheduler associated with this director */
 	CCScheduler *_scheduler;
 

cocos2d/CCDirector_Private.h

@@ -27,6 +27,9 @@
 @interface CCDirector () {
 	@protected
 	GLKMatrix4 _projectionMatrix;
+	__weak id<CCDirectorDelegate> _delegate;
+	__weak NSThread *_runningThread;
+
 }
 
 /* Whether or not the replaced scene will receive the cleanup message.

cocos2d/CCRenderer.m

@@ -666,13 +666,14 @@ -(void)setRenderState:(CCRenderState *)renderState
 
 	// Set the shader's uniform state.
 	__unsafe_unretained NSDictionary *shaderUniforms = renderState->_shaderUniforms;
+	__unsafe_unretained NSDictionary *globalShaderUniforms = _globalShaderUniforms;
 	if(shaderUniforms != _shaderUniforms){
 		glInsertEventMarkerEXT(0, "Uniforms");
 
 		__unsafe_unretained NSDictionary *setters = shader->_uniformSetters;
 		for(NSString *uniformName in setters){
 			__unsafe_unretained CCUniformSetter setter = setters[uniformName];
-			setter(self, shaderUniforms[uniformName] ?: _globalShaderUniforms[uniformName]);
+			setter(self, shaderUniforms, globalShaderUniforms);
 		}
 		_shaderUniforms = shaderUniforms;
 	}

cocos2d/CCShader.m

@@ -78,8 +78,8 @@
 	"uniform highp vec4 cc_SinTime;\n"
 	"uniform highp vec4 cc_CosTime;\n"
 	"uniform highp vec4 cc_Random01;\n\n"
-	"uniform lowp sampler2D cc_MainTexture;\n\n"
-	"varying lowp vec4 cc_FragColor;\n"
+	"uniform " XSTR(CC_SHADER_COLOR_PRECISION) " sampler2D cc_MainTexture;\n\n"
+	"varying " XSTR(CC_SHADER_COLOR_PRECISION) " vec4 cc_FragColor;\n"
 	"varying highp vec2 cc_FragTexCoord1;\n"
 	"varying highp vec2 cc_FragTexCoord2;\n\n"
 	"// End Cocos2D shader header.\n\n";
@@ -97,7 +97,7 @@
 
 static const GLchar *CCFragmentShaderHeader =
 	"#ifdef GL_ES\n"
-	"precision mediump float;\n\n"
+	"precision " XSTR(CC_SHADER_DEFAULT_FRAGMENT_PRECISION) " float;\n"
 	"#endif\n\n"
 	"// End Cocos2D fragment shader header.\n\n";
 
@@ -235,8 +235,8 @@ +(GLuint)createVAOforCCVertexBuffer:(GLuint)vbo elementBuffer:(GLuint)ebo
 static CCUniformSetter
 SetFloat(NSString *name, GLint location)
 {
-	return ^(CCRenderer *renderer, NSNumber *value){
-		value = value ?: @0;
+	return ^(CCRenderer *renderer, NSDictionary *shaderUniforms, NSDictionary *globalShaderUniforms){
+		NSNumber *value = shaderUniforms[name] ?: globalShaderUniforms[name] ?: @(0.0);
 		NSCAssert([value isKindOfClass:[NSNumber class]], @"Shader uniform '%@' value must be wrapped in a NSNumber.", name);
 
 		glUniform1f(location, value.floatValue);
@@ -246,8 +246,29 @@ +(GLuint)createVAOforCCVertexBuffer:(GLuint)vbo elementBuffer:(GLuint)ebo
 static CCUniformSetter
 SetVec2(NSString *name, GLint location)
 {
-	return ^(CCRenderer *renderer, NSValue *value){
-		value = value ?: [NSValue valueWithGLKVector2:GLKVector2Make(0.0f, 0.0f)];
+	NSString *textureName = nil;
+	bool pixelSize = [name hasSuffix:@"PixelSize"];
+	if(pixelSize){
+		textureName = [name substringToIndex:name.length - @"PixelSize".length];
+	} else if([name hasSuffix:@"Size"]){
+		textureName = [name substringToIndex:name.length - @"Size".length];
+	}
+	
+	return ^(CCRenderer *renderer, NSDictionary *shaderUniforms, NSDictionary *globalShaderUniforms){
+		NSValue *value = shaderUniforms[name] ?: globalShaderUniforms[name];
+		
+		// Fall back on looking up the actual texture size if the name matches a texture.
+		if(value == nil && textureName){
+			CCTexture *texture = shaderUniforms[textureName] ?: globalShaderUniforms[textureName];
+			GLKVector2 sizeInPixels = GLKVector2Make(texture.pixelWidth, texture.pixelHeight);
+			
+			GLKVector2 size = GLKVector2MultiplyScalar(sizeInPixels, pixelSize ? 1.0 : 1.0/texture.contentScale);
+			value = [NSValue valueWithGLKVector2:size];
+		}
+		
+		// Finally fall back on 0.
+		if(value == nil) value = [NSValue valueWithGLKVector2:GLKVector2Make(0.0f, 0.0f)];
+		
 		NSCAssert([value isKindOfClass:[NSValue class]], @"Shader uniform '%@' value must be wrapped in a NSValue.", name);
 
 		if(strcmp(value.objCType, @encode(GLKVector2)) == 0){
@@ -268,8 +289,8 @@ +(GLuint)createVAOforCCVertexBuffer:(GLuint)vbo elementBuffer:(GLuint)ebo
 static CCUniformSetter
 SetVec3(NSString *name, GLint location)
 {
-	return ^(CCRenderer *renderer, NSValue *value){
-		value = value ?: [NSValue valueWithGLKVector3:GLKVector3Make(0.0f, 0.0f, 0.0f)];
+	return ^(CCRenderer *renderer, NSDictionary *shaderUniforms, NSDictionary *globalShaderUniforms){
+		NSValue *value = shaderUniforms[name] ?: globalShaderUniforms[name] ?: [NSValue valueWithGLKVector3:GLKVector3Make(0.0f, 0.0f, 0.0f)];
 		NSCAssert([value isKindOfClass:[NSValue class]], @"Shader uniform '%@' value must be wrapped in a NSValue.", name);
 		NSCAssert(strcmp(value.objCType, @encode(GLKVector3)) == 0, @"Shader uniformm 'vec3 %@' value must be passed using [NSValue valueWithGLKVector3:]", name);
 
@@ -281,8 +302,8 @@ +(GLuint)createVAOforCCVertexBuffer:(GLuint)vbo elementBuffer:(GLuint)ebo
 static CCUniformSetter
 SetVec4(NSString *name, GLint location)
 {
-	return ^(CCRenderer *renderer, id value){
-		value = value ?: [NSValue valueWithGLKVector4:GLKVector4Make(0.0f, 0.0f, 0.0f, 1.0f)];
+	return ^(CCRenderer *renderer, NSDictionary *shaderUniforms, NSDictionary *globalShaderUniforms){
+		NSValue *value = shaderUniforms[name] ?: globalShaderUniforms[name] ?: [NSValue valueWithGLKVector4:GLKVector4Make(0.0f, 0.0f, 0.0f, 1.0f)];
 
 		if([value isKindOfClass:[NSValue class]]){
 			NSCAssert(strcmp([(NSValue *)value objCType], @encode(GLKVector4)) == 0, @"Shader uniformm 'vec4 %@' value must be passed using [NSValue valueWithGLKVector4:].", name);
@@ -301,8 +322,8 @@ +(GLuint)createVAOforCCVertexBuffer:(GLuint)vbo elementBuffer:(GLuint)ebo
 static CCUniformSetter
 SetMat4(NSString *name, GLint location)
 {
-	return ^(CCRenderer *renderer, NSValue *value){
-		value = value ?: [NSValue valueWithGLKMatrix4:GLKMatrix4Identity];
+	return ^(CCRenderer *renderer, NSDictionary *shaderUniforms, NSDictionary *globalShaderUniforms){
+		NSValue *value = shaderUniforms[name] ?: globalShaderUniforms[name] ?: [NSValue valueWithGLKMatrix4:GLKMatrix4Identity];
 		NSCAssert([value isKindOfClass:[NSValue class]], @"Shader uniform '%@' value must be wrapped in a NSValue.", name);
 		NSCAssert(strcmp(value.objCType, @encode(GLKMatrix4)) == 0, @"Shader uniformm 'mat4 %@' value must be passed using [NSValue valueWithGLKMatrix4:]", name);
 
@@ -344,8 +365,8 @@ -(NSDictionary *)uniformSettersForProgram:(GLuint)program
 			case GL_FLOAT_MAT4: uniformSetters[name] = SetMat4(name, location); break;
 			case GL_SAMPLER_2D: {
 				// Sampler setters are handled a differently since the real work is binding the texture and not setting the uniform value.
-				uniformSetters[name] = ^(CCRenderer *renderer, CCTexture *texture){
-					texture = texture ?: [CCTexture none];
+				uniformSetters[name] = ^(CCRenderer *renderer, NSDictionary *shaderUniforms, NSDictionary *globalShaderUniforms){
+					CCTexture *texture = shaderUniforms[name] ?: globalShaderUniforms[name] ?: [CCTexture none];
 					NSAssert([texture isKindOfClass:[CCTexture class]], @"Shader uniform '%@' value must be a CCTexture object.", name);
 
 					// Bind the texture to the texture unit for the uniform.

cocos2d/CCShader_Private.h

@@ -1,7 +1,11 @@
 #import "CCShader.h"
 
 @class CCRenderer;
-typedef void (^CCUniformSetter)(__unsafe_unretained CCRenderer *renderer, __unsafe_unretained id value);
+typedef void (^CCUniformSetter)(
+	__unsafe_unretained CCRenderer *renderer,
+	__unsafe_unretained NSDictionary *shaderUniforms,
+	__unsafe_unretained NSDictionary *globalShaderUniforms
+);
 
 @interface CCShader() {
 	@public

cocos2d/CCSpriteFrame.h

@@ -40,16 +40,7 @@
 
 @class CCProxy;
 
-@interface CCSpriteFrame : NSObject <NSCopying> {
-	CGRect			_rectInPixels;
-	BOOL			_rotated;
-	CGPoint			_offsetInPixels;
-	CGSize			_originalSizeInPixels;
-	CCTexture		*_texture;
-	NSString		*_textureFilename;
-	CCProxy __weak *_proxy;
-}
-
+@interface CCSpriteFrame : NSObject <NSCopying>
 
 /// -----------------------------------------------------------------------
 /// @name Accessing Sprite Frame Attributes

cocos2d/CCSpriteFrame.m

@@ -31,9 +31,17 @@
 #import "CCTexture.h"
 #import "ccMacros.h"
 #import "CCSpriteFrameCache.h"
+#import "CCTexture_Private.h"
 
 @implementation CCSpriteFrame
 {
+	CGRect			_rectInPixels;
+	BOOL			_rotated;
+	CGPoint			_offsetInPixels;
+	CGSize			_originalSizeInPixels;
+	CCTexture		*_texture;
+	NSString		*_textureFilename;
+	CCProxy __weak *_proxy;
 	__weak CCTexture *_lazyTexture;
 }
 
@@ -155,4 +163,27 @@ -(CCTexture*) texture
 {
 	return (_texture ?: self.lazyTexture);
 }
+
+- (BOOL)hasProxy
+{
+	@synchronized(self){
+		// NSLog(@"hasProxy: %p", self);
+		return(_proxy != nil);
+	}
+}
+
+- (CCProxy *)proxy
+{
+	@synchronized(self){
+		__strong CCProxy *proxy = _proxy;
+
+		if (_proxy == nil){
+			proxy = [[CCProxy alloc] initWithTarget:self];
+			_proxy = proxy;
+		}
+
+		return(proxy);
+	}
+}
+
 @end

cocos2d/CCSpriteFrameCache.m

@@ -44,33 +44,9 @@
 #import "CCTexture_Private.h"
 
 
-@implementation CCSpriteFrame(Proxy)
-
-- (BOOL)hasProxy
-{
-    @synchronized(self)
-    {
-        // NSLog(@"hasProxy: %p", self);
-        return(_proxy != nil);
-    }
-}
-
-- (CCProxy *)proxy
-{
-    @synchronized(self)
-    {
-        __strong CCProxy *proxy = _proxy;
-
-        if (_proxy == nil)
-        {
-            proxy = [[CCProxy alloc] initWithTarget:self];
-            _proxy = proxy;
-        }
-    
-        return(proxy);
-    }
-}
-
+@interface CCSpriteFrame(Proxy)
+- (BOOL)hasProxy;
+- (CCProxy *)proxy;
 @end
 
 

cocos2d/ccConfig.h

@@ -130,6 +130,14 @@
 #define CC_SPRITE_DEBUG_DRAW 0
 #endif
 
+#ifndef CC_SHADER_COLOR_PRECISION
+#define CC_SHADER_COLOR_PRECISION lowp
+#endif
+
+#ifndef CC_SHADER_DEFAULT_FRAGMENT_PRECISION
+#define CC_SHADER_DEFAULT_FRAGMENT_PRECISION mediump
+#endif
+
 #ifndef CC_ENABLE_EXPERIMENTAL_EFFECTS
 #define CC_ENABLE_EXPERIMENTAL_EFFECTS 0
 #endif