Merge branch 'develop' into effects

Author: osinoleg

CCRendererGLSupport.m

@@ -237,25 +237,3 @@ -(void)bind:(BOOL)bind
 }
 
 @end
-
-
-@interface CCRenderCommandDrawGL : CCRenderCommandDraw @end
-@implementation CCRenderCommandDrawGL
-
-static const CCRenderCommandDrawMode GLDrawModes[] = {
-	GL_TRIANGLES,
-	GL_LINES,
-};
-
--(void)invokeOnRenderer:(CCRenderer *)renderer
-{
-	CCGL_DEBUG_PUSH_GROUP_MARKER("CCRendererCommandDraw: Invoke");
-	
-	[renderer setRenderState:_renderState];
-	glDrawElements(GLDrawModes[_mode], (GLsizei)_count, GL_UNSIGNED_SHORT, (GLvoid *)(_first*sizeof(GLushort)));
-	CC_INCREMENT_GL_DRAWS(1);
-	
-	CCGL_DEBUG_POP_GROUP_MARKER();
-}
-
-@end

cocos2d-ui/CCBReader/CCBReader.m

@@ -1251,6 +1251,14 @@ - (CCNode*) readNodeGraphParent:(CCNode*)parent
 
     Class class = NSClassFromString(className);
     if (!class)
+    {
+        // Class was not found. Maybe it's a Swift class?
+        // See http://stackoverflow.com/questions/24030814/swift-language-nsclassfromstring
+        NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
+        NSString *classStringName = [NSString stringWithFormat:@"_TtC%d%@%d%@", appName.length, appName, className.length, className];
+        class = NSClassFromString(classStringName);
+    }
+    if (!class)
     {
 #if DEBUG
         NSLog(@"*** [CLASS] ERROR HINT: Did you set a custom class for a CCNode? Please check if the specified class name is spelled correctly and available in your project.");

cocos2d/CCConfiguration.h

@@ -31,6 +31,7 @@
 #define CC_MINIMUM_TABLET_SCREEN_DIAGONAL 6.0
 extern Class CCGraphicsBufferClass;
 extern Class CCGraphicsBufferBindingsClass;
+extern Class CCRenderStateClass;
 extern Class CCRenderCommandDrawClass;
 
 extern NSString* const CCSetupPixelFormat;

cocos2d/CCConfiguration.m

@@ -41,6 +41,7 @@
 
 Class CCGraphicsBufferClass;
 Class CCGraphicsBufferBindingsClass;
+Class CCRenderStateClass;
 Class CCRenderCommandDrawClass;
 
 NSString* const CCSetupPixelFormat = @"CCSetupPixelFormat";
@@ -130,23 +131,23 @@ -(id) init
 		}
 	}
 
-	CC_CHECK_GL_ERROR_DEBUG();
-
 	return self;
 }
 
 -(CCGraphicsAPI)graphicsAPI
 {
 	if(_graphicsAPI == CCGraphicsAPIInvalid){
-		if(__CC_METAL_SUPPORTED_AND_ENABLED && NSProtocolFromString(@"MTLDevice")){
+		if(__CC_METAL_SUPPORTED_AND_ENABLED && NSProtocolFromString(@"MTLDevice") && !getenv("CC_FORCE_GL")){
 			CCGraphicsBufferClass = NSClassFromString(@"CCGraphicsBufferMetal");
 			CCGraphicsBufferBindingsClass = NSClassFromString(@"CCGraphicsBufferBindingsMetal");
+			CCRenderStateClass = NSClassFromString(@"CCRenderStateMetal");
 			CCRenderCommandDrawClass = NSClassFromString(@"CCRenderCommandDrawMetal");
 
 			_graphicsAPI = CCGraphicsAPIMetal;
 		} else {
 			CCGraphicsBufferClass = NSClassFromString(@"CCGraphicsBufferGLBasic");
 			CCGraphicsBufferBindingsClass = NSClassFromString(@"CCGraphicsBufferBindingsGL");
+			CCRenderStateClass = NSClassFromString(@"CCRenderStateGL");
 			CCRenderCommandDrawClass = NSClassFromString(@"CCRenderCommandDrawGL");
 
 			_graphicsAPI = CCGraphicsAPIGL;

cocos2d/CCEffect.m

@@ -256,7 +256,7 @@ -(void)end
 
 -(void)enqueueTriangles
 {
-    CCRenderState *renderState = [[CCRenderState alloc] initWithBlendMode:_blendMode shader:_shader shaderUniforms:_shaderUniforms copyUniforms:YES];
+    CCRenderState *renderState = [CCRenderState renderStateWithBlendMode:_blendMode shader:_shader shaderUniforms:_shaderUniforms copyUniforms:YES];
 
     CCRenderBuffer buffer = [_renderer enqueueTriangles:2 andVertexes:4 withState:renderState globalSortOrder:0];
 	CCRenderBufferSetVertex(buffer, 0, CCVertexApplyTransform(_verts.bl, &_transform));

cocos2d/CCEffectRenderer.m

@@ -73,7 +73,7 @@ - (BOOL)setupGLResourcesWithSize:(CGSize)size
     // Create a new texture object for use as the color attachment of the new
     // FBO.
 	_texture = [[CCTexture alloc] initWithData:nil pixelFormat:kRenderTargetDefaultPixelFormat pixelsWide:powW pixelsHigh:powH contentSizeInPixels:size contentScale:[CCDirector sharedDirector].contentScaleFactor];
-	[_texture setAliasTexParameters];
+	_texture.antialiased = NO;
 
     // Save the old FBO binding so it can be restored after we create the new
     // one.

cocos2d/CCLabelTTF.m

@@ -37,6 +37,7 @@
 #import "CCConfiguration.h"
 #import "CCNode_Private.h"
 #import "CCDirector.h"
+#import "CCTexture_Private.h"
 #import <Foundation/Foundation.h>
 
 #if __CC_PLATFORM_IOS
@@ -54,15 +55,6 @@
 static __strong NSMutableDictionary* ccLabelTTF_registeredFonts;
 
 
-@implementation CCTexture (CCLabelTTF)
-
-- (void) setPremultipliedAlpha:(BOOL)flag
-{
-    _premultipliedAlpha = flag;
-}
-
-@end
-
 #pragma mark CCLabelTTF