Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop

Author: slembcke

cocos2d-ui/CCBReader/CCAnimationManager.m

@@ -171,6 +171,10 @@ - (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.easingType==kCCBKeyframeEasingInstant) {
+        duration = 0;
+    }
+    
     if ([name isEqualToString:@"rotation"]) {
         return [CCActionRotateTo actionWithDuration:duration angle:[kf1.value floatValue] simple:YES];
     } else if ([name isEqualToString:@"position"]) {
@@ -207,12 +211,12 @@ - (CCActionInterval*)actionFromKeyframe0:(CCBKeyframe*)kf0 andKeyframe1:(CCBKeyf
         return [CCActionTintTo actionWithDuration:duration color:color];
     } else if ([name isEqualToString:@"visible"]) {
         if ([kf1.value boolValue]) {
-            return [CCActionSequence actionOne:[CCActionDelay actionWithDuration:duration] two:[CCActionShow action]];
+            return [CCActionShow action];
         } else {
-            return [CCActionSequence actionOne:[CCActionDelay actionWithDuration:duration] two:[CCActionHide action]];
+            return [CCActionHide action];
         }
     } else if ([name isEqualToString:@"spriteFrame"]) {
-        return [CCActionSequence actionOne:[CCActionDelay actionWithDuration:duration] two:[CCActionSpriteFrame actionWithSpriteFrame:kf1.value]];
+        return [CCActionSpriteFrame actionWithSpriteFrame:kf1.value];
     } else {
         CCLOG(@"CCBReader: Failed to create animation for property: %@", name);
     }
@@ -356,7 +360,7 @@ - (void)runActionsForNode:(CCNode*)node sequenceProperty:(CCBSequenceProperty*)s
     if(numKeyframes<1) return;
 
     // Action Sequence Builder
-        NSMutableArray* actions = [NSMutableArray array];
+    NSMutableArray* actions = [NSMutableArray array];
     int endFrame            = startFrame+1;
 
     if(endFrame==numKeyframes || endFrame<0)
@@ -855,14 +859,13 @@ - (CCActionSequence*)createActionForNode:(CCNode*)node sequenceProperty:(CCBSequ
 
         CCActionInterval* action = [self actionFromKeyframe0:startKF andKeyframe1:endKF propertyName:seqProp.name node:node];
 
-        // Create delay to fix instant easing on non instant actions
-        if(startKF.easingType==kCCBKeyframeEasingInstant &&
-           ![seqProp.name isEqualToString:@"spriteFrame"] &&
-           ![seqProp.name isEqualToString:@"visible"]) {
-            [actions addObject:[CCActionDelay actionWithDuration:action.duration]];
-        }
-        
         if (action) {
+            
+            // 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.m

@@ -1245,6 +1245,14 @@ - (CCNode*) readNodeGraphParent:(CCNode*)parent
 
     Class class = NSClassFromString(className);
     if (!class)
+    {
+        // Class was not found. Maybe it's a Swift class?
+        // See http://stackoverflow.com/questions/24030814/swift-language-nsclassfromstring
+        NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
+        NSString *classStringName = [NSString stringWithFormat:@"_TtC%d%@%d%@", appName.length, appName, className.length, className];
+        class = NSClassFromString(classStringName);
+    }
+    if (!class)
     {
 #if DEBUG
         NSLog(@"*** [CLASS] ERROR HINT: Did you set a custom class for a CCNode? Please check if the specified class name is spelled correctly and available in your project.");

cocos2d/CCEffectRenderer.m

@@ -206,7 +206,7 @@ -(void)drawSprite:(CCSprite *)sprite withEffect:(CCEffect *)effect uniforms:(NSM
         }
         else
         {
-            BOOL inverted;
+            bool inverted;
 
             GLKMatrix4 renderTargetProjection = GLKMatrix4MakeOrtho(0.0f, _contentSize.width, 0.0f, _contentSize.height, -1024.0f, 1024.0f);
             GLKMatrix4 invRenderTargetProjection = GLKMatrix4Invert(renderTargetProjection, &inverted);