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

Merge pull request #4303 from boyu0/iss2771_physical 

[ci skip]issue #2771: physics.  rename resetForce to resetForces
This commit is contained in:
minggo 2013-11-18 00:32:06 -08:00
parent c7971bcaad 23c477f15d
commit da2158de20
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/physics/CCPhysicsBody.cpp
View File

@ -404,7 +404,7 @@ void PhysicsBody::applyForce(const Vect& force, const Point& offset)
cpBodyApplyForce(_info->getBody(), PhysicsHelper::point2cpv(force), PhysicsHelper::point2cpv(offset)); cpBodyApplyForce(_info->getBody(), PhysicsHelper::point2cpv(force), PhysicsHelper::point2cpv(offset));
} }
void PhysicsBody::resetForce() void PhysicsBody::resetForces()
{ {
cpBodyResetForces(_info->getBody()); cpBodyResetForces(_info->getBody());

2
cocos/physics/CCPhysicsBody.h
View File

@ -113,7 +113,7 @@ public:
/** Applies a immediate force to body. */ /** Applies a immediate force to body. */
virtual void applyForce(const Vect& force, const Point& offset); virtual void applyForce(const Vect& force, const Point& offset);
/** reset all the force applied to body. */ /** reset all the force applied to body. */
virtual void resetForce(); virtual void resetForces();
/** Applies a continuous force to body. */ /** Applies a continuous force to body. */
virtual void applyImpulse(const Vect& impulse); virtual void applyImpulse(const Vect& impulse);
/** Applies a continuous force to body. */ /** Applies a continuous force to body. */