Support deserialization of Effectws.

Author: jtwigg

cocos2d-ui/CCBReader/CCBReader.h

@@ -60,6 +60,7 @@
     NSMutableDictionary* actionManagers;
     NSMutableSet* animatedProps;
     NSMutableDictionary* nodeMapping;//Maps UUID -> Node
+	NSMutableArray * postDeserializationUUIDFixup;
 }
 
 /// -----------------------------------------------------------------------

cocos2d-ui/CCBReader/CCBReader.m

@@ -52,15 +52,20 @@
 @interface CCBFile : CCNode
 {
     CCNode* ccbFile;
+
 }
 @property (nonatomic,strong) CCNode* ccbFile;
 @end
 
 
 @interface CCBReader()
+{
+
+}
 
 @property (nonatomic, copy) NSString *currentCCBFile;
 
+
 @end
 
 
@@ -115,7 +120,7 @@ - (id) init
     animationManager.rootContainerSize = [CCDirector sharedDirector].designSize;
 
     nodeMapping = [NSMutableDictionary dictionary];
-    
+    postDeserializationUUIDFixup = [NSMutableArray array];
     return self;
 }
 
@@ -905,10 +910,12 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
     else if(type == kCCBPropTypeNodeReference)
     {
         int uuid = readIntWithSign(self, NO);
-        CCNode * mappedNode = nodeMapping[@(uuid)];
-        NSAssert(mappedNode != nil, @"CCBReader: Failed to find node UUID:%i", uuid);
-        [node setValue:mappedNode forKey:name];
-    }
+		
+		//Node references are fixed after the whole node graph is deserialized (since since the node ref may not be deserialized yet)
+		NSArray * queuedFixupTask = @[node, name, @(uuid)];
+		[postDeserializationUUIDFixup addObject:queuedFixupTask];
+		
+	}
     else if(type == kCCBPropTypeFloatCheck)
     {
         float f = readFloat(self);
@@ -939,7 +946,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
 //Either returns a CCStackEffect or the one single effect.
 -(CCEffect*)readEffects
 {
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
+
 	int numberOfEffects = readIntWithSign(self, NO);
 
 	NSMutableArray * effectsStack = [NSMutableArray array];
@@ -974,9 +981,7 @@ -(CCEffect*)readEffects
 	}
 
 	return [[CCEffectStack alloc] initWithEffects:effectsStack];
-#else
-	return nil;
-#endif
+
 }
 
 - (BOOL)isPropertyKeySettable:(NSString *)key onInstance:(id)instance
@@ -1117,6 +1122,21 @@ - (void) didLoadFromCCB
 {
 }
 
+-(void)postDeserialization
+{
+	//Post deserialization fixup.
+	for (NSArray * task in postDeserializationUUIDFixup) {
+		id node = task[0];
+		NSString * name = task[1];
+		int uuid = (int)[task[2] integerValue];
+		
+		CCNode * mappedNode = nodeMapping[@(uuid)];
+		NSAssert(mappedNode != nil, @"CCBReader: Failed to find node UUID:%i", uuid);
+		[node setValue:mappedNode forKey:name];
+
+	}
+}
+
 -(void)readJoints
 {
     int numJoints = readIntWithSign(self, NO);
@@ -1715,6 +1735,7 @@ - (CCNode*) readFileWithCleanUp:(BOOL)cleanUp actionManagers:(NSMutableDictionar
 
     CCNode* node = [self readNodeGraphParent:NULL];
     [self readJoints];
+	[self postDeserialization];
 
     [actionManagers setObject:self.animationManager forKey:[NSValue valueWithPointer:(__bridge const void *)(node)]];