Fixing a couple of CCPhysicsShape.collisionType bugs.

Former-commit-id: 7b1f352

Author: slembcke

UnitTests/CCPhysicsTests.m

@@ -605,4 +605,8 @@ -(void)testBreakingJoints
 	XCTAssert(joint4.valid, @"");
 }
 
+// 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.
+
 @end

cocos2d/CCPhysicsShape.m

@@ -135,9 +135,17 @@ -(void)setCollisionGroup:(id)collisionGroup {
 }
 
 // TODO these need a reference to the space to intern the strings
-// Needs to be deferred?
 -(NSString *)collisionType {return _collisionType;}
--(void)setCollisionType:(NSString *)collisionType {_collisionType = [collisionType copy];}
+-(void)setCollisionType:(NSString *)collisionType
+{
+	CCPhysicsNode *physics = self.physicsNode;
+	if(physics){
+		_collisionType = [physics internString:collisionType];
+		self.shape.collisionType = _collisionType;
+	} else {
+		_collisionType = [collisionType copy];
+	}
+}
 
 -(NSArray *)collisionCategories {
 	if(_collisionCategories){
@@ -207,7 +215,7 @@ -(void)willAddToPhysicsNode:(CCPhysicsNode *)physics nonRigidTransform:(cpTransf
 	// nil the array references to save on memory.
 	// They will rarely be read back and we can easily reconstruct the array.
 	_collisionCategories = nil;
-	_collisionType = nil;
+	_collisionMask = nil;
 
 	[self rescaleShape:transform];
 }