Merge CCNode private header into main

s1ddok · s1ddok · commit 7251af98dfdd · 2016-02-29T18:09:07.000+03:00
diff --git a/UnitTests/CCMemoryTests.m b/UnitTests/CCMemoryTests.m
@@ -8,7 +8,6 @@
 
 #import <XCTest/XCTest.h>
 #import "cocos2d.h"
-#import "CCNode_private.h"
 
 @interface CCMemoryNode : CCNode
 
diff --git a/UnitTests/CCNodeTests.m b/UnitTests/CCNodeTests.m
@@ -8,7 +8,6 @@
 #import <XCTest/XCTest.h>
 #import "cocos2d.h"
 #import "CCDirector_Private.h"
-#import "CCNode_Private.h"
 
 @interface CCNodeTests : XCTestCase
 
diff --git a/cocos2d-ext/CCClippingNode/CCClippingNode.m b/cocos2d-ext/CCClippingNode/CCClippingNode.m
@@ -32,7 +32,6 @@
 #import "CCDirector.h"
 #import "CGPointExtension.h"
 
-#import "CCNode_Private.h"
 #import "CCRenderDispatch.h"
 #import "CCConfiguration.h"
 
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 "CCNode_Private.h"
 #import "CCTexture_Private.h"
 #import "CCRenderer_Private.h"
 
diff --git a/cocos2d-ext/CCParticles/CCParticleBatchNode.m b/cocos2d-ext/CCParticles/CCParticleBatchNode.m
@@ -39,7 +39,6 @@
 #import "Support/ZipUtils.h"
 #import "Support/CCFileUtils.h"
 
-#import "CCNode_Private.h"
 #import "CCParticleSystemBase_Private.h"
 
 #import "CCTexture_Private.h"
diff --git a/cocos2d-ext/CCParticles/CCParticleSystem.m b/cocos2d-ext/CCParticles/CCParticleSystem.m
@@ -45,7 +45,6 @@
 #import "Support/CGPointExtension.h"
 #import "Support/NSThread+performBlock.h"
 
-#import "CCNode_Private.h"
 #import "CCParticleSystemBase_Private.h"
 #import "CCParticleSystem_Private.h"
 #import "CCTexture_Private.h"
diff --git a/cocos2d-ext/CCParticles/CCParticleSystemBase.m b/cocos2d-ext/CCParticles/CCParticleSystemBase.m
@@ -54,7 +54,6 @@
 #import "CCTextureCache.h"
 #import "ccMacros.h"
 #import "Support/CCProfiling.h"
-#import "CCNode_Private.h"
 
 // support
 #import "Support/CGPointExtension.h"
diff --git a/cocos2d-ext/TileMaps/CCTiledMapLayer.m b/cocos2d-ext/TileMaps/CCTiledMapLayer.m
@@ -37,7 +37,6 @@
 #import "CCTextureCache.h"
 #import "CCShader.h"
 #import "Support/CGPointExtension.h"
-#import "CCNode_Private.h"
 #import "CCSprite_Private.h"
 #import "CCTiledMapLayer_Private.h"
 #import "CCTexture_Private.h"
diff --git a/cocos2d-ui-tests/tests/SpritePerformanceTest.m b/cocos2d-ui-tests/tests/SpritePerformanceTest.m
@@ -1,5 +1,4 @@
 #import "TestBase.h"
-#import "CCNode_Private.h"
 
 @interface SpritePerformanceTest : TestBase @end
 @implementation SpritePerformanceTest
diff --git a/cocos2d-ui-tests/tests/VertexZTest.m b/cocos2d-ui-tests/tests/VertexZTest.m
@@ -8,7 +8,6 @@
 
 #import "TestBase.h"
 #import "CCTextureCache.h"
-#import "CCNode_Private.h"
 #import "CCSprite_Private.h"
 
 @interface GlobalSortSprite : CCSprite @end
diff --git a/cocos2d-ui/CCProgressNode.m b/cocos2d-ui/CCProgressNode.m
@@ -33,7 +33,6 @@
 #import "Support/CGPointExtension.h"
 #import "CCSprite_Private.h"
 
-#import "CCNode_Private.h"
 #import "CCProgressNode_Private.h"
 
 #import "CCTexture_Private.h"
diff --git a/cocos2d.xcodeproj/project.pbxproj b/cocos2d.xcodeproj/project.pbxproj
@@ -130,7 +130,6 @@
 		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 */; };
-		08F4AB0F1C6E98A1004DAAF7 /* CCNode_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B798D13C181F2E4500E7BFCD /* CCNode_Private.h */; };
 		08F4AB101C6E98A1004DAAF7 /* CCSprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 509A79950F6188420032F449 /* CCSprite.h */; };
 		08F4AB111C6E98A1004DAAF7 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50C508C40F7C194400799124 /* CCFileUtils.h */; };
 		08F4AB121C6E98A1004DAAF7 /* CGPointExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 503798C40F912C2000986724 /* CGPointExtension.h */; };
@@ -280,7 +279,6 @@
 		7A4037C819E3712A007B6E8F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A4037C719E3712A007B6E8F /* OpenGL.framework */; };
 		7A59466E19E372EE00F65F90 /* CCNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F2540DFDEAFF00C013A5 /* CCNode.h */; };
 		7A59467019E372EE00F65F90 /* CCNode+Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = A039EBFD155C686B0061EE37 /* CCNode+Debug.h */; };
-		7A59467219E372EF00F65F90 /* CCNode_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B798D13C181F2E4500E7BFCD /* CCNode_Private.h */; };
 		7A59467319E372EF00F65F90 /* CCLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = B7EE69DC1819E75700B983FE /* CCLayout.h */; };
 		7A59467519E372EF00F65F90 /* CCLayoutBox.h in Headers */ = {isa = PBXBuildFile; fileRef = B7EE69DE1819E75700B983FE /* CCLayoutBox.h */; };
 		7A59467719E372EF00F65F90 /* CCDrawNode.h in Headers */ = {isa = PBXBuildFile; fileRef = A0DA0BC115BCDCA200E80A92 /* CCDrawNode.h */; };
@@ -477,7 +475,6 @@
 		B78AE46C17E7AF6C0028BE0B /* UITouch+CC.h in Headers */ = {isa = PBXBuildFile; fileRef = B78AE46A17E7AF6C0028BE0B /* UITouch+CC.h */; };
 		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 */; };
-		B798D13D181F2E4500E7BFCD /* CCNode_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B798D13C181F2E4500E7BFCD /* CCNode_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 */; };
@@ -696,7 +693,6 @@
 		B78AE46A17E7AF6C0028BE0B /* UITouch+CC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITouch+CC.h"; sourceTree = "<group>"; };
 		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>"; };
-		B798D13C181F2E4500E7BFCD /* CCNode_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNode_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>"; };
@@ -1073,7 +1069,6 @@
 				5018F2550DFDEAFF00C013A5 /* CCNode.m */,
 				A039EBFD155C686B0061EE37 /* CCNode+Debug.h */,
 				A039EBFE155C686B0061EE37 /* CCNode+Debug.m */,
-				B798D13C181F2E4500E7BFCD /* CCNode_Private.h */,
 			);
 			name = "Base Nodes";
 			sourceTree = "<group>";
@@ -1353,7 +1348,6 @@
 				08F4AB0D1C6E98A1004DAAF7 /* CCSprite_Private.h in Headers */,
 				08F4AB0E1C6E98A1004DAAF7 /* ccMacros.h in Headers */,
 				08A4EB7F1C7A563900A08923 /* CCPotentiometer.h in Headers */,
-				08F4AB0F1C6E98A1004DAAF7 /* CCNode_Private.h in Headers */,
 				08F4AB101C6E98A1004DAAF7 /* CCSprite.h in Headers */,
 				08F4AB111C6E98A1004DAAF7 /* CCFileUtils.h in Headers */,
 				08F4AB121C6E98A1004DAAF7 /* CGPointExtension.h in Headers */,
@@ -1449,7 +1443,6 @@
 				B798D1451820305400E7BFCD /* CCSprite_Private.h in Headers */,
 				50BAF3990F33CCD8003F654C /* ccMacros.h in Headers */,
 				08A4EB7D1C7A563900A08923 /* CCPotentiometer.h in Headers */,
-				B798D13D181F2E4500E7BFCD /* CCNode_Private.h in Headers */,
 				509A79970F6188420032F449 /* CCSprite.h in Headers */,
 				50C508C60F7C194400799124 /* CCFileUtils.h in Headers */,
 				503798C60F912C2000986724 /* CGPointExtension.h in Headers */,
@@ -1527,7 +1520,6 @@
 			files = (
 				7A59466E19E372EE00F65F90 /* CCNode.h in Headers */,
 				7A59467019E372EE00F65F90 /* CCNode+Debug.h in Headers */,
-				7A59467219E372EF00F65F90 /* CCNode_Private.h in Headers */,
 				7A59467319E372EF00F65F90 /* CCLayout.h in Headers */,
 				08A4EB701C7A553E00A08923 /* CCActionProgressTimer.h in Headers */,
 				7A59467519E372EF00F65F90 /* CCLayoutBox.h in Headers */,
diff --git a/cocos2d/CCDirector.m b/cocos2d/CCDirector.m
@@ -65,7 +65,6 @@
 #endif
 
 #import "CCDirector_Private.h"
-#import "CCNode_Private.h"
 
 #pragma mark -
 #pragma mark Director - global variables (optimization)
diff --git a/cocos2d/CCDrawNode.m b/cocos2d/CCDrawNode.m
@@ -30,7 +30,6 @@
 #import "CCDrawNode.h"
 #import "CCShader.h"
 #import "Support/CGPointExtension.h"
-#import "CCNode_Private.h"
 #import "CCColor.h"
 #import "CCConfiguration.h"
 #import "CCMetalSupport_Private.h"
diff --git a/cocos2d/CCLabelTTF.m b/cocos2d/CCLabelTTF.m
@@ -35,7 +35,6 @@
 #import "ccUtils.h"
 #import "NSAttributedString+CCAdditions.h"
 #import "CCConfiguration.h"
-#import "CCNode_Private.h"
 #import "CCDirector.h"
 #import "CCTexture_Private.h"
 #import <Foundation/Foundation.h>
diff --git a/cocos2d/CCLayout.m b/cocos2d/CCLayout.m
@@ -24,7 +24,6 @@
  */
 
 #import "CCLayout.h"
-#import "CCNode_Private.h"
 
 @implementation CCLayout
 
diff --git a/cocos2d/CCLayoutBox.m b/cocos2d/CCLayoutBox.m
@@ -26,7 +26,6 @@
 #import "CCLayoutBox.h"
 #import "ccMacros.h"
 #import "CGPointExtension.h"
-#import "CCNode_Private.h"
 
 @implementation CCLayoutBox
 
diff --git a/cocos2d/CCNoARC.m b/cocos2d/CCNoARC.m
@@ -1,5 +1,4 @@
 #import "CCTexture_Private.h"
-#import "CCNode_Private.h"
 #import "CCSprite_Private.h"
 #import "CCRenderer_Private.h"
 #import "CCShader_Private.h"
diff --git a/cocos2d/CCNode+Debug.m b/cocos2d/CCNode+Debug.m
@@ -24,7 +24,6 @@
  */
 
 #import "CCNode+Debug.h"
-#import "CCNode_Private.h"
 
 #if DEBUG
 
diff --git a/cocos2d/CCNode.h b/cocos2d/CCNode.h
@@ -145,12 +145,10 @@
  
  is called.  This offers an opportunity for the node to carry out any cleanup such as removing possible circular references that might cause a memory leak.
  
- CCNode implements a base level of functionality for cleanup and if your subclass needs to implement it, you will need to import CCNode_Private.h.
- 
  @note that if you override cleanup, you must call [super cleanup] <em>after</em> any cleanup of your own.
  
  */
-@interface CCNode : CCResponder < CCSchedulerTarget > {
+@interface CCNode : CCResponder < CCSchedulerTarget, CCShaderProtocol, CCBlendProtocol, CCTextureProtocol> {
     
 	// Rotation angle.
 	float _rotationalSkewX, _rotationalSkewY;
@@ -234,6 +232,16 @@
 	
 	// Number of paused parent or ancestor nodes.
 	int _pausedAncestors;
+    
+@protected
+    CCRenderState *_renderState;
+    
+    CCShader *_shader;
+    NSMutableDictionary *_shaderUniforms;
+    
+    CCBlendMode *_blendMode;
+    CCTexture *_texture;
+    
 }
 
 
@@ -707,7 +715,7 @@
  @note The animationManager property is nil during a node's init methods.
  @see CCAnimationManager
  */
-@property (nonatomic, readonly) CCAnimationManager * animationManager;
+@property (nonatomic, readwrite) CCAnimationManager * animationManager;
 
 
 /// -----------------------------------------------------------------------
@@ -1127,8 +1135,79 @@
  */
 @property(nonatomic, strong) CCPhysicsBody *physicsBody;
 
+/// Returns true if the node is not using custom uniforms.
+-(BOOL)hasDefaultShaderUniforms;
+
+/// Cache and return the current render state.
+/// Should be set to nil whenever changing a property that affects the renderstate.
+@property(nonatomic, strong) CCRenderState *renderState;
+
+/* The real openGL Z vertex.
+ Differences between openGL Z vertex and cocos2d Z order:
+ - OpenGL Z modifies the Z vertex, and not the Z order in the relation between parent-children
+ - OpenGL Z might require to set 2D projection
+ - cocos2d Z order works OK if all the nodes uses the same openGL Z vertex. eg: vertexZ = 0
+ @warning: Use it at your own risk since it might break the cocos2d parent-children z order
+ */
+@property (nonatomic,readwrite) float vertexZ;
+
+@property (nonatomic,readonly) BOOL isPhysicsNode;
+
+/* used internally for zOrder sorting, don't change this manually */
+@property(nonatomic,readwrite) NSUInteger orderOfArrival;
+
+/* CCActionManager used by all the actions.
+ IMPORTANT: If you set a new CCActionManager, then previously created actions are going to be removed.
+ */
+@property (nonatomic, readwrite, strong) CCActionManager *actionManager;
+
+/* CCScheduler used to schedule all "updates" and timers.
+ IMPORTANT: If you set a new CCScheduler, then previously created timers/update are going to be removed.
+ */
+@property (nonatomic, readwrite, strong) CCScheduler *scheduler;
+
+/* Compares two nodes in respect to zOrder and orderOfArrival (used for sorting sprites in display list) */
+- (NSComparisonResult) compareZOrderToNode:(CCNode*)node;
+
+/* Reorders a child according to a new z value.
+ * The child MUST be already added.
+ */
+-(void) reorderChild:(CCNode*)child z:(NSInteger)zOrder;
+
+/* performance improvement, Sort the children array once before drawing, instead of every time when a child is added or reordered
+ don't call this manually unless a child added needs to be removed in the same frame */
+- (void) sortAllChildren;
+
+/* Event that is called when the running node is no longer running (eg: its CCScene is being removed from the "stage" ).
+ On cleanup you should break any possible circular references.
+ CCNode's cleanup removes any possible scheduled timer and/or any possible action.
+ If you override cleanup, you must call [super cleanup] <em>after</em> any cleanup of your own.
+ */
+-(void) cleanup __attribute__((objc_requires_super));
+
+///* performs OpenGL view-matrix transformation of its ancestors.
+// Generally the ancestors are already transformed, but in certain cases (eg: attaching a FBO) it is necessary to transform the ancestors again.
+// */
+//-(void) transformAncestors;
+
+/* final method called to actually remove a child node from the children.
+ *  @param node    The child node to remove
+ *  @param cleanup Stops all scheduled events and actions
+ */
+-(void) detachChild:(CCNode *)child cleanup:(BOOL)doCleanup;
+
+- (void) contentSizeChanged;
+- (void) parentsContentSizeChanged;
+
 @end
 
+CGPoint NodeToPhysicsScale(CCNode * node);
+float NodeToPhysicsRotation(CCNode *node);
+CGAffineTransform NodeToPhysicsTransform(CCNode *node);
+CGAffineTransform RigidBodyToParentTransform(CCNode *node, CCPhysicsBody *body);
+CGPoint GetPositionFromBody(CCNode *node, CCPhysicsBody *body);
+CGPoint TransformPointAsVector(CGPoint p, CGAffineTransform t);
+CGAffineTransform CGAffineTransformMakeRigid(CGPoint translate, CGFloat radians);
 
 @interface CCNode(NoARC)
 
diff --git a/cocos2d/CCNode.m b/cocos2d/CCNode.m
@@ -26,7 +26,6 @@
  */
 
 #import "CCNode.h"
-#import "CCNode_Private.h"
 #import "CCDirector.h"
 #import "CCActionManager.h"
 #if CC_CCBREADER
diff --git a/cocos2d/CCNodeColor.m b/cocos2d/CCNodeColor.m
@@ -33,8 +33,6 @@
 #import "ccMacros.h"
 #import "CCShader.h"
 #import "Support/CGPointExtension.h"
-#import "CCNode_Private.h"
-
 
 #if __CC_PLATFORM_IOS
 #import "Platforms/iOS/CCDirectorIOS.h"
diff --git a/cocos2d/CCNode_Private.h b/cocos2d/CCNode_Private.h
diff --git a/cocos2d/CCRenderTexture.m b/cocos2d/CCRenderTexture.m
diff --git a/cocos2d/CCRenderTexture_Private.h b/cocos2d/CCRenderTexture_Private.h
diff --git a/cocos2d/CCSprite.m b/cocos2d/CCSprite.m
diff --git a/cocos2d/CCSprite9Slice.m b/cocos2d/CCSprite9Slice.m
diff --git a/cocos2d/CCSpriteBatchNode.m b/cocos2d/CCSpriteBatchNode.m
diff --git a/cocos2d/CCTransition.m b/cocos2d/CCTransition.m

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#import "TestBase.h"`
`2`		`-#import "CCNode_Private.h"`
`3`	`2`
`4`	`3`	`@interface SpritePerformanceTest : TestBase @end`
`5`	`4`	`@implementation SpritePerformanceTest`