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

Merge branch 'master' of https://github.com/highfidelity/hifi into priority

Browse source
This commit is contained in:
Andrzej Kapolka 2014-05-13 11:38:51 -07:00
commit f2ba2a48f2
3 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/modules/FindLibOVR.cmake
View file

@ -49,7 +49,7 @@ else (LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIRS)
set(WINDOWS_LIBOVR_NAME "libovr.lib") set(WINDOWS_LIBOVR_NAME "libovr.lib")
endif() endif()
find_library(LIBOVR_LIBRARIES "Lib/Win32/${LIBOVR_NAME}" HINTS ${LIBOVR_SEARCH_DIRS}) find_library(LIBOVR_LIBRARIES "Lib/Win32/VS2010/${LIBOVR_NAME}" HINTS ${LIBOVR_SEARCH_DIRS})
endif () endif ()
if (LIBOVR_INCLUDE_DIRS AND LIBOVR_LIBRARIES) if (LIBOVR_INCLUDE_DIRS AND LIBOVR_LIBRARIES)

20
interface/src/Application.cpp
View file

@ -686,11 +686,8 @@ void Application::resizeGL(int width, int height) {
glLoadIdentity(); glLoadIdentity();
// update Stats width // update Stats width
int horizontalOffset = 0; // let's set horizontal offset to give stats some margin to mirror
if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { int horizontalOffset = MIRROR_VIEW_WIDTH + MIRROR_VIEW_LEFT_PADDING * 2;
// mirror is enabled, let's set horizontal offset to give stats some margin
horizontalOffset += MIRROR_VIEW_WIDTH + MIRROR_VIEW_LEFT_PADDING * 2;
}
Stats::getInstance()->resetWidth(width, horizontalOffset); Stats::getInstance()->resetWidth(width, horizontalOffset);
} }
@ -1164,10 +1161,8 @@ void Application::mouseReleaseEvent(QMouseEvent* event) {
_mousePressed = false; _mousePressed = false;
checkBandwidthMeterClick(); checkBandwidthMeterClick();
if (Menu::getInstance()->isOptionChecked(MenuOption::Stats)) { if (Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {
int horizontalOffset = 0; // let's set horizontal offset to give stats some margin to mirror
if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { int horizontalOffset = MIRROR_VIEW_WIDTH;
horizontalOffset = MIRROR_VIEW_WIDTH;
}
Stats::getInstance()->checkClick(_mouseX, _mouseY, _mouseDragStartedX, _mouseDragStartedY, horizontalOffset); Stats::getInstance()->checkClick(_mouseX, _mouseY, _mouseDragStartedX, _mouseDragStartedY, horizontalOffset);
} }
} }
@ -2733,11 +2728,8 @@ void Application::displayOverlay() {
glPointSize(1.0f); glPointSize(1.0f);
if (Menu::getInstance()->isOptionChecked(MenuOption::Stats)) { if (Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {
int horizontalOffset = 0; // let's set horizontal offset to give stats some margin to mirror
if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { int horizontalOffset = MIRROR_VIEW_WIDTH + MIRROR_VIEW_LEFT_PADDING * 2;
// mirror is enabled, let's set horizontal offset to give stats some margin
horizontalOffset += MIRROR_VIEW_WIDTH + MIRROR_VIEW_LEFT_PADDING * 2;
}
int voxelPacketsToProcess = _voxelProcessor.packetsToProcessCount(); int voxelPacketsToProcess = _voxelProcessor.packetsToProcessCount();
// Onscreen text about position, servers, etc // Onscreen text about position, servers, etc
Stats::getInstance()->display(WHITE_TEXT, horizontalOffset, _fps, _packetsPerSecond, _bytesPerSecond, voxelPacketsToProcess); Stats::getInstance()->display(WHITE_TEXT, horizontalOffset, _fps, _packetsPerSecond, _bytesPerSecond, voxelPacketsToProcess);

2
interface/src/Menu.cpp
View file

@ -889,7 +889,7 @@ void Menu::goToDomainDialog() {
} }
void Menu::goToOrientation(QString orientation) { void Menu::goToOrientation(QString orientation) {
LocationManager::getInstance().goToDestination(orientation); LocationManager::getInstance().goToOrientation(orientation);
} }
bool Menu::goToDestination(QString destination) { bool Menu::goToDestination(QString destination) {