Fix and unit tests for CCPhysicsBody.allowsRotation

Former-commit-id: ef6d7e7

Author: slembcke

UnitTests/CCPhysicsTests.m

@@ -395,6 +395,87 @@ -(void)testAffectedByGravity
 	XCTAssertTrue(node2.position.y == 0.0, @"");
 }
 
+-(void)testAllowsRotation
+{
+	CCPhysicsNode *physicsNode = [CCPhysicsNode node];
+	[physicsNode onEnter];
+	
+	{
+		// Regular body.
+		CCNode *node = [CCNode node];
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1.0 andCenter:CGPointZero];
+		XCTAssert(node.physicsBody.allowsRotation == YES, @"");
+		
+		[physicsNode addChild:node];
+		XCTAssert(node.physicsBody.allowsRotation == YES, @"");
+		
+		XCTAssert(node.physicsBody.body.moment < INFINITY, @"");
+	}{
+		// Set before adding.
+		CCNode *node = [CCNode node];
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1.0 andCenter:CGPointZero];
+		node.physicsBody.allowsRotation = NO;
+		XCTAssert(node.physicsBody.allowsRotation == NO, @"");
+		
+		[physicsNode addChild:node];
+		XCTAssert(node.physicsBody.allowsRotation == NO, @"");
+		
+		XCTAssert(node.physicsBody.body.moment == INFINITY, @"");
+	}{
+		// Set after adding.
+		CCNode *node = [CCNode node];
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1.0 andCenter:CGPointZero];
+		XCTAssert(node.physicsBody.allowsRotation == YES, @"");
+		
+		[physicsNode addChild:node];
+		XCTAssert(node.physicsBody.allowsRotation == YES, @"");
+		node.physicsBody.allowsRotation = NO;
+		XCTAssert(node.physicsBody.allowsRotation == NO, @"");
+		
+		XCTAssert(node.physicsBody.body.moment == INFINITY, @"");
+	}{
+		// Set and reverted before adding.
+		CCNode *node = [CCNode node];
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1.0 andCenter:CGPointZero];
+		node.physicsBody.allowsRotation = NO;
+		XCTAssert(node.physicsBody.allowsRotation == NO, @"");
+		node.physicsBody.allowsRotation = YES;
+		XCTAssert(node.physicsBody.allowsRotation == YES, @"");
+		
+		[physicsNode addChild:node];
+		XCTAssert(node.physicsBody.allowsRotation == YES, @"");
+		
+		XCTAssert(node.physicsBody.body.moment < INFINITY, @"");
+	}{
+		// Set before and reverted after adding.
+		CCNode *node = [CCNode node];
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1.0 andCenter:CGPointZero];
+		node.physicsBody.allowsRotation = NO;
+		XCTAssert(node.physicsBody.allowsRotation == NO, @"");
+		
+		[physicsNode addChild:node];
+		XCTAssert(node.physicsBody.allowsRotation == NO, @"");
+		node.physicsBody.allowsRotation = YES;
+		XCTAssert(node.physicsBody.allowsRotation == YES, @"");
+		
+		XCTAssert(node.physicsBody.body.moment < INFINITY, @"");
+	}{
+		// Set reverted after adding.
+		CCNode *node = [CCNode node];
+		node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1.0 andCenter:CGPointZero];
+		XCTAssert(node.physicsBody.allowsRotation == YES, @"");
+		
+		[physicsNode addChild:node];
+		XCTAssert(node.physicsBody.allowsRotation == YES, @"");
+		node.physicsBody.allowsRotation = NO;
+		XCTAssert(node.physicsBody.allowsRotation == NO, @"");
+		node.physicsBody.allowsRotation = YES;
+		XCTAssert(node.physicsBody.allowsRotation == YES, @"");
+		
+		XCTAssert(node.physicsBody.body.moment < INFINITY, @"");
+	}
+}
+
 -(void)testBodyType
 {
 	CGPoint points[3] = {};

cocos2d/CCNode.m

@@ -973,6 +973,7 @@ -(void)setupPhysicsBody:(CCPhysicsBody *)physicsBody
 		cpTransform nonRigid = self.nonRigidTransform;
 		[_physicsBody willAddToPhysicsNode:physics nonRigidTransform:nonRigid];
 		[physics.space smartAdd:physicsBody];
+		[_physicsBody didAddToPhysicsNode:physics];
 
 		NSArray *joints = physicsBody.joints;
 		for(NSUInteger i=0, count=joints.count; i<count; i++){

cocos2d/CCPhysicsBody.m

@@ -42,6 +42,7 @@ @implementation CCPhysicsBody
 	NSMutableArray *_chipmunkObjects;
 
 	BOOL _affectedByGravity;
+	BOOL _allowsRotation;
 }
 
 //MARK: Constructors:
@@ -53,6 +54,7 @@ -(id)initWithShapeList:(CCPhysicsShape *)shapeList
 		_body.userData = self;
 
 		_affectedByGravity = YES;
+		_allowsRotation = YES;
 
 		_chipmunkObjects = [NSMutableArray arrayWithCapacity:2];
 		[_chipmunkObjects addObject:_body];
@@ -217,7 +219,7 @@ -(void)setAffectedByGravity:(BOOL)affectedByGravity
 
 -(BOOL)allowsRotation {
 	if(self.type == CCPhysicsBodyTypeDynamic){
-		return (_body.moment < INFINITY);
+		return _allowsRotation;
 	} else {
 		// The allowsRotation property is only applicable to dynamic bodies.
 		return NO;
@@ -236,6 +238,8 @@ -(void)setAllowsRotation:(BOOL)allowsRotation
 			_body.angularVelocity = 0.0;
 		}
 	}
+	
+	_allowsRotation = allowsRotation;
 }
 
 static CCPhysicsBodyType ToCocosBodyType[] = {CCPhysicsBodyTypeDynamic, CCPhysicsBodyTypeStatic, CCPhysicsBodyTypeStatic};