Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15066 from TheCodez/patch-2 

setPhysicsBody can be called multiple times again
This commit is contained in:
minggo 2016-04-21 09:40:28 +08:00
parent ebf558ae23 afdd600045
commit b0ae128ec3
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cocos/2d/CCNode.h
View File

@ -38,6 +38,10 @@
#include "2d/CCComponentContainer.h"
#include "2d/CCComponent.h"
#if CC_USE_PHYSICS
#include "physics/CCPhysicsBody.h"
#endif
NS_CC_BEGIN
class GridBase;
@ -1940,9 +1944,9 @@ protected:
ComponentContainer *_componentContainer; ///< Dictionary of components
// opacity controls
GLubyte _displayedOpacity;
GLubyte _displayedOpacity;
GLubyte _realOpacity;
Color3B _displayedColor;
Color3B _displayedColor;
Color3B _realColor;
bool _cascadeColorEnabled;
bool _cascadeOpacityEnabled;
@ -1961,8 +1965,13 @@ protected:
#if CC_USE_PHYSICS
PhysicsBody* _physicsBody;
public:
void setPhysicsBody(Component* physicsBody)
{
void setPhysicsBody(PhysicsBody* physicsBody)
{
if (_physicsBody != nullptr)
{
removeComponent(_physicsBody);
}
addComponent(physicsBody);
}
PhysicsBody* getPhysicsBody() const { return _physicsBody; }