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

remove extra whitespace

Browse source
This commit is contained in:
Andrew Meadows 2015-11-02 09:17:51 -08:00 committed by U-GAPOS\andrew
parent fd557c4e52
commit 9799693135
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/avatar/MyAvatar.cpp
View file

@ -250,7 +250,7 @@ void MyAvatar::simulate(float deltaTime) {
{ {
PerformanceTimer perfTimer("transform"); PerformanceTimer perfTimer("transform");
bool stepAction = false; bool stepAction = false;
// When there are no step values, we zero out the last step pulse. // When there are no step values, we zero out the last step pulse.
// This allows a user to do faster snapping by tapping a control // This allows a user to do faster snapping by tapping a control
for (int i = STEP_TRANSLATE_X; !stepAction && i <= STEP_YAW; ++i) { for (int i = STEP_TRANSLATE_X; !stepAction && i <= STEP_YAW; ++i) {
if (_driveKeys[i] != 0.0f) { if (_driveKeys[i] != 0.0f) {
@ -1297,7 +1297,7 @@ void MyAvatar::prepareForPhysicsSimulation() {
_characterController.setAvatarPositionAndOrientation(getPosition(), getOrientation()); _characterController.setAvatarPositionAndOrientation(getPosition(), getOrientation());
updateHMDFollowVelocity(); updateHMDFollowVelocity();
_characterController.setHMDVelocity(_hmdFollowVelocity); _characterController.setHMDVelocity(_hmdFollowVelocity);
} }
void MyAvatar::harvestResultsFromPhysicsSimulation() { void MyAvatar::harvestResultsFromPhysicsSimulation() {
glm::vec3 position = getPosition(); glm::vec3 position = getPosition();
@ -1338,7 +1338,7 @@ void MyAvatar::adjustSensorTransform(glm::vec3 hmdShift) {
_bodySensorMatrix = newBodySensorMatrix; _bodySensorMatrix = newBodySensorMatrix;
} else { } else {
// physics already did the positional blending for us // physics already did the positional blending for us
glm::vec3 newBodyPosition = getPosition(); glm::vec3 newBodyPosition = getPosition();
// but the rotational part must be done manually // but the rotational part must be done manually
glm::quat newBodyRotation = glm::normalize(safeMix(getOrientation(), finalBodyRotation, blendFactor)); glm::quat newBodyRotation = glm::normalize(safeMix(getOrientation(), finalBodyRotation, blendFactor));
nextAttitude(newBodyPosition, newBodyRotation); nextAttitude(newBodyPosition, newBodyRotation);
@ -1453,7 +1453,7 @@ void MyAvatar::renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, fl
getHead()->renderLookAts(renderArgs); getHead()->renderLookAts(renderArgs);
} }
if (renderArgs->_renderMode != RenderArgs::SHADOW_RENDER_MODE && if (renderArgs->_renderMode != RenderArgs::SHADOW_RENDER_MODE &&
Menu::getInstance()->isOptionChecked(MenuOption::DisplayHandTargets)) { Menu::getInstance()->isOptionChecked(MenuOption::DisplayHandTargets)) {
getHand()->renderHandTargets(renderArgs, true); getHand()->renderHandTargets(renderArgs, true);
} }
@ -1932,7 +1932,7 @@ void MyAvatar::updateMotionBehaviorFromMenu() {
QMetaObject::invokeMethod(this, "updateMotionBehaviorFromMenu"); QMetaObject::invokeMethod(this, "updateMotionBehaviorFromMenu");
return; return;
} }
Menu* menu = Menu::getInstance(); Menu* menu = Menu::getInstance();
if (menu->isOptionChecked(MenuOption::KeyboardMotorControl)) { if (menu->isOptionChecked(MenuOption::KeyboardMotorControl)) {
_motionBehaviors |= AVATAR_MOTION_KEYBOARD_MOTOR_ENABLED; _motionBehaviors |= AVATAR_MOTION_KEYBOARD_MOTOR_ENABLED;

2
libraries/shared/src/AtRestDetector.cpp
View file

@ -31,7 +31,7 @@ void AtRestDetector::reset(const glm::vec3& startPosition, const glm::quat& star
} }
bool AtRestDetector::update(const glm::vec3& position, const glm::quat& rotation) { bool AtRestDetector::update(const glm::vec3& position, const glm::quat& rotation) {
uint64_t now = usecTimestampNow(); uint64_t now = usecTimestampNow();
float dt = (float)(_lastUpdateTime - now) / (float)USECS_PER_SECOND; float dt = (float)(_lastUpdateTime - now) / (float)USECS_PER_SECOND;
_lastUpdateTime = now; _lastUpdateTime = now;
const float TAU = 1.0f; const float TAU = 1.0f;