Mostly header refactoring for using -ext

oxeron · oxeron · commit 116f8e897c94 · 2016-03-10T21:36:51.000+01:00
diff --git a/cocos2d-ext/CCBReader/CCAnimationManager.h b/cocos2d-ext/CCBReader/CCAnimationManager.h
@@ -23,7 +23,6 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "cocos2d.h"
 #import "CCBSequenceProperty.h"
 
 @class CCBSequence;
diff --git a/cocos2d-ext/CCBReader/CCAnimationManager.m b/cocos2d-ext/CCBReader/CCAnimationManager.m
@@ -35,6 +35,14 @@
 #import "CCBReader_Private.h"
 #import "CCActionManager.h"
 
+#if CC_LIGHTING
+#import "CCLightNode.h"
+#endif
+
+#if CC_OBJECT_AL
+#import "CCActionAudio.h"
+#endif
+
 // Unique Manager ID
 static NSInteger ccbAnimationManagerID = 0;
 
diff --git a/cocos2d-ext/CCEffects/CCEffectGlass.m b/cocos2d-ext/CCEffects/CCEffectGlass.m
@@ -15,7 +15,7 @@
 #import "CCTexture.h"
 
 #import "CCEffect_Private.h"
-#import "CCSprite_Private.h"
+#import "CCSprite.h"
 
 
 static const float CCEffectGlassDefaultFresnelBias = 0.1f;
diff --git a/cocos2d-ext/CCEffects/CCEffectLighting.m b/cocos2d-ext/CCEffects/CCEffectLighting.m
@@ -19,7 +19,7 @@
 #import "CCTexture.h"
 
 #import "CCEffect_Private.h"
-#import "CCSprite_Private.h"
+#import "CCSprite.h"
 
 
 typedef struct _CCLightKey
@@ -328,10 +328,10 @@ +(NSArray *)buildRenderPassesWithInterface:(CCEffectLighting *)interface
                 passInputs.shaderUniforms[passInputs.uniformTranslationTable[lightSpecularColorLabel]] = [NSValue valueWithGLKVector4:lightSpecularColor];
             }
         }
-
+        #if CC_LIGHTING
         CCColor *ambientColor = [CCEffectUtilsGetNodeScene(passInputs.sprite).lights findAmbientSumForLightsWithMask:weakInterface.groupMask];
         passInputs.shaderUniforms[passInputs.uniformTranslationTable[@"u_globalAmbientColor"]] = [NSValue valueWithGLKVector4:ambientColor.glkVector4];
-        
+        #endif
         if (weakInterface.needsSpecular)
         {
             passInputs.shaderUniforms[passInputs.uniformTranslationTable[@"u_specularExponent"]] = weakInterface.conditionedShininess;
@@ -382,7 +382,7 @@ - (CCEffectPrepareResult)prepareForRenderingWithSprite:(CCSprite *)sprite
     _needsNormalMap = (sprite.normalMapSpriteFrame != nil);
     
     CGPoint spritePosition = CGPointApplyAffineTransform(sprite.anchorPointInPoints, sprite.nodeToWorldTransform);
-    
+    #if CC_LIGHTING
     CCLightCollection *lightCollection = CCEffectUtilsGetNodeScene(sprite).lights;
     if (self.groupMaskDirty)
     {
@@ -406,6 +406,7 @@ - (CCEffectPrepareResult)prepareForRenderingWithSprite:(CCSprite *)sprite
         result.status = CCEffectPrepareSuccess;
         result.changes = CCEffectPrepareShaderChanged | CCEffectPrepareUniformsChanged;
     }
+    #endif
     return result;
 }
 
diff --git a/cocos2d-ext/CCEffects/CCEffectNode.m b/cocos2d-ext/CCEffects/CCEffectNode.m
@@ -17,9 +17,9 @@
 #import "Support/CCFileUtils.h"
 #import "Support/CGPointExtension.h"
 
-#import "CCTexture_Private.h"
-#import "CCDirector_Private.h"
-#import "CCNode_Private.h"
+#import "CCTexture.h"
+#import "CCDirector.h"
+#import "CCNode.h"
 #import "CCRenderer_Private.h"
 #import "CCRenderTexture_Private.h"
 #import "CCEffect_Private.h"
diff --git a/cocos2d-ext/CCEffects/CCEffectReflection.m b/cocos2d-ext/CCEffects/CCEffectReflection.m
@@ -15,7 +15,7 @@
 #import "CCTexture.h"
 
 #import "CCEffect_Private.h"
-#import "CCSprite_Private.h"
+#import "CCSprite.h"
 
 
 
diff --git a/cocos2d-ext/CCEffects/CCEffectRefraction.m b/cocos2d-ext/CCEffects/CCEffectRefraction.m
@@ -15,7 +15,7 @@
 #import "CCTexture.h"
 
 #import "CCEffect_Private.h"
-#import "CCSprite_Private.h"
+#import "CCSprite.h"
 
 
 @interface CCEffectRefraction ()
diff --git a/cocos2d-ext/CCEffects/CCEffectRenderer.m b/cocos2d-ext/CCEffects/CCEffectRenderer.m
@@ -16,8 +16,8 @@
 
 #import "CCEffect_Private.h"
 #import "CCRenderer_Private.h"
-#import "CCSprite_Private.h"
-#import "CCTexture_Private.h"
+#import "CCSprite.h"
+#import "CCTexture.h"
 
 
 typedef NS_ENUM(NSUInteger, CCEffectTexCoordSource)
diff --git a/cocos2d-ext/CCEffects/CCEffect_Private.h b/cocos2d-ext/CCEffects/CCEffect_Private.h
@@ -7,7 +7,7 @@
 //
 
 #import "CCEffect.h"
-#import "CCEffectStackProtocol.h"
+#import "CCSprite.h"
 
 
 extern NSString * const CCShaderUniformPreviousPassTexture;
diff --git a/cocos2d-ext/CCLighting/CCLightNode.m b/cocos2d-ext/CCLighting/CCLightNode.m
@@ -66,27 +66,32 @@ +(instancetype)lightWithType:(CCLightType)type groups:(NSArray*)groups color:(CC
 - (void)onEnter
 {
     [super onEnter];
+    #if CC_LIGHTING
     [self.scene.lights addLight:self];
 
     CCLightCollection *lightCollection = self.scene.lights;
     NSAssert(lightCollection, @"The light node is in a scene but there's no light collection.");
     _groupMask = [lightCollection maskForGroups:_groups];
+    #endif
 }
 
 - (void)onExit
 {
     _groupMask = 0;
-    
+    #if CC_LIGHTING
     [self.scene.lights removeLight:self];
+    #endif
     [super onExit];
 }
 
 -(void)setGroups:(NSArray *)groups
 {
     _groups = [groups copy];
-
+    #if CC_LIGHTING
     CCLightCollection *lightCollection = self.scene.lights;
+    
     _groupMask = [lightCollection maskForGroups:_groups];
+    #endif
 }
 
 -(void)setIntensity:(float)intensity
diff --git a/cocos2d/CCNoARC.m b/cocos2d/CCNoARC.m
@@ -1,4 +1,7 @@
 #import "CCRenderer_Private.h"
+#import "CCEffect.h"
+#import "CCEffectRenderer.h"
+#import "CCEffect_Private.h"
 
 #if __CC_METAL_SUPPORTED_AND_ENABLED
 #import "CCMetalSupport_Private.h"
diff --git a/cocos2d/CCSprite.h b/cocos2d/CCSprite.h
@@ -30,8 +30,9 @@
 #import "CCProtocols.h"
 
 #if CC_EFFECTS
-#import "CCEffectRenderer.h"
-#import "CCEffect_Private.h"
+//#import "CCEffectRenderer.h"
+//#import "CCEffect_Private.h"
+@class CCEffectRenderer;
 #endif
 
 @class CCSpriteBatchNode;
diff --git a/cocos2d/CCSprite.m b/cocos2d/CCSprite.m
@@ -38,6 +38,8 @@
 #import "Support/CGPointExtension.h"
 #import "Support/CCProfiling.h"
 #import "CCRenderer_Private.h"
+#import "CCEffect_Private.h"
+#import "CCEffectRenderer.h"
 
 #pragma mark -
 #pragma mark CCSprite

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#import "CCTexture.h"`
`20`	`20`
`21`	`21`	`#import "CCEffect_Private.h"`
`22`		`-#import "CCSprite_Private.h"`
	`22`	`+#import "CCSprite.h"`
`23`	`23`
`24`	`24`
`25`	`25`	`typedef struct _CCLightKey`
`@@ -328,10 +328,10 @@ +(NSArray )buildRenderPassesWithInterface:(CCEffectLighting )interface`
`328`	`328`	`passInputs.shaderUniforms[passInputs.uniformTranslationTable[lightSpecularColorLabel]] = [NSValue valueWithGLKVector4:lightSpecularColor];`
`329`	`329`	`}`
`330`	`330`	`}`
`331`		`-`
	`331`	`+ #if CC_LIGHTING`
`332`	`332`	`CCColor *ambientColor = [CCEffectUtilsGetNodeScene(passInputs.sprite).lights findAmbientSumForLightsWithMask:weakInterface.groupMask];`
`333`	`333`	`passInputs.shaderUniforms[passInputs.uniformTranslationTable[@"u_globalAmbientColor"]] = [NSValue valueWithGLKVector4:ambientColor.glkVector4];`
`334`		`-`
	`334`	`+ #endif`
`335`	`335`	`if (weakInterface.needsSpecular)`
`336`	`336`	`{`
`337`	`337`	`passInputs.shaderUniforms[passInputs.uniformTranslationTable[@"u_specularExponent"]] = weakInterface.conditionedShininess;`
`@@ -382,7 +382,7 @@ - (CCEffectPrepareResult)prepareForRenderingWithSprite:(CCSprite *)sprite`
`382`	`382`	`_needsNormalMap = (sprite.normalMapSpriteFrame != nil);`
`383`	`383`
`384`	`384`	`CGPoint spritePosition = CGPointApplyAffineTransform(sprite.anchorPointInPoints, sprite.nodeToWorldTransform);`
`385`		`-`
	`385`	`+ #if CC_LIGHTING`
`386`	`386`	`CCLightCollection *lightCollection = CCEffectUtilsGetNodeScene(sprite).lights;`
`387`	`387`	`if (self.groupMaskDirty)`
`388`	`388`	`{`
`@@ -406,6 +406,7 @@ - (CCEffectPrepareResult)prepareForRenderingWithSprite:(CCSprite *)sprite`
`406`	`406`	`result.status = CCEffectPrepareSuccess;`
`407`	`407`	`result.changes = CCEffectPrepareShaderChanged \| CCEffectPrepareUniformsChanged;`
`408`	`408`	`}`
	`409`	`+ #endif`
`409`	`410`	`return result;`
`410`	`411`	`}`
`411`	`412`
Original file line number	Diff line number	Diff line change
`@@ -66,27 +66,32 @@ +(instancetype)lightWithType:(CCLightType)type groups:(NSArray*)groups color:(CC`
`66`	`66`	`- (void)onEnter`
`67`	`67`	`{`
`68`	`68`	`[super onEnter];`
	`69`	`+ #if CC_LIGHTING`
`69`	`70`	`[self.scene.lights addLight:self];`
`70`	`71`
`71`	`72`	`CCLightCollection *lightCollection = self.scene.lights;`
`72`	`73`	`NSAssert(lightCollection, @"The light node is in a scene but there's no light collection.");`
`73`	`74`	`_groupMask = [lightCollection maskForGroups:_groups];`
	`75`	`+ #endif`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`- (void)onExit`
`77`	`79`	`{`
`78`	`80`	`_groupMask = 0;`
`79`		`-`
	`81`	`+ #if CC_LIGHTING`
`80`	`82`	`[self.scene.lights removeLight:self];`
	`83`	`+ #endif`
`81`	`84`	`[super onExit];`
`82`	`85`	`}`
`83`	`86`
`84`	`87`	`-(void)setGroups:(NSArray *)groups`
`85`	`88`	`{`
`86`	`89`	`_groups = [groups copy];`
`87`		`-`
	`90`	`+ #if CC_LIGHTING`
`88`	`91`	`CCLightCollection *lightCollection = self.scene.lights;`
	`92`	`+`
`89`	`93`	`_groupMask = [lightCollection maskForGroups:_groups];`
	`94`	`+ #endif`
`90`	`95`	`}`
`91`	`96`
`92`	`97`	`-(void)setIntensity:(float)intensity`