From c56509e5a2a08aa15d23175010cf1efb3c3bffed Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Thu, 23 May 2013 09:30:36 -0700 Subject: [PATCH] Re-enabled pitch gyro look in first person, start location is now not reset on sensor reset --- interface/src/Application.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 04e05846b8..3546ee1ecf 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -52,7 +52,7 @@ using namespace std; static char STAR_FILE[] = "https://s3-us-west-1.amazonaws.com/highfidelity/stars.txt"; static char STAR_CACHE_FILE[] = "cachedStars.txt"; -const glm::vec3 START_LOCATION(6.1f, 0, 1.4f); // Where one's own agent begins in the world +const glm::vec3 START_LOCATION(0.f, 0.f, 0.f); // Where one's own agent begins in the world // (will be overwritten if avatar data file is found) const int IDLE_SIMULATE_MSECS = 16; // How often should call simulate and other stuff @@ -308,8 +308,7 @@ void Application::paintGL() { } else if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) { _myCamera.setTargetPosition(_myAvatar.getSpringyHeadPosition()); _myCamera.setTargetRotation(_myAvatar.getAbsoluteHeadYaw(), - 0.0f, - //-_myAvatar.getAbsoluteHeadPitch(), + _myAvatar.getAbsoluteHeadPitch(), 0.0f); // Take a look at whether we are inside head, don't render it if so. const float HEAD_RENDER_DISTANCE = 0.5; @@ -2054,7 +2053,6 @@ void Application::deleteVoxelUnderCursor() { } void Application::resetSensors() { - _myAvatar.setPosition(START_LOCATION); _headMouseX = _mouseX = _glWidget->width() / 2; _headMouseY = _mouseY = _glWidget->height() / 2;