From 4e952b0f994d3e0c6cfa3ed92800e34b46dae0a5 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 19 Nov 2013 16:40:29 -0800 Subject: [PATCH] Clamp pitch from touch when adjusting it. --- interface/src/Application.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 08a4e96da6..8481ba7908 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2189,8 +2189,10 @@ void Application::updateHandAndTouch(float deltaTime) { float TOUCH_YAW_SCALE = -0.25f; float TOUCH_PITCH_SCALE = -12.5f; float FIXED_TOUCH_TIMESTEP = 0.016f; + const float MAX_PITCH = 90.0f; _yawFromTouch += ((_touchAvgX - _lastTouchAvgX) * TOUCH_YAW_SCALE * FIXED_TOUCH_TIMESTEP); - _pitchFromTouch += ((_touchAvgY - _lastTouchAvgY) * TOUCH_PITCH_SCALE * FIXED_TOUCH_TIMESTEP); + _pitchFromTouch = glm::clamp(_pitchFromTouch + (_touchAvgY - _lastTouchAvgY) * TOUCH_PITCH_SCALE * + FIXED_TOUCH_TIMESTEP, -MAX_PITCH, MAX_PITCH); _lastTouchAvgX = _touchAvgX; _lastTouchAvgY = _touchAvgY; }