Merge pull request #814 from jtwigg/develop

fix debug define & animation Divergence.

Author: vlidholt

UnitTests/CCAnimationTest.m

@@ -8,9 +8,12 @@
 
 #import <XCTest/XCTest.h>
 #import "cocos2d.h"
-#import "CCBAnimationManager.h"
+#import "CCAnimationManager.h"
 #import "CCBSequence.h"
 #import "CCBKeyframe.h"
+#import "CCAnimationManager_Private.h"
+
+#define NUM_ELEMENTS(array) (sizeof(array)/sizeof(array[0]))
 
 #define AssertNotEqualWithAccuracy(a1,a2,accuracy,format...)\
 {\
@@ -51,7 +54,7 @@ - (void)tearDown
 
 - (void)testSmallKeyframesTest
 {
-	CCBAnimationManager * animationManager = [[CCBAnimationManager alloc] init];
+	CCAnimationManager * animationManager = [[CCAnimationManager alloc] init];
 	CCNode * node = [[CCNode alloc] init];
 	node.name = @"testNode";
 	node.position = ccp(0.0f,0.0f);
@@ -98,7 +101,6 @@ - (void)testSmallKeyframesTest
 	[seqs setObject:seqNodeProps forKey:[NSNumber numberWithInt:seq.sequenceId]];
 
 	[animationManager addNode:node andSequences:seqs];
-	
 	[animationManager runAnimationsForSequenceId:seq.sequenceId tweenDuration:0];
 
 	CGFloat accuracy = 0.01f;
@@ -132,4 +134,139 @@ - (void)testSmallKeyframesTest
 	}
 }
 
+struct PositionKeyframes
+{
+	float   time;
+	CGPoint position;
+};
+
+NSDictionary * createPositionSequencePropery(struct PositionKeyframes * keyframes, int count)
+{
+	
+	const int kSequencerID = 0; //for now;
+	
+	CCBSequenceProperty* seqProp = [[CCBSequenceProperty alloc] init];
+	
+	seqProp.name = @"position";
+	seqProp.type = 0;
+	
+	
+	for (int k = 0; k < count; k++)
+	{
+		CCBKeyframe* keyframe = [[CCBKeyframe alloc] init];
+		keyframe.time = keyframes[k].time;
+		
+		keyframe.easingType = kCCBKeyframeEasingLinear;
+		keyframe.easingOpt = 0;
+		keyframe.value = @[@(keyframes[k].position.x),@(keyframes[k].position.y)];
+		
+		[seqProp.keyframes addObject:keyframe];
+	}
+
+	NSMutableDictionary* seqNodeProps = [NSMutableDictionary dictionary];
+	[seqNodeProps setObject:seqProp forKey:seqProp.name];
+	
+	NSMutableDictionary* seqs = [NSMutableDictionary dictionary];
+	[seqs setObject:seqNodeProps forKey:[NSNumber numberWithInt:kSequencerID]];
+	
+	return seqs;
+}
+
+- (void)testAnimationSync
+{
+	CCAnimationManager * animationManager = [[CCAnimationManager alloc] init];
+	CCBSequence* seq = [[CCBSequence alloc] init];
+	seq.duration = 4.0f;
+	seq.name = @"TestSequence";
+	seq.sequenceId = 0;
+	seq.chainedSequenceId = 0;
+	[animationManager.sequences addObject:seq];
+	
+	/////////////////////////////////////////////
+	
+	CCNode * nodeA = [[CCNode alloc] init];
+	nodeA.name = @"testA";
+	nodeA.position = ccp(0.0f,0.0f);
+	
+	struct PositionKeyframes  positionsA[] =
+		{{0.0f,0.0f,0.0f},
+		{1.0f,100.0f,0.0f},
+		{3.0f,100.0f,0.0f},
+		{4.0f,0.0f,0.0f}};
+		
+				
+	[animationManager addNode:nodeA andSequences:createPositionSequencePropery(positionsA, NUM_ELEMENTS(positionsA))];
+	
+	/////////////////////////////////////////////
+	
+	CCNode * nodeB = [[CCNode alloc] init];
+	nodeB.name = @"testB";
+	nodeB.position = ccp(0.0f,0.0f);
+	
+	struct PositionKeyframes  positionsB[] =
+		{{0.0f,0.0f,0.0f},
+		 {1.0f,0.0f,0.0f},
+		{2.0f,100.0f,0.0f},
+		{3.0f,100.0f,0.0f},
+		{4.0f,0.0f,0.0f}};
+	
+	[animationManager addNode:nodeB andSequences:createPositionSequencePropery(positionsB, NUM_ELEMENTS(positionsB))];
+
+
+	/////////////////////////////////////////////
+	
+	
+	CCNode * nodeC = [[CCNode alloc] init];
+	nodeC.name = @"testC";
+	nodeC.position = ccp(0.0f,0.0f);
+	
+	struct PositionKeyframes  positionsC[] =
+		{	{0.0f,0.0f,0.0f},
+			{2.0f,0.0f,0.0f},
+			{3.0f,100.0f,0.0f},
+			{4.0f,0.0f,0.0f}};
+		
+	[animationManager addNode:nodeC andSequences:createPositionSequencePropery(positionsC, NUM_ELEMENTS(positionsC))];
+	
+	/////////////////////////////////////////////
+	
+	[animationManager runAnimationsForSequenceId:seq.sequenceId tweenDuration:0];
+	
+	
+	const float kDelta = 0.1f;//100ms;
+	const CGFloat kAccuracy = 0.01f;
+	
+	float timeIntoSeq = 0.0f;
+	float elapsed = 0.0f;
+	
+	while(elapsed <= seq.duration * 10)
+	{
+		timeIntoSeq = fmod(elapsed, seq.duration);
+		[animationManager update:kDelta];
+		
+		elapsed += kDelta;
+		
+		timeIntoSeq = fmod(elapsed, seq.duration);
+		
+		if(timeIntoSeq >= 3.0f)
+		{
+			//All final translations go from x=100 -> x=0 over 1 second.
+			float perentageIntroSyncedTranlation = 1.0f - (seq.duration - timeIntoSeq);
+			float desiredXCoord = (1.0f - perentageIntroSyncedTranlation) * 100.0f;
+			
+			
+			XCTAssertTrue(fabsf(nodeA.position.x - nodeB.position.x) < kAccuracy, @"They should all equal each other");
+			
+			XCTAssertTrue(fabsf(nodeA.position.x - nodeC.position.x) < kAccuracy, @"They should all equal each other");
+			
+			XCTAssertTrue(fabsf(nodeA.position.x - desiredXCoord) < kAccuracy, @"They should all equal each desiredXCoord: XPos:%0.2f DesiredPos:%0.2f elapsed:%0.2f", nodeA.position.x,desiredXCoord, elapsed);
+			
+		}
+
+	}
+	
+}
+
+
+
 @end

cocos2d-ui/CCBReader/CCAnimationManager.m

@@ -81,7 +81,26 @@ - (CGSize)containerSize:(CCNode*)node {
     }
 }
 
-- (void)addNode:(CCNode*)node andSequences:(NSDictionary*)seq {
+- (void)addNode:(CCNode*)node andSequences:(NSDictionary*)seq
+{
+#ifdef DEBUG
+	//Sanity check sequences;
+	
+	for (NSMutableDictionary* seqNodeProps in seq.allValues) {
+		
+		for (CCBSequenceProperty* seqProp in seqNodeProps.allValues)
+		{
+			if(seqProp.keyframes.count > 0)
+			{
+				CCBKeyframe * keyFrameZero = seqProp.keyframes[0];
+				NSAssert(keyFrameZero.time == 0.0f, @"The first keyframe should always be at time Zero.");
+			}
+			
+		}
+	}
+	
+#endif
+	
     NSValue* nodePtr = [NSValue valueWithPointer:(__bridge const void *)(node)];
     [_nodeSequences setObject:seq forKey:nodePtr];
 }
@@ -441,6 +460,12 @@ - (void)runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuratio
 
     _paused = YES;
     [self clearAllActions];
+	
+	// Set the running scene
+    _runningSequence      = [self sequenceFromSequenceId:seqId];
+    _runningSequence.time = 0.0f;
+	
+	[self addSequenceCallBacks:seqId tweenDuration:tweenDuration startTime:0];
 
     // Contains all Sequence Propertys / Keyframe
     for (NSValue* nodePtr in _nodeSequences) {
@@ -484,12 +509,6 @@ - (void)runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuratio
 
     }
 
-    [self addSequenceCallBacks:seqId tweenDuration:tweenDuration startTime:0];
-    
-    // Set the running scene
-    _runningSequence      = [self sequenceFromSequenceId:seqId];
-    _runningSequence.time = 0.0f;
-    
     _paused = NO;
 }
 
@@ -545,6 +564,8 @@ - (void)sequenceCompleted {
         _lastSequence              = _runningSequence;
     }
 
+	float overhang = _runningSequence.time - _runningSequence.duration;
+	
     // Play next sequence
     int nextSeqId = _runningSequence.chainedSequenceId;
 
@@ -562,6 +583,8 @@ - (void)sequenceCompleted {
     // Run next sequence if callbacks did not start a new sequence
     if (_runningSequence == NULL && nextSeqId != -1) {
         [self runAnimationsForSequenceId:nextSeqId tweenDuration:0];
+		[self updateInternal:0];		//Update initially one frame.
+		[self updateInternal:overhang]; //More frame forward.
     }
 }
 
@@ -856,6 +879,8 @@ - (void)updateInternal:(CCTime)delta {
         return;
     }
 
+    _runningSequence.time+=step;
+	
     if(_currentActions.count==0) return;
 
     CCAction *action;
@@ -869,7 +894,7 @@ - (void)updateInternal:(CCTime)delta {
         }
     }
 
-    _runningSequence.time+=step;
+
 }
 
 - (void)clearAllActions {

cocos2d-ui/CCBReader/CCBKeyframe.h

@@ -27,7 +27,7 @@
 
 @class CCActionSequence;
 
-@interface CCBKeyframe : NSObject
+@interface CCBKeyframe : NSObject <NSCopying>
 
 @property (nonatomic,strong) id value;
 @property (nonatomic,assign) float time;

cocos2d-ui/CCBReader/CCBKeyframe.m

@@ -49,5 +49,14 @@ - (NSString *) description {
     return description;
 }
 
+- (id)copyWithZone:(NSZone *)zone
+{
+	CCBKeyframe * copyKeyframe = [[self class] allocWithZone:zone];
+	copyKeyframe->_value = self->_value;
+	copyKeyframe->_time = self->_time;
+	copyKeyframe->_easingType = self->_easingType;
+	copyKeyframe->_easingOpt = self->_easingOpt;
 
+	return copyKeyframe;
+}
 @end

cocos2d-ui/CCBReader/CCBReader.m

@@ -1288,6 +1288,13 @@ - (CCNode*) readNodeGraphParent:(CCNode*)parent
             {
                 CCBKeyframe* keyframe = [self readKeyframeOfType:seqProp.type];
 
+				if(k==0 && keyframe.time > 0.0f)
+				{
+					CCBKeyframe * copyKeyframe = [keyframe copy];
+					copyKeyframe.time = 0.0f;
+					[seqProp.keyframes addObject:copyKeyframe];
+				}
+                
                 [seqProp.keyframes addObject:keyframe];
             }
 

cocos2d/CCPhysicsBody.m

@@ -531,7 +531,7 @@ -(void)trackParentTransformations:(CCPhysicsNode *)physics
             [node addObserver:self forKeyPath:kDependantProperties[i] options:NSKeyValueObservingOptionNew context:nil];
         }
 
-#if DEBUG
+#ifdef DEBUG
         for (int i = 0; i < sizeof(kRestrictedProperties)/sizeof(kRestrictedProperties[0]); i++)
         {
             [node addObserver:self forKeyPath:kRestrictedProperties[i] options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];