Merge remote-tracking branch 'upstream/develop' into develop

Author: Thayer J Andrews

.gitmodules

@@ -3,9 +3,9 @@
 url=https://github.com/slembcke/Chipmunk2D.git
 [submodule "external/ogg"]
 	path = external/ogg
-	url = [email protected]:apportable/ogg.git
+url=[email protected]:spritebuilder/ogg.git
 	branch = apportable
 [submodule "external/tremor"]
 	path = external/tremor
-	url = [email protected]:apportable/tremor.git
+url=[email protected]:spritebuilder/tremor.git
 	branch = apportable

cocos2d-osx.xcodeproj/project.pbxproj

@@ -892,7 +892,45 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		571CD02E19649E22003D460C /* Platform */ = {
+		929D1B541954C28100B27340 /* Effects */ = {
+			isa = PBXGroup;
+			children = (
+				B751D2581988896D00722D93 /* CCEffectGlass.h */,
+				B751D2591988896D00722D93 /* CCEffectGlass.m */,
+				B751D25A1988896D00722D93 /* CCEffectReflection.h */,
+				B751D25B1988896D00722D93 /* CCEffectReflection.m */,
+				B751D25C1988896D00722D93 /* CCEffectUtils.h */,
+				B751D25D1988896D00722D93 /* CCEffectUtils.m */,
+				929D1B551954C2A600B27340 /* CCEffect_Private.h */,
+				929D1B561954C2A600B27340 /* CCEffect.h */,
+				929D1B571954C2A600B27340 /* CCEffect.m */,
+				929D1B581954C2A600B27340 /* CCEffectBrightness.h */,
+				929D1B591954C2A600B27340 /* CCEffectBrightness.m */,
+				929D1B5A1954C2A600B27340 /* CCEffectContrast.h */,
+				929D1B5B1954C2A600B27340 /* CCEffectContrast.m */,
+				92D1343A1954FC7A003833C4 /* CCEffectBlur.h */,
+				929D1B5C1954C2A600B27340 /* CCEffectBlur.m */,
+				9D23869A196F0BC4001B792B /* CCEffectHue.h */,
+				9D23869B196F0BC4001B792B /* CCEffectHue.m */,
+				929D1B5E1954C2A600B27340 /* CCEffectNode.h */,
+				929D1B5F1954C2A600B27340 /* CCEffectNode.m */,
+				929D1B601954C2A600B27340 /* CCEffectPixellate.h */,
+				929D1B611954C2A600B27340 /* CCEffectPixellate.m */,
+				929D1B621954C2A600B27340 /* CCEffectRenderer.h */,
+				929D1B631954C2A600B27340 /* CCEffectRenderer.m */,
+				9DDFEF6819635F0600CCE3DF /* CCEffectRefraction.h */,
+				9DDFEF6919635F0600CCE3DF /* CCEffectRefraction.m */,
+				929D1B641954C2A600B27340 /* CCEffectSaturation.h */,
+				929D1B651954C2A600B27340 /* CCEffectSaturation.m */,
+				929D1B661954C2A600B27340 /* CCEffectStack_Private.h */,
+				92D134361954FC7A003833C4 /* CCEffectStackProtocol.h */,
+				929D1B671954C2A600B27340 /* CCEffectStack.h */,
+				929D1B681954C2A600B27340 /* CCEffectStack.m */,
+			);
+			name = Effects;
+			sourceTree = "<group>";
+		};
+	    571CD02E19649E22003D460C /* Platform */ = {
 			isa = PBXGroup;
 			children = (
 				571CD02F19649E22003D460C /* Android */,

cocos2d-ui/CCBReader/CCAnimationManager.m

@@ -170,7 +170,7 @@ - (CCBSequence*)sequenceFromSequenceId:(int)seqId {
 
 - (CCActionInterval*)actionFromKeyframe0:(CCBKeyframe*)kf0 andKeyframe1:(CCBKeyframe*)kf1 propertyName:(NSString*)name node:(CCNode*)node {
     float duration = kf1.time - kf0.time;
-
+    
     if(kf0 && kf0.easingType==kCCBKeyframeEasingInstant) {
         duration = 0;
     }
@@ -515,13 +515,13 @@ - (void)runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuratio
                     }
                 }
             }
-           
+        
         }
 
 
     }
 
-	    _paused = NO;
+    _paused = NO;
 }
 
 - (void)runAnimationsForSequenceNamed:(NSString*)name tweenDuration:(float)tweenDuration {
@@ -856,8 +856,8 @@ - (CCActionSequence*)createActionForNode:(CCNode*)node sequenceProperty:(CCBSequ
             // Instant
             if(startKF.easingType==kCCBKeyframeEasingInstant) {
                 [actions addObject:[CCActionDelay actionWithDuration:endKF.time-startKF.time]];
-        }
-        
+            }
+            
             // Apply Easing
             action = [self easeAction:action easingType:startKF.easingType easingOpt:startKF.easingOpt];
             [actions addObject:action];

cocos2d-ui/CCBReader/CCBReader.h

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

cocos2d-ui/CCBReader/CCBReader.m

@@ -37,6 +37,7 @@
 #import "CCDirector_Private.h"
 #import "CCPhysics+ObjectiveChipmunk.h"
 #import "CCAnimationManager_Private.h"
+#import "CCEffectStack.h"
 
 #ifdef CCB_ENABLE_UNZIP
 #import "SSZipArchive.h"
@@ -51,15 +52,20 @@
 @interface CCBFile : CCNode
 {
     CCNode* ccbFile;
+
 }
 @property (nonatomic,strong) CCNode* ccbFile;
 @end
 
 
 @interface CCBReader()
+{
+
+}
 
 @property (nonatomic, copy) NSString *currentCCBFile;
 
+
 @end
 
 
@@ -122,7 +128,7 @@ - (id) init
     animationManager.rootContainerSize = [CCDirector sharedDirector].designSize;
 
     nodeMapping = [NSMutableDictionary dictionary];
-    
+    postDeserializationUUIDFixup = [NSMutableArray array];
     return self;
 }
 
@@ -912,10 +918,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);
@@ -927,12 +935,71 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
             [node setValue:@(f) forKey:name];
         }
     }
+	else if(type == kCCBPropTypeEffects)
+	{
+		CCEffect * effect  = [self readEffects];
+		
+		if(effect)
+		{
+		//Hmmm..... Force it to write to @"effect" property.
+		[node setValue:effect forKey:@"effect"];
+		}
+				
+	}
     else
     {
         NSAssert(false, @"[PROPERTY] %@ - Failed to read property type %d, node class name: \"%@\", name: \"%@\", in ccb file: \"%@\"", name, type, [node class], [node name], _currentCCBFile);
     }
 }
 
+
+
+//Either returns a CCStackEffect or the one single effect.
+-(CCEffect*)readEffects
+{
+
+	int numberOfEffects = readIntWithSign(self, NO);
+	
+	if(numberOfEffects == 0)
+	{
+		return nil;
+	}
+	
+	NSMutableArray * effectsStack = [NSMutableArray array];
+	
+	for (int i = 0; i < numberOfEffects; i++) {
+		NSString * className = [self readCachedString];
+		
+		Class nodeClass = NSClassFromString(className);
+		if (nodeClass == nil)
+		{
+			NSAssert(nil, @"CCBReader: Could not create class named: %@", className);
+			return nil;
+		}
+		
+		CCEffect* effect = [[nodeClass alloc] init];
+		
+		int propCount = readIntWithSign(self,NO);
+		
+		for(int propIndex = 0; propIndex < propCount; propIndex++)
+		{
+			//Just lie and let the property reader do its work.
+			[self readPropertyForNode:(CCNode*)effect parent:nil isExtraProp:NO];
+			
+		}
+		
+		if(numberOfEffects == 1)
+		{
+			return effect;
+		}
+		[effectsStack addObject:effect];
+		
+	}
+	
+	return [[CCEffectStack alloc] initWithArray:effectsStack];
+
+}
+
 - (BOOL)isPropertyKeySettable:(NSString *)key onInstance:(id)instance
 {
     if (!key || !instance || ([key length] == 0))
@@ -1071,6 +1138,24 @@ - (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];
+		
+		if(uuid == 0)
+			return;
+		
+		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);
@@ -1675,6 +1760,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)]];
 

cocos2d-ui/CCBReader/CCBReader_Private.h

@@ -42,6 +42,7 @@ enum {
     kCCBPropTypeColor4,
     kCCBPropTypeNodeReference,
     kCCBPropTypeFloatCheck,
+	kCCBPropTypeEffects,
 
 };
 

cocos2d/CCPhysicsBody.m

@@ -272,6 +272,12 @@ -(void)setType:(CCPhysicsBodyType)type
 		// Chipmunk body type cannot be changed from within a callback, need to make this safe.
 		[space addPostStepBlock:^{_body.type = ToChipmunkBodyType[type];} key:self];
 	} else {
+		
+		if(self.type != type && self.type == CCPhysicsBodyTypeKinematic)
+		{
+			[self.node.physicsNode.kineticNodes removeObject:self.node];
+		}
+		
 		_body.type = ToChipmunkBodyType[type];
 	}
 }