Making CCPhysicsBody.type automatically deferred in a collision callback.

Former-commit-id: 5f81023

Author: slembcke

UnitTests/CCPhysicsTests.m

@@ -12,7 +12,7 @@
 #import "CCPhysics+ObjectiveChipmunk.h"
 
 
-@interface CCPhysicsTests : XCTestCase
+@interface CCPhysicsTests : XCTestCase <CCPhysicsCollisionDelegate>
 
 @end
 
@@ -378,6 +378,8 @@ -(void)testDynamicAnchorPoint
 
 	node.rotation = 90;
 	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	
+	[physicsNode onExit];
 }
 
 -(void)testStaticAnchorPoint
@@ -399,6 +401,8 @@ -(void)testStaticAnchorPoint
 
 	node.rotation = 90;
 	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	
+	[physicsNode onExit];
 }
 
 -(void)testCollisionGroups
@@ -428,6 +432,8 @@ -(void)testCollisionGroups
 	// Both nodes should be at (0, 0)
 	XCTAssertTrue(CGPointEqualToPoint(node1.position, CGPointZero) , @"");
 	XCTAssertTrue(CGPointEqualToPoint(node2.position, CGPointZero) , @"");
+	
+	[physicsNode onExit];
 }
 
 -(void)testAffectedByGravity
@@ -461,6 +467,8 @@ -(void)testAffectedByGravity
 
 	// Node2 should stay at (0, 0)
 	XCTAssertTrue(node2.position.y == 0.0, @"");
+	
+	[physicsNode onExit];
 }
 
 -(void)testAllowsRotation
@@ -542,6 +550,8 @@ -(void)testAllowsRotation
 
 		XCTAssert(node.physicsBody.body.moment < INFINITY, @"");
 	}
+	
+	[physicsNode onExit];
 }
 
 -(void)testBodyType
@@ -671,6 +681,50 @@ -(void)testBreakingJoints
 	XCTAssert(!joint2.valid, @"");
 	XCTAssert(joint3.valid, @"");
 	XCTAssert(joint4.valid, @"");
+	
+	[physics onExit];
+}
+
+-(BOOL)ccPhysicsCollisionBegin:(CCPhysicsCollisionPair *)pair theStaticOne:(CCNode *)nodeA theDynamicOne:(CCNode *)nodeB
+{
+	nodeB.physicsBody.type = CCPhysicsBodyTypeStatic;
+	
+	// TODO not sure if we should hide the deferred nature or not... Hrm.
+	XCTAssertEqual(nodeB.physicsBody.type, CCPhysicsBodyTypeDynamic, @"");
+	
+	return FALSE;
+}
+
+-(void)testBodyTypeCollisions
+{
+	CCPhysicsNode *physicsNode = [CCPhysicsNode node];
+	physicsNode.collisionDelegate = self;
+	physicsNode.gravity = ccp(0, -100);
+	
+	CCNode *node1 = [CCNode node];
+	node1.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1.0 andCenter:CGPointZero];
+	node1.physicsBody.type = CCPhysicsBodyTypeStatic;
+	node1.physicsBody.collisionType = @"theStaticOne";
+	[physicsNode addChild:node1];
+	
+	CCNode *node2 = [CCNode node];
+	node2.position = ccp(0, 10);
+	node2.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1.0 andCenter:CGPointZero];
+	node2.physicsBody.type = CCPhysicsBodyTypeDynamic;
+	node2.physicsBody.collisionType = @"theDynamicOne";
+	[physicsNode addChild:node2];
+	
+	// Force entering the scene to set up the physics objects.
+	[physicsNode onEnter];
+	
+	// Step the physics for a while.
+	for(int i=0; i<100; i++){
+		[physicsNode fixedUpdate:1.0/100.0];
+	}
+	
+	XCTAssertEqual(node2.physicsBody.type, CCPhysicsBodyTypeStatic, @"");
+	
+	[physicsNode onExit];
 }
 
 // TODO

cocos2d/CCPhysicsBody.m

@@ -246,7 +246,16 @@ -(void)setAllowsRotation:(BOOL)allowsRotation
 static cpBodyType ToChipmunkBodyType[] = {CP_BODY_TYPE_DYNAMIC, /*CP_BODY_TYPE_KINEMATIC,*/ CP_BODY_TYPE_STATIC};
 
 -(CCPhysicsBodyType)type {return ToCocosBodyType[_body.type];}
--(void)setType:(CCPhysicsBodyType)type {_body.type = ToChipmunkBodyType[type];}
+-(void)setType:(CCPhysicsBodyType)type
+{
+	ChipmunkSpace *space = self.physicsNode.space;
+	if(space && cpSpaceIsLocked(space.space)){
+		// Chipmunk body type cannot be changed from within a callback, need to make this safe.
+		[space addPostStepBlock:^{_body.type = ToChipmunkBodyType[type];} key:self];
+	} else {
+		_body.type = ToChipmunkBodyType[type];
+	}
+}
 
 //MARK: Collision and Contact: