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

Author: slembcke

Resources/Images/planet1.png

@@ -776,7 +776,6 @@ -(void)testBodyEachCollisionPair
 	[physicsNode onExit];
 }
 
-
 //Focusing on Position.
 -(void)testKineticBodyBasic1
 {
@@ -942,7 +941,7 @@ -(void)testKineticNodeActionsBasic1
     for(int i = 0; i < 100; i++)
 	{
 		float desired  = (float)i * 0.1f * 100.0f/10.0f + (float)i * 0.1f * 200.0f/10.0f;
-		NSLog(@"node1.position.x=  %0.2f   desired = %0.2f",body1.absolutePosition.x, desired);
+		//NSLog(@"node1.position.x=  %0.2f   desired = %0.2f",body1.absolutePosition.x, desired);
 		XCTAssertEqualWithAccuracy(body1.absolutePosition.x, desired , accuracy, @"Not in the write position");
 		[scheduler update:0.10f];
 	}
@@ -954,6 +953,156 @@ -(void)testKineticNodeActionsBasic1
 
 
 
+-(void)testApplyImpulse
+{
+	CCPhysicsNode *physics = [CCPhysicsNode node];
+	[physics onEnter];
+	
+	{
+		CCNode *node = [CCNode node];
+		[physics addChild:node];
+		
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1 andCenter:CGPointZero];
+		node.physicsBody.mass = 5;
+		
+		node.physicsBody.velocity = ccp(10, 10);
+		[node.physicsBody applyImpulse:ccp(5, 5)];
+		XCTAssert(ccpDistance(ccp(11, 11), node.physicsBody.velocity) < 1e-5, @"");
+	}{
+		CCNode *node = [CCNode node];
+		node.rotation = 90;
+		[physics addChild:node];
+		
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1 andCenter:CGPointZero];
+		node.physicsBody.mass = 5;
+		
+		node.physicsBody.velocity = ccp(10, 10);
+		[node.physicsBody applyImpulse:ccp(5, 5)];
+		XCTAssert(ccpDistance(ccp(11, 11), node.physicsBody.velocity) < 1e-5, @"");
+	}{
+		CCNode *node = [CCNode node];
+		node.position = ccp(20, 20);
+		[physics addChild:node];
+		
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1 andCenter:CGPointZero];
+		node.physicsBody.mass = 5;
+		
+		node.physicsBody.velocity = ccp(10, 10);
+		[node.physicsBody applyImpulse:ccp(5, 5) atWorldPoint:node.position];
+		XCTAssert(ccpDistance(ccp(11, 11), node.physicsBody.velocity) < 1e-5, @"");
+	}{
+		CCNode *node = [CCNode node];
+		node.position = ccp(20, 20);
+		[physics addChild:node];
+		
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1 andCenter:CGPointZero];
+		node.physicsBody.mass = 5;
+		
+		node.physicsBody.velocity = ccp(10, 10);
+		[node.physicsBody applyImpulse:ccp(5, 5) atLocalPoint:ccp(0, 0)];
+		XCTAssert(ccpDistance(ccp(11, 11), node.physicsBody.velocity) < 1e-5, @"");
+	}{
+		CCNode *node = [CCNode node];
+		node.position = ccp(20, 20);
+		node.rotation = 90;
+		[physics addChild:node];
+		
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1 andCenter:CGPointZero];
+		node.physicsBody.mass = 5;
+		
+		node.physicsBody.velocity = ccp(10, 10);
+		[node.physicsBody applyImpulse:ccp(5, 0) atLocalPoint:ccp(0, 0)];
+		XCTAssert(ccpDistance(ccp(10, 9), node.physicsBody.velocity) < 1e-5, @"");
+	}{
+		CCNode *node = [CCNode node];
+		node.position = ccp(20, 20);
+		node.rotation = 180;
+		[physics addChild:node];
+		
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1 andCenter:CGPointZero];
+		node.physicsBody.mass = 5;
+		
+		node.physicsBody.velocity = ccp(10, 10);
+		[node.physicsBody applyImpulse:ccp(5, 0) atLocalPoint:ccp(0, 1)];
+		XCTAssert(ccpDistance(ccp(9, 10), node.physicsBody.velocity) < 1e-5, @"");
+		XCTAssertEqualWithAccuracy(node.physicsBody.angularVelocity, -2, 1e-5, @"");
+	}
+	
+	[physics onExit];
+}
+
+-(void)testApplyForce
+{
+	CCPhysicsNode *physics = [CCPhysicsNode node];
+	[physics onEnter];
+	
+	{
+		CCNode *node = [CCNode node];
+		[physics addChild:node];
+		
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1 andCenter:CGPointZero];
+		node.physicsBody.mass = 5;
+		
+		[node.physicsBody applyForce:ccp(5, 5)];
+		XCTAssert(ccpDistance(ccp(5, 5), node.physicsBody.force) < 1e-5, @"");
+	}{
+		CCNode *node = [CCNode node];
+		node.rotation = 90;
+		[physics addChild:node];
+		
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1 andCenter:CGPointZero];
+		node.physicsBody.mass = 5;
+		
+		[node.physicsBody applyForce:ccp(5, 5)];
+		XCTAssert(ccpDistance(ccp(5, 5), node.physicsBody.force) < 1e-5, @"");
+	}{
+		CCNode *node = [CCNode node];
+		node.position = ccp(20, 20);
+		[physics addChild:node];
+		
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1 andCenter:CGPointZero];
+		node.physicsBody.mass = 5;
+		
+		[node.physicsBody applyForce:ccp(5, 5) atWorldPoint:node.position];
+		XCTAssert(ccpDistance(ccp(5, 5), node.physicsBody.force) < 1e-5, @"");
+	}{
+		CCNode *node = [CCNode node];
+		node.position = ccp(20, 20);
+		[physics addChild:node];
+		
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1 andCenter:CGPointZero];
+		node.physicsBody.mass = 5;
+		
+		[node.physicsBody applyForce:ccp(5, 5) atLocalPoint:ccp(0, 0)];
+		XCTAssert(ccpDistance(ccp(5, 5), node.physicsBody.force) < 1e-5, @"");
+	}{
+		CCNode *node = [CCNode node];
+		node.position = ccp(20, 20);
+		node.rotation = 90;
+		[physics addChild:node];
+		
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1 andCenter:CGPointZero];
+		node.physicsBody.mass = 5;
+		
+		[node.physicsBody applyForce:ccp(5, 0) atLocalPoint:ccp(0, 0)];
+		XCTAssert(ccpDistance(ccp(0, -5), node.physicsBody.force) < 1e-5, @"");
+	}{
+		CCNode *node = [CCNode node];
+		node.position = ccp(20, 20);
+		node.rotation = 180;
+		[physics addChild:node];
+		
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1 andCenter:CGPointZero];
+		node.physicsBody.mass = 5;
+		
+		[node.physicsBody applyForce:ccp(5, 0) atLocalPoint:ccp(0, 1)];
+		XCTAssert(ccpDistance(ccp(-5, 0), node.physicsBody.force) < 1e-5, @"");
+		XCTAssertEqualWithAccuracy(node.physicsBody.torque, -5, 1e-5, @"");
+	}
+	
+	[physics onExit];
+}
+
 // TODO
 // * Check that body and shape settings are preserved through multiple add/remove cycles and are actually applied to the cpBody.
 // * Check that changing properties before and after adding to an active physics node updates the properties correctly.

Resources/Images/sample_vertical_rect.png

@@ -7,6 +7,10 @@
 //
 
 #import <XCTest/XCTest.h>
+#import "cocos2d.h"
+#import "CCBReader.h"
+#include <mach/mach.h>
+#include <mach/mach_time.h>
 
 @interface CCReaderTest : XCTestCase
 
@@ -20,6 +24,53 @@ - (void)setUp
     // Put setup code here; it will be run once, before the first test case.
 }
 
+double machGetClockS()
+{
+    static bool init = 0 ;
+    static mach_timebase_info_data_t tbInfo ;
+    static double conversionFactor ;
+    if(!init)
+    {
+        init = 1 ;
+        // get the time base
+        mach_timebase_info( &tbInfo ) ;
+        conversionFactor = tbInfo.numer / (1e9*tbInfo.denom) ; // ns->s
+    }
+    
+    return mach_absolute_time() * conversionFactor ; // seconds
+}
+
+double machGetClockDiffS()
+{
+    static double lastTime = 0;
+    
+    double currentTime = machGetClockS() ;
+    
+    double diff = currentTime - lastTime ;
+    
+    lastTime = currentTime ; // update for next call
+    
+    return diff ; // that's your answer
+}
+
+-(void)testReaderPerformance
+{
+    NSString *filePath =[[NSBundle mainBundle] pathsForResourcesOfType:@"ccbi" inDirectory:@"Resources-shared/Tests"][0];
+    XCTAssertNotNil(filePath);
+    
+    NSData * fileData = [[NSData alloc] initWithContentsOfFile:filePath];
+    
+    CCBReader  * ccbReader = [[CCBReader alloc] init];
+    
+    machGetClockDiffS();
+    for (int i = 0; i < 100; i++)
+    {
+            [ccbReader loadWithData:fileData owner:self];
+    }
+
+    NSLog(@"TimeToRun: %0.8f", machGetClockDiffS());
+}
+
 - (void)tearDown
 {
     // Put teardown code here; it will be run once, after the last test case.

Resources/Images/sphere-23.png

@@ -1 +1 @@
-3.0.0
+3.1.0