Merge pull request #5467 from boyu0/bug4144_node_setphysicsbody

closed #4144: fix bug: Can not use Node::setPhysicsBody to reset a physics body.

cocos/2d/CCNode.cpp

@@ -1463,15 +1463,23 @@ void Node::removeAllComponents()
 #if CC_USE_PHYSICS
 void Node::setPhysicsBody(PhysicsBody* body)
 {
+    body->_node = this;
+    body->retain();
+    
     if (_physicsBody != nullptr)
     {
+        PhysicsWorld* world = _physicsBody->getWorld();
+        _physicsBody->removeFromWorld();
         _physicsBody->_node = nullptr;
         _physicsBody->release();
+        
+        if (world != nullptr)
+        {
+            world->addBody(body);
+        }
     }
     
     _physicsBody = body;
-    _physicsBody->_node = this;
-    _physicsBody->retain();
     _physicsBody->setPosition(getPosition());
     _physicsBody->setRotation(getRotation());
 }

cocos/physics/CCPhysicsWorld.cpp

@@ -692,11 +692,11 @@ void PhysicsWorld::removeBody(PhysicsBody* body)
         // set destroy param to false to keep the iterator available
         removeJoint(joint, false);
         
-        PhysicsBody* other = (joint->getBodyA() == body ? joint->getBodyB() : body);
+        PhysicsBody* other = (joint->getBodyA() == body ? joint->getBodyB() : joint->getBodyA());
         other->removeJoint(joint);
         
         // test the distraction is delaied or not
-        if (_delayRemoveJoints.size() > 0 && _delayRemoveJoints.back() == joint)
+        if (std::find(_delayRemoveJoints.rbegin(), _delayRemoveJoints.rend(), joint) != _delayRemoveJoints.rend())
         {
             joint->_destoryMark = true;
         }
@@ -775,7 +775,7 @@ void PhysicsWorld::removeJoint(PhysicsJoint* joint, bool destroy)
         }
         
         // test the distraction is delaied or not
-        if (_delayRemoveJoints.size() > 0 && _delayRemoveJoints.back() == joint)
+        if (std::find(_delayRemoveJoints.rbegin(), _delayRemoveJoints.rend(), joint) != _delayRemoveJoints.rend())
         {
             joint->_destoryMark = true;
         }
@@ -853,7 +853,7 @@ void PhysicsWorld::removeJointOrDelay(PhysicsJoint* joint)
     
     if (_info->isLocked())
     {
-        if (std::find(_delayRemoveJoints.begin(), _delayRemoveJoints.end(), joint) == _delayRemoveJoints.end())
+        if (std::find(_delayRemoveJoints.rbegin(), _delayRemoveJoints.rend(), joint) == _delayRemoveJoints.rend())
         {
             _delayRemoveJoints.push_back(joint);
             _delayDirty = true;
@@ -897,7 +897,7 @@ void PhysicsWorld::removeAllJoints(bool destroy)
             }
             
             // test the distraction is delaied or not
-            if (_delayRemoveJoints.size() > 0 && _delayRemoveJoints.back() == joint)
+            if (std::find(_delayRemoveJoints.rbegin(), _delayRemoveJoints.rend(), joint) != _delayRemoveJoints.rend())
             {
                 joint->_destoryMark = true;
             }

cocos/physics/CCPhysicsWorld.h

@@ -44,6 +44,7 @@ class PhysicsContact;
 
 typedef Point Vect;
 
+class Node;
 class Sprite;
 class Scene;
 class DrawNode;
@@ -92,9 +93,9 @@ public:
     /** Adds a joint to the physics world.*/
     virtual void addJoint(PhysicsJoint* joint);
     /** Remove a joint from physics world.*/
-    virtual void removeJoint(PhysicsJoint* joint, bool destroy);
+    virtual void removeJoint(PhysicsJoint* joint, bool destroy = true);
     /** Remove all joints from physics world.*/
-    virtual void removeAllJoints(bool destroy);
+    virtual void removeAllJoints(bool destroy = true);
     
     /** Remove a body from physics world. */
     virtual void removeBody(PhysicsBody* body);
@@ -195,6 +196,7 @@ protected:
     PhysicsWorld();
     virtual ~PhysicsWorld();
     
+    friend class Node;
     friend class Sprite;
     friend class Scene;
     friend class PhysicsBody;

tests/test-cpp/Classes/PhysicsTest/PhysicsTest.cpp

@@ -475,7 +475,18 @@ void PhysicsDemoLogoSmash::onEnter()
 std::string PhysicsDemoLogoSmash::title() const
 {
     return "Logo Smash";
-}void PhysicsDemoPyramidStack::onEnter()
+}
+
+void PhysicsDemoPyramidStack::updateOnce(float delta)
+{
+    auto ball = getChildByTag(100);
+    
+    ball->setScale(ball->getScale() * 3);
+    ball->setPhysicsBody(PhysicsBody::createCircle(30));
+    ball->getPhysicsBody()->setTag(DRAG_BODYS_TAG);
+}
+
+void PhysicsDemoPyramidStack::onEnter()
 {
     PhysicsDemo::onEnter();
     
@@ -491,10 +502,14 @@ std::string PhysicsDemoLogoSmash::title() const
     
     auto ball = Sprite::create("Images/ball.png");
     ball->setScale(1);
+    ball->setTag(100);
     ball->setPhysicsBody(PhysicsBody::createCircle(10));
+    ball->getPhysicsBody()->setTag(DRAG_BODYS_TAG);
     ball->setPosition(VisibleRect::bottom() + Point(0, 60));
     this->addChild(ball);
     
+    scheduleOnce(schedule_selector(PhysicsDemoPyramidStack::updateOnce), 3.0);
+
     for(int i=0; i<14; i++)
     {
         for(int j=0; j<=i; j++)

tests/test-cpp/Classes/PhysicsTest/PhysicsTest.h

@@ -93,6 +93,7 @@ public:
     CREATE_FUNC(PhysicsDemoPyramidStack);
 
     void onEnter() override;
+    void updateOnce(float delta);
     virtual std::string title() const override;
 };