diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 9e66472328..5f75b7cf14 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -164,7 +164,7 @@ public: void prepareForPhysicsSimulation(); void harvestResultsFromPhysicsSimulation(); - const QString& getCollisionSoundURL() {return _collisionSoundURL; } + const QString& getCollisionSoundURL() { return _collisionSoundURL; } void setCollisionSoundURL(const QString& url); void clearScriptableSettings(); @@ -364,9 +364,9 @@ private: glm::quat _customListenOrientation; bool _isFollowingHMD { false }; - float _followHMDAlpha{0.0f}; + float _followHMDAlpha { 0.0f }; - quint64 _lastUpdateFromHMDTime{usecTimestampNow()}; + quint64 _lastUpdateFromHMDTime { usecTimestampNow() }; AtRestDetector _hmdAtRestDetector; glm::vec3 _lastPosition; bool _lastIsMoving { false }; diff --git a/libraries/physics/src/CharacterController.cpp b/libraries/physics/src/CharacterController.cpp index 9ba22cf2db..aadf9b16ea 100644 --- a/libraries/physics/src/CharacterController.cpp +++ b/libraries/physics/src/CharacterController.cpp @@ -32,7 +32,7 @@ void CharacterController::setDynamicsWorld(btDynamicsWorld* world) { } if (world && _rigidBody) { _dynamicsWorld = world; - _pendingFlags &= ~ PENDING_FLAG_JUMP; + _pendingFlags &= ~PENDING_FLAG_JUMP; _dynamicsWorld->addRigidBody(_rigidBody, COLLISION_GROUP_MY_AVATAR, COLLISION_MASK_MY_AVATAR); _dynamicsWorld->addAction(this); //reset(_dynamicsWorld); @@ -46,7 +46,7 @@ void CharacterController::setDynamicsWorld(btDynamicsWorld* world) { _pendingFlags &= ~PENDING_FLAG_ADD_TO_SIMULATION; } } else { - _pendingFlags &= ~ PENDING_FLAG_REMOVE_FROM_SIMULATION; + _pendingFlags &= ~PENDING_FLAG_REMOVE_FROM_SIMULATION; } }