Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 20:43:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make 'Go Home' an option from the options because it conflicts with 'G' for gravity on/off

Browse source
This commit is contained in:
Philip Rosedale 2013-07-03 22:55:01 -07:00
parent 3388fccc86
commit 2de6d3eb6a
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -1472,7 +1472,8 @@ void Application::initMenu() {
(_testPing = optionsMenu->addAction("Test Ping"))->setCheckable(true);
_testPing->setChecked(true);
(_fullScreenMode = optionsMenu->addAction("Fullscreen", this, SLOT(setFullscreen(bool)), Qt::Key_F))->setCheckable(true);
optionsMenu->addAction("Webcam", &_webcam, SLOT(setEnabled(bool)))->setCheckable(true);
optionsMenu->addAction("Webcam", &_webcam, SLOT(setEnabled(bool)))->setCheckable(true);
optionsMenu->addAction("Go Home", this, SLOT(goHome()));
QMenu* renderMenu = menuBar->addMenu("Render");
(_renderVoxels = renderMenu->addAction("Voxels"))->setCheckable(true);

3
interface/src/Head.cpp
View file

@ -228,6 +228,9 @@ void Head::simulate(float deltaTime, bool isMine) {
const float CAMERA_STOP_TOLERANCE_DEGREES = 0.25f;
const float CAMERA_START_TOLERANCE_DEGREES = 15.0f;
float cameraHeadAngleDifference = glm::length(glm::vec2(_pitch - _cameraPitch, _yaw - _cameraYaw));
//if (cameraHeadAngleDifference > 0.1f) {
// printLog("angleDiff = %0.2f\n", cameraHeadAngleDifference);
//}
if (_isCameraMoving) {
_cameraFollowHeadRate = glm::clamp(_cameraFollowHeadRate * CAMERA_FOLLOW_HEAD_RATE_RAMP_RATE,
0.f,