Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 05:52:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo

Browse source
This commit is contained in:
amer cerkic 2019-02-22 09:50:41 -08:00
commit 72d3664b31
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/LODManager.h
View file

@ -19,13 +19,19 @@
#include <SimpleMovingAverage.h> #include <SimpleMovingAverage.h>
#include <render/Args.h> #include <render/Args.h>
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
const float LOD_DEFAULT_QUALITY_LEVEL = 0.75f; // default quality level setting is High (lower framerate) const float LOD_DEFAULT_QUALITY_LEVEL = 0.2f; // default quality level setting is High (lower framerate)
#else #else
const float LOD_DEFAULT_QUALITY_LEVEL = 0.5f; // default quality level setting is Mid const float LOD_DEFAULT_QUALITY_LEVEL = 0.5f; // default quality level setting is Mid
#endif #endif
const float LOD_MAX_LIKELY_DESKTOP_FPS = 60.0f; // this is essentially, V-synch fps const float LOD_MAX_LIKELY_DESKTOP_FPS = 60.0f; // this is essentially, V-synch fps
#ifdef Q_OS_ANDROID
const float LOD_MAX_LIKELY_HMD_FPS = 36.0f; // this is essentially, V-synch fps
#else
const float LOD_MAX_LIKELY_HMD_FPS = 90.0f; // this is essentially, V-synch fps const float LOD_MAX_LIKELY_HMD_FPS = 90.0f; // this is essentially, V-synch fps
#endif
const float LOD_OFFSET_FPS = 5.0f; // offset of FPS to add for computing the target framerate const float LOD_OFFSET_FPS = 5.0f; // offset of FPS to add for computing the target framerate
class AABox; class AABox;

18
libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
View file

@ -168,10 +168,8 @@ bool OculusMobileDisplayPlugin::isHmdMounted() const {
static void goToDevMobile() { static void goToDevMobile() {
auto addressManager = DependencyManager::get<AddressManager>(); auto addressManager = DependencyManager::get<AddressManager>();
auto currentAddress = addressManager->currentAddress().toString().toStdString(); auto currentAddress = addressManager->currentAddress().toString().toStdString();
if (std::string::npos == currentAddress.find("dev-mobile")) { if (std::string::npos == currentAddress.find("quest-dev")) {
addressManager->handleLookupString("hifi://dev-mobile/495.236,501.017,482.434/0,0.97452,0,-0.224301"); addressManager->handleLookupString("hifi://quest-dev");
//addressManager->handleLookupString("hifi://dev-mobile/504,498,491/0,0,0,0");
//addressManager->handleLookupString("hifi://dev-mobile/0,-1,1");
} }
} }
@ -217,12 +215,12 @@ bool OculusMobileDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
}); });
} }
// static uint32_t count = 0; static uint32_t count = 0;
// if ((++count % 1000) == 0) { if ((++count % 1000) == 0) {
// AbstractViewStateInterface::instance()->postLambdaEvent([] { AbstractViewStateInterface::instance()->postLambdaEvent([] {
// goToDevMobile(); goToDevMobile();
// }); });
// } }
return result && Parent::beginFrameRender(frameIndex); return result && Parent::beginFrameRender(frameIndex);
} }