History

Merge branch 'fix/render_config' into android

Brad Davis committed 8 years ago

Commit 361b7672 parents 4d6538e ab4e2d960 files · +823 −459Browse files

Showing the changes to interface/src/Application.cpp (1 of 60 files). Show all

Unified · Split

interface/src/Application.cpp+6−4
@@ -352,7 +352,7 @@ static const float MIRROR_FULLSCREEN_DISTANCE = 0.389f; · 351 unmodified lines
352static const quint64 TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS = 1 * USECS_PER_SECOND;352static const quint64 TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS = 1 * USECS_PER_SECOND;
353 353
354static const QString INFO_EDIT_ENTITIES_PATH = "html/edit-commands.html";354static const QString INFO_EDIT_ENTITIES_PATH = "html/edit-commands.html";
355static const QString INFO_HELP_PATH = "../../../html/tabletHelp.html";355static const QString INFO_HELP_PATH = "html/tabletHelp.html";
356 356
357static const unsigned int THROTTLED_SIM_FRAMERATE = 15;357static const unsigned int THROTTLED_SIM_FRAMERATE = 15;
358static const int THROTTLED_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / THROTTLED_SIM_FRAMERATE;358static const int THROTTLED_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / THROTTLED_SIM_FRAMERATE;
@@ -1441,8 +1441,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1082 unmodified lines
1441 userInputMapper->registerDevice(_touchscreenVirtualPadDevice->getInputDevice());1441 userInputMapper->registerDevice(_touchscreenVirtualPadDevice->getInputDevice());
1442 }1442 }
1443 1443
1444 // force the model the look at the correct directory (weird order of operations issue)1444 // this will force the model the look at the correct directory (weird order of operations issue)
1445 scriptEngines->setScriptsLocation(scriptEngines->getScriptsLocation());1445 scriptEngines->reloadLocalFiles();
1446
1446 // do this as late as possible so that all required subsystems are initialized1447 // do this as late as possible so that all required subsystems are initialized
1447 // If we've overridden the default scripts location, just load default scripts1448 // If we've overridden the default scripts location, just load default scripts
1448 // otherwise, load 'em all1449 // otherwise, load 'em all
@@ -2731,7 +2732,8 @@ void Application::showHelp() { · 1282 unmodified lines
2731 queryString.addQueryItem("defaultTab", defaultTab);2732 queryString.addQueryItem("defaultTab", defaultTab);
2732 auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();2733 auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
2733 TabletProxy* tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));2734 TabletProxy* tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
2734 tablet->gotoWebScreen(INFO_HELP_PATH + "?" + queryString.toString());2735 tablet->gotoWebScreen(PathUtils::resourcesUrl() + INFO_HELP_PATH + "?" + queryString.toString());
2736 DependencyManager::get<HMDScriptingInterface>()->openTablet();
2735 //InfoView::show(INFO_HELP_PATH, false, queryString.toString());2737 //InfoView::show(INFO_HELP_PATH, false, queryString.toString());
2736}2738}
2737 2739