Merge CCSprite private header

Author: s1ddok

cocos2d.xcodeproj/project.pbxproj

@@ -128,7 +128,6 @@
 		08F4AB0A1C6E98A1004DAAF7 /* TGAlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 501CCFAC0E99657C00B86F68 /* TGAlib.h */; };
 		08F4AB0B1C6E98A1004DAAF7 /* CCActionEase.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F7B2760F28DE7C00057537 /* CCActionEase.h */; };
 		08F4AB0C1C6E98A1004DAAF7 /* CCPlatformTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 571CD01E19649E03003D460C /* CCPlatformTextField.h */; };
-		08F4AB0D1C6E98A1004DAAF7 /* CCSprite_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B798D1441820305400E7BFCD /* CCSprite_Private.h */; };
 		08F4AB0E1C6E98A1004DAAF7 /* ccMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50BAF3970F33CCD8003F654C /* ccMacros.h */; };
 		08F4AB101C6E98A1004DAAF7 /* CCSprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 509A79950F6188420032F449 /* CCSprite.h */; };
 		08F4AB111C6E98A1004DAAF7 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50C508C40F7C194400799124 /* CCFileUtils.h */; };
@@ -292,7 +291,6 @@
 		7A59468619E372EF00F65F90 /* CCSpriteBatchNode.h in Headers */ = {isa = PBXBuildFile; fileRef = E0C3655911F0AE9B001C08F9 /* CCSpriteBatchNode.h */; };
 		7A59468819E372F000F65F90 /* CCSpriteFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E2A14E10A45E7F00D894CE /* CCSpriteFrame.h */; };
 		7A59468A19E372F000F65F90 /* CCSpriteFrameCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 502C8BDE10A661E200D137BA /* CCSpriteFrameCache.h */; };
-		7A59468C19E372F000F65F90 /* CCSprite_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B798D1441820305400E7BFCD /* CCSprite_Private.h */; };
 		7A59468D19E372F000F65F90 /* CCResponder.h in Headers */ = {isa = PBXBuildFile; fileRef = A6A0734817C78EF3004343C8 /* CCResponder.h */; };
 		7A5946AA19E372F200F65F90 /* CCScene.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F2600DFDEAFF00C013A5 /* CCScene.h */; };
 		7A5946AC19E372F200F65F90 /* CCTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = A6DC4E0718055DCC00C280A6 /* CCTransition.h */; };
@@ -476,7 +474,6 @@
 		B78AE46D17E7AF6C0028BE0B /* UITouch+CC.m in Sources */ = {isa = PBXBuildFile; fileRef = B78AE46B17E7AF6C0028BE0B /* UITouch+CC.m */; };
 		B791E85D182074C500DAE1D7 /* CCProgressNode_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B791E85A182074C500DAE1D7 /* CCProgressNode_Private.h */; };
 		B798D143181F469100E7BFCD /* CCLabelBMFont_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B798D142181F469100E7BFCD /* CCLabelBMFont_Private.h */; };
-		B798D1451820305400E7BFCD /* CCSprite_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B798D1441820305400E7BFCD /* CCSprite_Private.h */; };
 		B79F905A17FE2A2E00908504 /* CCTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = B79F905817FE2A2E00908504 /* CCTableView.h */; };
 		B79F905B17FE2A2E00908504 /* CCTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = B79F905917FE2A2E00908504 /* CCTableView.m */; };
 		B7E260D818171D2000A0E872 /* CCTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = B7E260D618171D2000A0E872 /* CCTextField.h */; };
@@ -694,7 +691,6 @@
 		B78AE46B17E7AF6C0028BE0B /* UITouch+CC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITouch+CC.m"; sourceTree = "<group>"; };
 		B791E85A182074C500DAE1D7 /* CCProgressNode_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProgressNode_Private.h; sourceTree = "<group>"; };
 		B798D142181F469100E7BFCD /* CCLabelBMFont_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCLabelBMFont_Private.h; sourceTree = "<group>"; };
-		B798D1441820305400E7BFCD /* CCSprite_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite_Private.h; sourceTree = "<group>"; };
 		B79F905817FE2A2E00908504 /* CCTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCTableView.h; path = "cocos2d-ui/CCTableView.h"; sourceTree = "<group>"; };
 		B79F905917FE2A2E00908504 /* CCTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCTableView.m; path = "cocos2d-ui/CCTableView.m"; sourceTree = "<group>"; };
 		B7C6237917EA7D8600928F91 /* cocos2d-ui.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "cocos2d-ui.h"; path = "cocos2d-ui/cocos2d-ui.h"; sourceTree = "<group>"; };
@@ -1023,7 +1019,6 @@
 				50E2A14F10A45E7F00D894CE /* CCSpriteFrame.m */,
 				502C8BDE10A661E200D137BA /* CCSpriteFrameCache.h */,
 				502C8BDF10A661E200D137BA /* CCSpriteFrameCache.m */,
-				B798D1441820305400E7BFCD /* CCSprite_Private.h */,
 			);
 			name = "Sprite & Animation Nodes";
 			sourceTree = "<group>";
@@ -1345,7 +1340,6 @@
 				08F4AB0A1C6E98A1004DAAF7 /* TGAlib.h in Headers */,
 				08F4AB0B1C6E98A1004DAAF7 /* CCActionEase.h in Headers */,
 				08F4AB0C1C6E98A1004DAAF7 /* CCPlatformTextField.h in Headers */,
-				08F4AB0D1C6E98A1004DAAF7 /* CCSprite_Private.h in Headers */,
 				08F4AB0E1C6E98A1004DAAF7 /* ccMacros.h in Headers */,
 				08A4EB7F1C7A563900A08923 /* CCPotentiometer.h in Headers */,
 				08F4AB101C6E98A1004DAAF7 /* CCSprite.h in Headers */,
@@ -1440,7 +1434,6 @@
 				501CCFB50E99657C00B86F68 /* TGAlib.h in Headers */,
 				50F7B2780F28DE7C00057537 /* CCActionEase.h in Headers */,
 				571CD02819649E03003D460C /* CCPlatformTextField.h in Headers */,
-				B798D1451820305400E7BFCD /* CCSprite_Private.h in Headers */,
 				50BAF3990F33CCD8003F654C /* ccMacros.h in Headers */,
 				08A4EB7D1C7A563900A08923 /* CCPotentiometer.h in Headers */,
 				509A79970F6188420032F449 /* CCSprite.h in Headers */,
@@ -1534,7 +1527,6 @@
 				7A59468619E372EF00F65F90 /* CCSpriteBatchNode.h in Headers */,
 				7A59468819E372F000F65F90 /* CCSpriteFrame.h in Headers */,
 				7A59468A19E372F000F65F90 /* CCSpriteFrameCache.h in Headers */,
-				7A59468C19E372F000F65F90 /* CCSprite_Private.h in Headers */,
 				7A59468D19E372F000F65F90 /* CCResponder.h in Headers */,
 				7A5946AA19E372F200F65F90 /* CCScene.h in Headers */,
 				7A5946AC19E372F200F65F90 /* CCTransition.h in Headers */,

cocos2d/CCSprite.h

@@ -29,6 +29,11 @@
 #import "CCNode.h"
 #import "CCProtocols.h"
 
+#if CC_EFFECTS
+#import "CCEffectRenderer.h"
+#import "CCEffect_Private.h"
+#endif
+
 @class CCSpriteBatchNode;
 @class CCSpriteFrame;
 @class CCAnimation;
@@ -59,7 +64,18 @@ typedef struct CCSpriteTexCoordSet {
 #if CC_EFFECTS
 , CCEffectProtocol
 #endif
->
+> {
+@private
+    // Vertex coords, texture coords and color info.
+    CCSpriteVertexes _verts;
+    
+    // Center of extents (half width/height) of the sprite for culling purposes.
+    GLKVector2 _vertexCenter, _vertexExtents;
+#if CC_EFFECTS
+    CCEffect *_effect;
+    CCEffectRenderer *_effectRenderer;
+#endif
+}
 
 /// -----------------------------------------------------------------------
 /// @name Creating a Sprite with an Image File or Sprite Frame Name
@@ -284,6 +300,17 @@ typedef struct CCSpriteTexCoordSet {
  */
 - (CGAffineTransform)nodeToTextureTransform;
 
++ (CCSpriteTexCoordSet)textureCoordsForTexture:(CCTexture *)texture withRect:(CGRect)rect rotated:(BOOL)rotated xFlipped:(BOOL)flipX yFlipped:(BOOL)flipY;
+
+#if CC_EFFECTS
+- (void)updateShaderUniformsFromEffect;
+#endif
+@end
 
 
+@interface CCSprite(NoARC)
+
+-(void)enqueueTriangles:(CCRenderer *)renderer transform:(const GLKMatrix4 *)transform;
+
 @end
+