Merge pull request #1370 from oxeron/develop-v3.5-ext

Header modifications for -ext

Author: s1ddok

README.md

@@ -14,7 +14,7 @@ Please note, that the official site has moved. Please update your bookmarks
 [The Official Forum][3]  
 
 [Cocos2D-ObjC][1] is a framework for building 2D games, demos, and other
-graphical/interactive applications for iOS, Mac and Android.
+graphical/interactive applications for iOS, Mac and tvOS.
 It is based on the [Cocos2D][2] design, but instead of using Python it uses Swift and / or Objective-C.
 
 Cocos2D-ObjC is:

cocos2d-ext/CCBReader/CCAnimationManager+FrameAnimation.m

@@ -7,7 +7,7 @@
 //
 
 #import "CCAnimationManager+FrameAnimation.h"
-#import "CCAnimationManager_Private.h"
+#import "CCAnimationManager.h"
 
 @implementation CCAnimationManager (FrameAnimation)
 

cocos2d-ext/CCBReader/CCAnimationManager.h

@@ -23,7 +23,6 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "cocos2d.h"
 #import "CCBSequenceProperty.h"
 
 @class CCBSequence;
@@ -130,4 +129,35 @@
 /// @see CCBAnimationManagerDelegate
 @property (nonatomic,weak) NSObject<CCBAnimationManagerDelegate>* delegate;
 
+// Sequence Array
+@property (nonatomic,readonly) NSMutableArray* sequences;
+
+
+// Auto play sequence id.
+@property (nonatomic,assign) int autoPlaySequenceId;
+
+// Base node.
+@property (nonatomic,unsafe_unretained) CCNode* rootNode;
+
+// (CCB) Optional owner
+@property (nonatomic,unsafe_unretained) id owner;
+
+// (CCB) Resolution and default container size.
+@property (nonatomic,assign) CGSize rootContainerSize;
+
+// (CCB) Node Management
+- (CGSize) containerSize:(CCNode*)node;
+- (void) addNode:(CCNode*)node andSequences:(NSDictionary*)seq;
+- (void) moveAnimationsFromNode:(CCNode*)fromNode toNode:(CCNode*)toNode;
+
+// Reset node state.
+- (void) setBaseValue:(id)value forNode:(CCNode*)node propertyName:(NSString*)propName;
+
+- (void) runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuration;
+
+- (void)timeSeekForSequenceId:(int)seqId time:(float)time;
+
+#pragma mark Simple Sequence Builder
+- (void)addKeyFramesForSequenceNamed:(NSString*)name propertyType:(CCBSequencePropertyType)propertyType frameArray:(NSArray*)frameArray node:(CCNode *)node loop:(BOOL)loop;
+
 @end

cocos2d-ext/CCBReader/CCAnimationManager.m

@@ -23,7 +23,6 @@
  */
 
 #import "CCAnimationManager.h"
-#import "CCAnimationManager_Private.h"
 #import "CCBKeyframe.h"
 #import "CCBSequence.h"
 #import "CCBSequenceProperty.h"
@@ -32,9 +31,17 @@
 #import <objc/runtime.h>
 
 #import "CCDirector.h"
-#import "CCBReader_Private.h"
+#import "CCBReader.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;
 

cocos2d-ext/CCBReader/CCAnimationManager_Private.h

@@ -60,6 +60,89 @@
  
  Nodes created from a SpriteBuilder document will also have a valid CCAnimationManager instance assigned to their [CCNode animationManager] property.
  */
+
+#define kCCBVersion 10
+
+enum {
+    kCCBPropTypePosition = 0,
+    kCCBPropTypeSize,
+    kCCBPropTypePoint,
+    kCCBPropTypePointLock,
+    kCCBPropTypeScaleLock,
+    kCCBPropTypeDegrees,
+    kCCBPropTypeInteger,
+    kCCBPropTypeFloat,
+    kCCBPropTypeFloatVar,
+    kCCBPropTypeCheck,
+    kCCBPropTypeSpriteFrame,
+    kCCBPropTypeTexture,
+    kCCBPropTypeByte,
+    kCCBPropTypeColor3,
+    kCCBPropTypeColor4FVar,
+    kCCBPropTypeFlip,
+    kCCBPropTypeBlendmode,
+    kCCBPropTypeFntFile,
+    kCCBPropTypeText,
+    kCCBPropTypeFontTTF,
+    kCCBPropTypeIntegerLabeled,
+    kCCBPropTypeBlock,
+    kCCBPropTypeAnimation,
+    kCCBPropTypeCCBFile,
+    kCCBPropTypeString,
+    kCCBPropTypeBlockCCControl,
+    kCCBPropTypeFloatScale,
+    kCCBPropTypeFloatXY,
+    kCCBPropTypeColor4,
+    kCCBPropTypeNodeReference,
+    kCCBPropTypeFloatCheck,
+    kCCBPropTypeEffects,
+    kCCBPropTypeTokenArray
+};
+
+enum {
+    kCCBFloat0 = 0,
+    kCCBFloat1,
+    kCCBFloatMinus1,
+    kCCBFloat05,
+    kCCBFloatInteger,
+    kCCBFloatFull
+};
+
+enum {
+    kCCBPlatformAll = 0,
+    kCCBPlatformIOS,
+    kCCBPlatformMac
+};
+
+enum {
+    kCCBTargetTypeNone = 0,
+    kCCBTargetTypeDocumentRoot = 1,
+    kCCBTargetTypeOwner = 2,
+};
+
+enum
+{
+    kCCBKeyframeEasingInstant,
+    
+    kCCBKeyframeEasingLinear,
+    
+    kCCBKeyframeEasingCubicIn,
+    kCCBKeyframeEasingCubicOut,
+    kCCBKeyframeEasingCubicInOut,
+    
+    kCCBKeyframeEasingElasticIn,
+    kCCBKeyframeEasingElasticOut,
+    kCCBKeyframeEasingElasticInOut,
+    
+    kCCBKeyframeEasingBounceIn,
+    kCCBKeyframeEasingBounceOut,
+    kCCBKeyframeEasingBounceInOut,
+    
+    kCCBKeyframeEasingBackIn,
+    kCCBKeyframeEasingBackOut,
+    kCCBKeyframeEasingBackInOut,
+};
+
 @interface CCBReader : NSObject
 {
     NSData* data;

cocos2d-ext/CCBReader/CCBReader.h

@@ -32,13 +32,12 @@
 #import "CCBSequenceProperty.h"
 #import "CCBKeyframe.h"
 #import "CCBLocalizationManager.h"
-#import "CCBReader_Private.h"
+#import "CCBReader.h"
 #import "CCNode.h"
 #import "CCDirector.h"
 #if CC_PHYSICS
 #import "CCPhysics+ObjectiveChipmunk.h"
 #endif
-#import "CCAnimationManager_Private.h"
 #if CC_EFFECTS
 #import "CCEffectStack.h"
 #endif
@@ -95,20 +94,12 @@ + (void) configureCCFileUtils
      @"resources-phonehd", CCFileUtilsSuffixMacHD,
      @"", CCFileUtilsSuffixDefault,
      nil];
-    
-#if __CC_PLATFORM_ANDROID
-    sharedFileUtils.searchPath =
-    [NSArray arrayWithObjects:
-     [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"Published-Android"],
-     [[NSBundle mainBundle] resourcePath],
-     nil];
-#else
+
     sharedFileUtils.searchPath =
     [NSArray arrayWithObjects:
      [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"Published-iOS"],
      [[NSBundle mainBundle] resourcePath],
      nil];
-#endif
 
 	sharedFileUtils.enableiPhoneResourcesOniPad = YES;
     sharedFileUtils.searchMode = CCFileUtilsSearchModeDirectory;
@@ -420,7 +411,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
 
         if (setProp)
         {
-#if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
+#if __CC_PLATFORM_IOS
             [node setValue:[NSValue valueWithCGPoint:ccp(x,y)] forKey:name];
 #elif __CC_PLATFORM_MAC
             [node setValue:[NSValue valueWithPoint:ccp(x,y)] forKey:name];
@@ -455,7 +446,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
         if (setProp)
         {
             CGPoint pt = ccp(x,y);
-#if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
+#if __CC_PLATFORM_IOS
             [node setValue:[NSValue valueWithCGPoint:pt] forKey:name];
 #else
             [node setValue:[NSValue valueWithPoint:NSPointFromCGPoint(pt)] forKey:name];
@@ -476,7 +467,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
         if (setProp)
         {
             CGSize size = CGSizeMake(w, h);
-#if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
+#if __CC_PLATFORM_IOS
             [node setValue:[NSValue valueWithCGSize:size] forKey:name];
 #elif __CC_PLATFORM_MAC
             [node setValue:[NSValue valueWithSize:size] forKey:name];