From f30ff1704a8b362378b59b858205d0869907a193 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Mon, 30 Sep 2013 12:43:25 -0700 Subject: [PATCH] Fix to make touch-look MUCH smoother for flying around --- interface/src/Application.cpp | 12 ++++++------ interface/src/avatar/Avatar.h | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ed1e513b91..b4bd5f63f7 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1908,11 +1908,11 @@ void Application::update(float deltaTime) { // Update from Touch if (_isTouchPressed) { - float TOUCH_YAW_SCALE = -50.0f; - float TOUCH_PITCH_SCALE = -50.0f; - _yawFromTouch += ((_touchAvgX - _lastTouchAvgX) * TOUCH_YAW_SCALE * deltaTime); - _pitchFromTouch += ((_touchAvgY - _lastTouchAvgY) * TOUCH_PITCH_SCALE * deltaTime); - + float TOUCH_YAW_SCALE = -0.25f; + float TOUCH_PITCH_SCALE = -12.5f; + float FIXED_TOUCH_TIMESTEP = 0.016f; + _yawFromTouch += ((_touchAvgX - _lastTouchAvgX) * TOUCH_YAW_SCALE * FIXED_TOUCH_TIMESTEP); + _pitchFromTouch += ((_touchAvgY - _lastTouchAvgY) * TOUCH_PITCH_SCALE * FIXED_TOUCH_TIMESTEP); _lastTouchAvgX = _touchAvgX; _lastTouchAvgY = _touchAvgY; } @@ -2062,7 +2062,7 @@ void Application::updateAvatar(float deltaTime) { // rotate body yaw for yaw received from multitouch _myAvatar.setOrientation(_myAvatar.getOrientation() - * glm::quat(glm::vec3(0, _yawFromTouch * deltaTime, 0))); + * glm::quat(glm::vec3(0, _yawFromTouch, 0))); _yawFromTouch = 0.f; // Update my avatar's state from gyros and/or webcam diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h index 83cfd5993e..9396480d27 100755 --- a/interface/src/avatar/Avatar.h +++ b/interface/src/avatar/Avatar.h @@ -80,14 +80,14 @@ enum AvatarBodyBallID { BODY_BALL_RIGHT_ELBOW, BODY_BALL_RIGHT_WRIST, BODY_BALL_RIGHT_FINGERTIPS, - BODY_BALL_LEFT_HIP, - BODY_BALL_LEFT_KNEE, - BODY_BALL_LEFT_HEEL, - BODY_BALL_LEFT_TOES, - BODY_BALL_RIGHT_HIP, - BODY_BALL_RIGHT_KNEE, - BODY_BALL_RIGHT_HEEL, - BODY_BALL_RIGHT_TOES, + BODY_BALL_LEFT_HIP, + BODY_BALL_LEFT_KNEE, + BODY_BALL_LEFT_HEEL, + BODY_BALL_LEFT_TOES, + BODY_BALL_RIGHT_HIP, + BODY_BALL_RIGHT_KNEE, + BODY_BALL_RIGHT_HEEL, + BODY_BALL_RIGHT_TOES, NUM_AVATAR_BODY_BALLS };