Get rid of private CCTexture header

s1ddok · s1ddok · commit 2df6e96efd67 · 2016-02-29T19:29:54.000+03:00
diff --git a/cocos2d-ext/CCMotionStreak/CCMotionStreak.m b/cocos2d-ext/CCMotionStreak/CCMotionStreak.m
@@ -28,7 +28,6 @@
 #import "CCTextureCache.h"
 #import "CCShader.h"
 #import "ccMacros.h"
-#import "CCTexture_Private.h"
 #import "CCRenderer_Private.h"
 
 #import "Support/CGPointExtension.h"
diff --git a/cocos2d-ext/CCParticles/CCParticleBatchNode.m b/cocos2d-ext/CCParticles/CCParticleBatchNode.m
@@ -41,8 +41,6 @@
 
 #import "CCParticleSystemBase_Private.h"
 
-#import "CCTexture_Private.h"
-
 #define kCCParticleDefaultCapacity 500
 
 @interface CCNode()
diff --git a/cocos2d-ext/CCParticles/CCParticleSystem.m b/cocos2d-ext/CCParticles/CCParticleSystem.m
@@ -47,7 +47,7 @@
 
 #import "CCParticleSystemBase_Private.h"
 #import "CCParticleSystem_Private.h"
-#import "CCTexture_Private.h"
+#import "CCTexture.h"
 
 @implementation CCParticleSystem {
 	GLKVector2 _texCoord1[4];
diff --git a/cocos2d-ext/TileMaps/CCTiledMapLayer.m b/cocos2d-ext/TileMaps/CCTiledMapLayer.m
@@ -38,7 +38,7 @@
 #import "CCShader.h"
 #import "Support/CGPointExtension.h"
 #import "CCTiledMapLayer_Private.h"
-#import "CCTexture_Private.h"
+#import "CCTexture.h"
 // #import "CCMathTypesAndroid.h"
 
 #pragma mark -
diff --git a/cocos2d-ui-tests/tests/TextureTest.m b/cocos2d-ui-tests/tests/TextureTest.m
@@ -9,7 +9,6 @@
 #import "TestBase.h"
 
 #import "CCTextureCache.h"
-#import "CCTexture_Private.h"
 
 @interface TextureTest : TestBase @end
 
diff --git a/cocos2d-ui/CCProgressNode.m b/cocos2d-ui/CCProgressNode.m
@@ -32,8 +32,6 @@
 #import "CCDirector.h"
 #import "Support/CGPointExtension.h"
 
-#import "CCTexture_Private.h"
-
 @implementation CCProgressNode {
 	CCProgressNodeType _type;
 	float _percentage;
diff --git a/cocos2d.xcodeproj/project.pbxproj b/cocos2d.xcodeproj/project.pbxproj
@@ -133,7 +133,6 @@
 		08F4AB111C6E98A1004DAAF7 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50C508C40F7C194400799124 /* CCFileUtils.h */; };
 		08F4AB121C6E98A1004DAAF7 /* CGPointExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 503798C40F912C2000986724 /* CGPointExtension.h */; };
 		08F4AB131C6E98A1004DAAF7 /* CCPlatformTextFieldIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 571CD02119649E03003D460C /* CCPlatformTextFieldIOS.h */; };
-		08F4AB141C6E98A1004DAAF7 /* CCTexture_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B706B19718209A8300B27A2C /* CCTexture_Private.h */; };
 		08F4AB151C6E98A1004DAAF7 /* CCLayoutBox.h in Headers */ = {isa = PBXBuildFile; fileRef = B7EE69DE1819E75700B983FE /* CCLayoutBox.h */; };
 		08F4AB171C6E98A1004DAAF7 /* CCRenderDispatch.h in Headers */ = {isa = PBXBuildFile; fileRef = D3903B0E199528A0003AA81A /* CCRenderDispatch.h */; };
 		08F4AB181C6E98A1004DAAF7 /* CCTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = B7E260D618171D2000A0E872 /* CCTextField.h */; };
@@ -304,7 +303,6 @@
 		7A5946EC19E372FA00F65F90 /* CCActionTween.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FBB2D8117613F500150761 /* CCActionTween.h */; };
 		7A5946EE19E372FA00F65F90 /* CCTexturePVR.h in Headers */ = {isa = PBXBuildFile; fileRef = E0F9246F1224140400EF2362 /* CCTexturePVR.h */; };
 		7A5946F019E372FA00F65F90 /* CCTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E1357110ADEB1B00C9E7FA /* CCTexture.h */; };
-		7A5946F219E372FA00F65F90 /* CCTexture_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B706B19718209A8300B27A2C /* CCTexture_Private.h */; };
 		7A5946F319E372FB00F65F90 /* CCTextureCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F2670DFDEAFF00C013A5 /* CCTextureCache.h */; };
 		7A5946F519E372FB00F65F90 /* uthash.h in Headers */ = {isa = PBXBuildFile; fileRef = 50D898EF1192CB7500458C29 /* uthash.h */; };
 		7A5946F619E372FB00F65F90 /* utlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 508EAC2F1193F8B0007F058D /* utlist.h */; };
@@ -452,7 +450,6 @@
 		A6A0734B17C78EF3004343C8 /* CCResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = A6A0734917C78EF3004343C8 /* CCResponder.m */; };
 		A6DC4E0918055DCC00C280A6 /* CCTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = A6DC4E0718055DCC00C280A6 /* CCTransition.h */; };
 		A6DC4E0A18055DCC00C280A6 /* CCTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = A6DC4E0818055DCC00C280A6 /* CCTransition.m */; };
-		B706B19818209A8300B27A2C /* CCTexture_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B706B19718209A8300B27A2C /* CCTexture_Private.h */; };
 		B74C2B9B17BDA63A00A829C0 /* CCSprite9Slice.h in Headers */ = {isa = PBXBuildFile; fileRef = B74C2B9917BDA63A00A829C0 /* CCSprite9Slice.h */; };
 		B74C2B9C17BDA63A00A829C0 /* CCSprite9Slice.m in Sources */ = {isa = PBXBuildFile; fileRef = B74C2B9A17BDA63A00A829C0 /* CCSprite9Slice.m */; };
 		B75C2E7C17C5908B002B0E0D /* NSAttributedString+CCAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = B75C2E7A17C5908B002B0E0D /* NSAttributedString+CCAdditions.h */; };
@@ -663,7 +660,6 @@
 		A6A0734917C78EF3004343C8 /* CCResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCResponder.m; sourceTree = "<group>"; };
 		A6DC4E0718055DCC00C280A6 /* CCTransition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTransition.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		A6DC4E0818055DCC00C280A6 /* CCTransition.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTransition.m; sourceTree = "<group>"; };
-		B706B19718209A8300B27A2C /* CCTexture_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTexture_Private.h; sourceTree = "<group>"; };
 		B706B19918209FA000B27A2C /* CCDirector_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCDirector_Private.h; sourceTree = "<group>"; };
 		B74C2B9917BDA63A00A829C0 /* CCSprite9Slice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite9Slice.h; sourceTree = "<group>"; };
 		B74C2B9A17BDA63A00A829C0 /* CCSprite9Slice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCSprite9Slice.m; sourceTree = "<group>"; };
@@ -1073,7 +1069,6 @@
 				E0F924701224140400EF2362 /* CCTexturePVR.m */,
 				50E1357110ADEB1B00C9E7FA /* CCTexture.h */,
 				50E1357210ADEB1B00C9E7FA /* CCTexture.m */,
-				B706B19718209A8300B27A2C /* CCTexture_Private.h */,
 				5018F2670DFDEAFF00C013A5 /* CCTextureCache.h */,
 				5018F2680DFDEAFF00C013A5 /* CCTextureCache.m */,
 			);
@@ -1085,9 +1080,6 @@
 			children = (
 				5018F25E0DFDEAFF00C013A5 /* CCNodeColor.h */,
 				5018F25F0DFDEAFF00C013A5 /* CCNodeColor.m */,
-				50316AA410291280003ACFE7 /* CCRenderTexture.h */,
-				50316AA510291280003ACFE7 /* CCRenderTexture.m */,
-				D2B840C31909F447008063EA /* CCRenderTexture_Private.h */,
 			);
 			name = "Misc Nodes";
 			sourceTree = "<group>";
@@ -1230,6 +1222,9 @@
 		D34CAD5E19C3A070009BED7A /* Rendering */ = {
 			isa = PBXGroup;
 			children = (
+				50316AA410291280003ACFE7 /* CCRenderTexture.h */,
+				50316AA510291280003ACFE7 /* CCRenderTexture.m */,
+				D2B840C31909F447008063EA /* CCRenderTexture_Private.h */,
 				0EFC792C1B3B0E14008926DD /* CCRendererGLSupport.m */,
 				D3903B0E199528A0003AA81A /* CCRenderDispatch.h */,
 				D3903B0F199528A0003AA81A /* CCRenderDispatch.m */,
@@ -1333,7 +1328,6 @@
 				08F4AB111C6E98A1004DAAF7 /* CCFileUtils.h in Headers */,
 				08F4AB121C6E98A1004DAAF7 /* CGPointExtension.h in Headers */,
 				08F4AB131C6E98A1004DAAF7 /* CCPlatformTextFieldIOS.h in Headers */,
-				08F4AB141C6E98A1004DAAF7 /* CCTexture_Private.h in Headers */,
 				08F4AB151C6E98A1004DAAF7 /* CCLayoutBox.h in Headers */,
 				08F4AB171C6E98A1004DAAF7 /* CCRenderDispatch.h in Headers */,
 				08F4AB181C6E98A1004DAAF7 /* CCTextField.h in Headers */,
@@ -1425,7 +1419,6 @@
 				50C508C60F7C194400799124 /* CCFileUtils.h in Headers */,
 				503798C60F912C2000986724 /* CGPointExtension.h in Headers */,
 				571CD02A19649E03003D460C /* CCPlatformTextFieldIOS.h in Headers */,
-				B706B19818209A8300B27A2C /* CCTexture_Private.h in Headers */,
 				B7EE69E21819E75700B983FE /* CCLayoutBox.h in Headers */,
 				D3903B10199528A0003AA81A /* CCRenderDispatch.h in Headers */,
 				B7E260D818171D2000A0E872 /* CCTextField.h in Headers */,
@@ -1525,7 +1518,6 @@
 				7A5946EC19E372FA00F65F90 /* CCActionTween.h in Headers */,
 				7A5946EE19E372FA00F65F90 /* CCTexturePVR.h in Headers */,
 				7A5946F019E372FA00F65F90 /* CCTexture.h in Headers */,
-				7A5946F219E372FA00F65F90 /* CCTexture_Private.h in Headers */,
 				7A5946F319E372FB00F65F90 /* CCTextureCache.h in Headers */,
 				7A5946F519E372FB00F65F90 /* uthash.h in Headers */,
 				7A5946F619E372FB00F65F90 /* utlist.h in Headers */,
diff --git a/cocos2d/CCLabelTTF.m b/cocos2d/CCLabelTTF.m
@@ -36,7 +36,6 @@
 #import "NSAttributedString+CCAdditions.h"
 #import "CCConfiguration.h"
 #import "CCDirector.h"
-#import "CCTexture_Private.h"
 #import <Foundation/Foundation.h>
 
 #if __CC_PLATFORM_IOS
diff --git a/cocos2d/CCNoARC.m b/cocos2d/CCNoARC.m
@@ -1,4 +1,3 @@
-#import "CCTexture_Private.h"
 #import "CCRenderer_Private.h"
 
 #if __CC_METAL_SUPPORTED_AND_ENABLED
diff --git a/cocos2d/CCNode.h b/cocos2d/CCNode.h
@@ -715,7 +715,7 @@
  @note The animationManager property is nil during a node's init methods.
  @see CCAnimationManager
  */
-@property (nonatomic, readwrite) CCAnimationManager * animationManager;
+@property (nonatomic, assign, readwrite) CCAnimationManager * animationManager;
 
 
 /// -----------------------------------------------------------------------
diff --git a/cocos2d/CCNode.m b/cocos2d/CCNode.m
@@ -42,7 +42,6 @@
 #endif
 #import "CCDirector_Private.h"
 #import "CCRenderer_Private.h"
-#import "CCTexture_Private.h"
 
 #if CC_NODE_RENDER_SUBPIXEL
 #define RENDER_IN_SUBPIXEL
diff --git a/cocos2d/CCRenderTexture.m b/cocos2d/CCRenderTexture.m
@@ -33,7 +33,6 @@
 #import "Support/CCFileUtils.h"
 #import "Support/CGPointExtension.h"
 
-#import "CCTexture_Private.h"
 #import "CCDirector_Private.h"
 #import "CCRenderer_Private.h"
 #import "CCRenderTexture_Private.h"
diff --git a/cocos2d/CCRenderer.m b/cocos2d/CCRenderer.m
@@ -27,7 +27,6 @@
 #import "cocos2d.h"
 #import "CCRenderer_Private.h"
 #import "CCCache.h"
-#import "CCTexture_Private.h"
 #import "CCDirector_Private.h"
 #import "CCRenderDispatch.h"
 
diff --git a/cocos2d/CCRendererBasicTypes.m b/cocos2d/CCRendererBasicTypes.m
@@ -24,7 +24,6 @@
 
 #import "CCRendererBasicTypes.h"
 #import "CCRenderer_Private.h"
-#import "CCTexture_Private.h"
 #import "CCCache.h"
 
 //MARK: Blend Option Keys.
diff --git a/cocos2d/CCRendererGLSupport.m b/cocos2d/CCRendererGLSupport.m
@@ -23,7 +23,6 @@
  */
 
 #import "CCRenderer_Private.h"
-#import "CCTexture_Private.h"
 
 #import "CCRenderDispatch.h"
 
diff --git a/cocos2d/CCShader.m b/cocos2d/CCShader.m
@@ -29,7 +29,6 @@
 #import "Support/CCFileUtils.h"
 #import "Support/uthash.h"
 #import "CCRenderer_Private.h"
-#import "CCTexture_private.h"
 #import "CCDirector.h"
 #import "CCCache.h"
 #import "CCGL.h"
diff --git a/cocos2d/CCSprite.m b/cocos2d/CCSprite.m
@@ -38,7 +38,6 @@
 #import "Support/CGPointExtension.h"
 #import "Support/CCProfiling.h"
 #import "CCRenderer_Private.h"
-#import "CCTexture_Private.h"
 
 #pragma mark -
 #pragma mark CCSprite
diff --git a/cocos2d/CCSprite9Slice.m b/cocos2d/CCSprite9Slice.m
@@ -26,7 +26,6 @@
  */
 
 #import "CCSprite9Slice.h"
-#import "CCTexture_Private.h"
 
 // ---------------------------------------------------------------------
 
diff --git a/cocos2d/CCSpriteFrame.m b/cocos2d/CCSpriteFrame.m
@@ -31,7 +31,6 @@
 #import "CCTexture.h"
 #import "ccMacros.h"
 #import "CCSpriteFrameCache.h"
-#import "CCTexture_Private.h"
 
 @implementation CCSpriteFrame
 {
diff --git a/cocos2d/CCSpriteFrameCache.m b/cocos2d/CCSpriteFrameCache.m
@@ -41,7 +41,7 @@
 #import "CCSpriteFrame.h"
 #import "CCSprite.h"
 #import "Support/CCFileUtils.h"
-#import "CCTexture_Private.h"
+#import "CCTexture.h"
 
 
 @interface CCSpriteFrame(Proxy)
diff --git a/cocos2d/CCTexture.h b/cocos2d/CCTexture.h
@@ -65,6 +65,11 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved.
 #import "ccTypes.h"
 #import "ccMacros.h"
 
+
+#if __CC_METAL_SUPPORTED_AND_ENABLED
+#import <Metal/Metal.h>
+#endif
+
 #import "Platforms/CCGL.h" // OpenGL stuff
 #import "Platforms/CCNS.h" // Next-Step stuff
 
@@ -112,8 +117,28 @@ typedef NS_ENUM(NSUInteger, CCTexturePixelFormat) {
 	CCTexturePixelFormat_Default = CCTexturePixelFormat_RGBA8888,
 };
 
+/*
+ Extension to set the Min / Mag filter
+ */
+typedef struct _ccTexParams {
+    GLuint	minFilter;
+    GLuint	magFilter;
+    GLuint	wrapS;
+    GLuint	wrapT;
+} ccTexParams;
+
+
 @class CCShader;
 
+// Proxy object returned in place of a CCTexture or CCSpriteFrame by the texture cache.
+// Weakly retained by the original object, so it can be know if the object is referenced when a memory warning arrives.
+// This is used as a temporary fix for the texture cache until asset loading can be refactored better.
+@interface CCProxy : NSObject
+
+- (id)initWithTarget:(id)target;
+
+@end
+
 /**
  Represents a texture, an in-memory representation of an image in a compatible format the graphics processor can process.
  
@@ -202,11 +227,36 @@ typedef NS_ENUM(NSUInteger, CCTexturePixelFormat) {
 /// -------------------------------------------------------
 
 /** Whether or not the texture has their Alpha premultiplied. */
-@property(nonatomic,readonly,getter=hasPremultipliedAlpha) BOOL premultipliedAlpha;
+@property(nonatomic,readwrite) BOOL premultipliedAlpha;
 
 /** True if antialised. */
 @property(nonatomic,assign,getter=isAntialiased) BOOL antialiased;
 
+/* texture name */
+@property(nonatomic,readonly) GLuint name;
+
+// TODO This should really be split into a separate subclass somehow.
+#if __CC_METAL_SUPPORTED_AND_ENABLED
+@property(nonatomic,readonly) id<MTLTexture> metalTexture;
+@property(nonatomic,readonly) id<MTLSamplerState> metalSampler;
+#endif
+
+/* texture max S */
+@property(nonatomic,readwrite) GLfloat maxS;
+/* texture max T */
+@property(nonatomic,readwrite) GLfloat maxT;
+
+// Check if the texture's weakly retained proxy still exists.
+@property(atomic, readonly) BOOL hasProxy;
+
+// Retrieve the proxy for this texture.
+@property(atomic, readonly, weak) CCProxy *proxy;
+
+
+/* These functions are needed to create mutable textures */
+- (void) releaseData:(void*)data;
+- (void*) keepData:(void*)data length:(NSUInteger)length;
+
 @end
 
 #pragma mark - Image
@@ -274,6 +324,61 @@ typedef NS_ENUM(NSUInteger, CCTexturePixelFormat) {
 
 @end
 
+/*
+ Extensions to make it easy to create a CCTexture2D object from a PVRTC file
+ Note that the generated textures don't have their alpha premultiplied - use the blending mode (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA).
+ */
+@interface CCTexture (PVRSupport)
+/* Initializes a texture from a PVR file.
+ 
+ Supported PVR formats:
+ - BGRA 8888
+ - RGBA 8888
+ - RGBA 4444
+ - RGBA 5551
+ - RBG 565
+ - A 8
+ - I 8
+ - AI 8
+ - PVRTC 2BPP
+ - PVRTC 4BPP
+ 
+ By default PVR images are treated as if they alpha channel is NOT premultiplied. You can override this behavior with this class method:
+ - PVRImagesHavePremultipliedAlpha:(BOOL)haveAlphaPremultiplied;
+ 
+ IMPORTANT: This method is only defined on iOS. It is not supported on the Mac version.
+ 
+ */
+-(id) initWithPVRFile: (NSString*) file;
+
+/* treats (or not) PVR files as if they have alpha premultiplied.
+ Since it is impossible to know at runtime if the PVR images have the alpha channel premultiplied, it is
+ possible load them as if they have (or not) the alpha channel premultiplied.
+ 
+ By default it is disabled.
+ 
+ */
++(void) PVRImagesHavePremultipliedAlpha:(BOOL)haveAlphaPremultiplied;
+
+@end
+
+@interface CCTexture (GLFilter)
+/* sets the min filter, mag filter, wrap s and wrap t texture parameters.
+ If the texture size is NPOT (non power of 2), then in can only use GL_CLAMP_TO_EDGE in GL_TEXTURE_WRAP_{S,T}.
+ 
+ @warning Calling this method could allocate additional texture memory.
+ 
+ */
+-(void) setTexParameters: (ccTexParams*) texParams;
+
+/* Generates mipmap images for the texture.
+ It only works if the texture size is POT (power of 2).
+ */
+-(void) generateMipmap;
+
+@end
+
+
 
 
 
diff --git a/cocos2d/CCTexture.m b/cocos2d/CCTexture.m
@@ -84,7 +84,6 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
 #import "Support/ccUtils.h"
 #import "Support/CCFileUtils.h"
 
-#import "CCTexture_Private.h"
 #import "CCTextureCache.h"
 #import "CCSpriteFrame.h"
 
diff --git a/cocos2d/CCTextureCache.m b/cocos2d/CCTextureCache.m
@@ -45,7 +45,6 @@
 #import "Platforms/Mac/CCDirectorMac.h"
 #endif
 
-#import "CCTexture_Private.h"
 #import "CCRenderer_Private.h"
 
 // needed for CCCallFuncO in Mac-display_link version
diff --git a/cocos2d/CCTexture_Private.h b/cocos2d/CCTexture_Private.h
diff --git a/cocos2d/Platforms/iOS/CCMetalSupport.m b/cocos2d/Platforms/iOS/CCMetalSupport.m

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#import "CCTexture_Private.h"`
`2`	`1`	`#import "CCRenderer_Private.h"`
`3`	`2`
`4`	`3`	`#if __CC_METAL_SUPPORTED_AND_ENABLED`