Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-15 21:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix indentation, move an early exit to earlier

Browse source
This commit is contained in:
Seth Alves 2016-05-06 10:06:51 -07:00
parent 71738d4841
commit f80333ee9e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/physics/src/ObjectActionSpring.cpp
View file

@ -49,6 +49,11 @@ bool ObjectActionSpring::getTarget(float deltaTimeStep, glm::quat& rotation, glm
}
bool ObjectActionSpring::prepareForSpringUpdate(btScalar deltaTimeStep) {
auto ownerEntity = _ownerEntity.lock();
if (!ownerEntity) {
return false;
}
glm::quat rotation;
glm::vec3 position;
glm::vec3 linearVelocity;
@ -57,12 +62,7 @@ bool ObjectActionSpring::prepareForSpringUpdate(btScalar deltaTimeStep) {
bool valid = false;
int springCount = 0;
auto ownerEntity = _ownerEntity.lock();
if (!ownerEntity) {
return false;
}
QList<EntityActionPointer> springDerivedActions;
QList<EntityActionPointer> springDerivedActions;
springDerivedActions.append(ownerEntity->getActionsOfType(ACTION_TYPE_SPRING));
springDerivedActions.append(ownerEntity->getActionsOfType(ACTION_TYPE_HOLD));