Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 22:16:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move one-liner isEnabled() to header

Browse source
This commit is contained in:
Andrew Meadows 2015-04-27 09:54:58 -07:00
parent 80d3f35b2e
commit 7a222dff1d
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/physics/src/DynamicCharacterController.cpp
View file

@ -257,10 +257,6 @@ void DynamicCharacterController::setEnabled(bool enabled) {
} }
} }
bool DynamicCharacterController::isEnabled() const {
return _enabled && _dynamicsWorld;
}
void DynamicCharacterController::setDynamicsWorld(btDynamicsWorld* world) { void DynamicCharacterController::setDynamicsWorld(btDynamicsWorld* world) {
if (_dynamicsWorld != world) { if (_dynamicsWorld != world) {
if (_dynamicsWorld) { if (_dynamicsWorld) {

3
libraries/physics/src/DynamicCharacterController.h
View file

@ -78,7 +78,8 @@ public:
bool needsRemoval() const; bool needsRemoval() const;
bool needsAddition() const; bool needsAddition() const;
void setEnabled(bool enabled); void setEnabled(bool enabled);
bool isEnabled() const; bool isEnabled() const { return _enabled && _dynamicsWorld; }
void setDynamicsWorld(btDynamicsWorld* world); void setDynamicsWorld(btDynamicsWorld* world);
void setLocalBoundingBox(const glm::vec3& corner, const glm::vec3& scale); void setLocalBoundingBox(const glm::vec3& corner, const glm::vec3& scale);