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

fix whitespace

Browse source
This commit is contained in:
Andrew Meadows 2015-10-28 09:42:55 -07:00
parent c9cd336400
commit afec2a9771
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/avatar/MyAvatar.h
View file

@ -164,7 +164,7 @@ public:
void prepareForPhysicsSimulation(); void prepareForPhysicsSimulation();
void harvestResultsFromPhysicsSimulation(); void harvestResultsFromPhysicsSimulation();
const QString& getCollisionSoundURL() {return _collisionSoundURL; } const QString& getCollisionSoundURL() { return _collisionSoundURL; }
void setCollisionSoundURL(const QString& url); void setCollisionSoundURL(const QString& url);
void clearScriptableSettings(); void clearScriptableSettings();
@ -364,9 +364,9 @@ private:
glm::quat _customListenOrientation; glm::quat _customListenOrientation;
bool _isFollowingHMD { false }; bool _isFollowingHMD { false };
float _followHMDAlpha{0.0f}; float _followHMDAlpha { 0.0f };
quint64 _lastUpdateFromHMDTime{usecTimestampNow()}; quint64 _lastUpdateFromHMDTime { usecTimestampNow() };
AtRestDetector _hmdAtRestDetector; AtRestDetector _hmdAtRestDetector;
glm::vec3 _lastPosition; glm::vec3 _lastPosition;
bool _lastIsMoving { false }; bool _lastIsMoving { false };

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

@ -32,7 +32,7 @@ void CharacterController::setDynamicsWorld(btDynamicsWorld* world) {
} }
if (world && _rigidBody) { if (world && _rigidBody) {
_dynamicsWorld = world; _dynamicsWorld = world;
_pendingFlags &= ~ PENDING_FLAG_JUMP; _pendingFlags &= ~PENDING_FLAG_JUMP;
_dynamicsWorld->addRigidBody(_rigidBody, COLLISION_GROUP_MY_AVATAR, COLLISION_MASK_MY_AVATAR); _dynamicsWorld->addRigidBody(_rigidBody, COLLISION_GROUP_MY_AVATAR, COLLISION_MASK_MY_AVATAR);
_dynamicsWorld->addAction(this); _dynamicsWorld->addAction(this);
//reset(_dynamicsWorld); //reset(_dynamicsWorld);
@ -46,7 +46,7 @@ void CharacterController::setDynamicsWorld(btDynamicsWorld* world) {
_pendingFlags &= ~PENDING_FLAG_ADD_TO_SIMULATION; _pendingFlags &= ~PENDING_FLAG_ADD_TO_SIMULATION;
} }
} else { } else {
_pendingFlags &= ~ PENDING_FLAG_REMOVE_FROM_SIMULATION; _pendingFlags &= ~PENDING_FLAG_REMOVE_FROM_SIMULATION;
} }
} }