From 8ecfbce15eca4acd693deaddb1ea6ba2d98a4d02 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Thu, 9 May 2013 14:00:40 -0700 Subject: [PATCH] fixed some small formatting things --- interface/src/Avatar.cpp | 7 +++---- interface/src/AvatarTouch.cpp | 3 +-- interface/src/Camera.cpp | 32 ++++++++++++++++---------------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 1107368723..2679815573 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -488,8 +488,8 @@ void Avatar::updateHandMovementAndTouching(float deltaTime) { _avatarTouch.setYourHandPosition(_interactingOther->_joint[ AVATAR_JOINT_RIGHT_FINGERTIPS ].springyPosition); _avatarTouch.setYourHandState (_interactingOther->_handState); - //_joint[ AVATAR_JOINT_RIGHT_FINGERTIPS ].springyPosition = - //_interactingOther->_joint[ AVATAR_JOINT_RIGHT_FINGERTIPS ].springyPosition; + _joint[ AVATAR_JOINT_RIGHT_FINGERTIPS ].position = + _interactingOther->_joint[ AVATAR_JOINT_RIGHT_FINGERTIPS ].springyPosition; //_handHoldingPosition @@ -530,8 +530,7 @@ void Avatar::updateHead(float deltaTime) { */ //apply the head lean values to the springy position... - if (fabs(_head.leanSideways + _head.leanForward) > 0.0f) - { + if (fabs(_head.leanSideways + _head.leanForward) > 0.0f) { glm::vec3 headLean = _orientation.getRight() * _head.leanSideways + _orientation.getFront() * _head.leanForward; diff --git a/interface/src/AvatarTouch.cpp b/interface/src/AvatarTouch.cpp index d5d77fbbdc..d77c7a0a91 100644 --- a/interface/src/AvatarTouch.cpp +++ b/interface/src/AvatarTouch.cpp @@ -63,8 +63,7 @@ void AvatarTouch::setReachableRadius(float r) { void AvatarTouch::render(glm::vec3 cameraPosition) { -if (_canReachToOtherAvatar) -{ +if (_canReachToOtherAvatar) { glColor4f(0.3, 0.4, 0.5, 0.5); glm::vec3 p(_yourBodyPosition); p.y = 0.0005f; diff --git a/interface/src/Camera.cpp b/interface/src/Camera.cpp index ed10b8e5fa..fdb21656fd 100644 --- a/interface/src/Camera.cpp +++ b/interface/src/Camera.cpp @@ -13,23 +13,23 @@ Camera::Camera() { _frustumNeedsReshape = false; - _mode = CAMERA_MODE_THIRD_PERSON; - _tightness = 10.0; // default - _fieldOfView = 60.0; // default - _nearClip = 0.08; // default - _farClip = 50.0 * TREE_SCALE; // default + _mode = CAMERA_MODE_THIRD_PERSON; + _tightness = 10.0; // default + _fieldOfView = 60.0; // default + _nearClip = 0.08; // default + _farClip = 50.0 * TREE_SCALE; // default _modeShift = 0.0; - _yaw = 0.0; - _pitch = 0.0; - _roll = 0.0; - _upShift = 0.0; - _rightShift = 0.0; - _distance = 0.0; - _idealYaw = 0.0; - _targetPosition = glm::vec3(0.0, 0.0, 0.0); - _position = glm::vec3(0.0, 0.0, 0.0); - _idealPosition = glm::vec3(0.0, 0.0, 0.0); - _orientation.setToIdentity(); + _yaw = 0.0; + _pitch = 0.0; + _roll = 0.0; + _upShift = 0.0; + _rightShift = 0.0; + _distance = 0.0; + _idealYaw = 0.0; + _targetPosition = glm::vec3(0.0, 0.0, 0.0); + _position = glm::vec3(0.0, 0.0, 0.0); + _idealPosition = glm::vec3(0.0, 0.0, 0.0); + _orientation.setToIdentity(); }