Getting rid of CCParticleSystem_Private.h and CCParticleSystemBase_Pr…

…ivate.h
cocos2d · Mar 11, 2016 · 548f24a · 548f24a
1 parent 5e2ab92
commit 548f24a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 76 deletions.
diff --git a/cocos2d-ext/CCParticles/CCParticleBatchNode.m b/cocos2d-ext/CCParticles/CCParticleBatchNode.m
@@ -39,8 +39,6 @@
 #import "Support/ZipUtils.h"
 #import "Support/CCFileUtils.h"
 
-#import "CCParticleSystemBase_Private.h"
-
 #define kCCParticleDefaultCapacity 500
 
 @interface CCNode()

diff --git a/cocos2d-ext/CCParticles/CCParticleSystem.h b/cocos2d-ext/CCParticles/CCParticleSystem.h
@@ -50,5 +50,13 @@
  */
 -(void) setTexture:(CCTexture *)texture withRect:(CGRect)rect;
 
+// OS X
+// Initilizes the texture with a rectangle measured in points.
+-(void) initTexCoordsWithRect:(CGRect)rect;
+
+// OS X
+// Set sprite frame for system.
+-(void)setSpriteFrame:(CCSpriteFrame*)spriteFrame;
+
 @end
 
diff --git a/cocos2d-ext/CCParticles/CCParticleSystem.m b/cocos2d-ext/CCParticles/CCParticleSystem.m
@@ -45,8 +45,6 @@
 #import "Support/CGPointExtension.h"
 #import "Support/NSThread+performBlock.h"
 
-#import "CCParticleSystemBase_Private.h"
-#import "CCParticleSystem_Private.h"
 #import "CCTexture.h"
 
 @implementation CCParticleSystem {

diff --git a/cocos2d-ext/CCParticles/CCParticleSystemBase.h b/cocos2d-ext/CCParticles/CCParticleSystemBase.h
@@ -614,5 +614,10 @@ typedef void (*_CC_UPDATE_PARTICLE_IMP)(id, SEL, _CCParticle*, CGPoint);
  @see rotatePerSecond */
 @property (nonatomic,readwrite,assign) float rotatePerSecondVar;
 
+// Update.
+-(void) update: (CCTime) dt;
+
+// System full status.
+-(BOOL) isFull;
 
 @end
diff --git a/cocos2d-ext/CCParticles/CCParticleSystemBase.m b/cocos2d-ext/CCParticles/CCParticleSystemBase.m
@@ -61,8 +61,6 @@
 #import "Support/ZipUtils.h"
 #import "Support/CCFileUtils.h"
 
-#import "CCParticleSystemBase_Private.h"
-
 @implementation CCParticleSystemBase
 @synthesize active = _active, duration = _duration;
 @synthesize sourcePosition = _sourcePosition, posVar = _posVar;

diff --git a/cocos2d-ext/CCParticles/CCParticleSystemBase_Private.h b/cocos2d-ext/CCParticles/CCParticleSystemBase_Private.h
diff --git a/cocos2d-ext/CCParticles/CCParticleSystem_Private.h b/cocos2d-ext/CCParticles/CCParticleSystem_Private.h