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

Debugging the graphics fields activation

Browse source
This commit is contained in:
samcake 2017-08-11 18:10:44 -07:00
parent 99a05c4213
commit ff98dedbb2
4 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/resources/config/render.json
View file

@ -1,4 +1,18 @@
{ {
"SecondaryCameraJob": {
"RenderShadowTask": {
"Enabled": {
"enabled": true
}
},
"RenderDeferredTask": {
"AmbientOcclusion": {
"Enabled": {
"enabled": true
}
}
}
},
"RenderMainView": { "RenderMainView": {
"RenderShadowTask": { "RenderShadowTask": {
"Enabled": { "Enabled": {
@ -13,4 +27,4 @@
} }
} }
} }
} }

2
interface/src/Application.cpp
View file

@ -351,7 +351,7 @@ public:
// Don't actually crash in debug builds, in case this apparent deadlock is simply from // Don't actually crash in debug builds, in case this apparent deadlock is simply from
// the developer actively debugging code // the developer actively debugging code
#ifdef NDEBUG #ifdef NDEBUG
deadlockDetectionCrash(); // deadlockDetectionCrash();
#endif #endif
} }
} }

22
interface/src/ui/PreferencesDialog.cpp
View file

@ -315,21 +315,23 @@ void setupPreferences() {
static const QString RENDER("Graphics"); static const QString RENDER("Graphics");
auto renderConfig = qApp->getRenderEngine()->getConfiguration(); auto renderConfig = qApp->getRenderEngine()->getConfiguration();
if (renderConfig) { if (renderConfig) {
auto ambientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>(); auto mainViewAmbientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>("RenderMainView.AmbientOcclusion");
if (ambientOcclusionConfig) { auto camViewAmbientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>("SecondaryCameraJob.AmbientOcclusion");
auto getter = [ambientOcclusionConfig]()->QString { return ambientOcclusionConfig->getPreset(); }; if (mainViewAmbientOcclusionConfig && camViewAmbientOcclusionConfig) {
auto setter = [ambientOcclusionConfig](QString preset) { ambientOcclusionConfig->setPreset(preset); }; auto getter = [mainViewAmbientOcclusionConfig]()->QString { return mainViewAmbientOcclusionConfig->getPreset(); };
auto setter = [mainViewAmbientOcclusionConfig, camViewAmbientOcclusionConfig](QString preset) { mainViewAmbientOcclusionConfig->setPreset(preset); camViewAmbientOcclusionConfig->setPreset(preset); };
auto preference = new ComboBoxPreference(RENDER, "Ambient occlusion", getter, setter); auto preference = new ComboBoxPreference(RENDER, "Ambient occlusion", getter, setter);
preference->setItems(ambientOcclusionConfig->getPresetList()); preference->setItems(mainViewAmbientOcclusionConfig->getPresetList());
preferences->addPreference(preference); preferences->addPreference(preference);
} }
auto shadowConfig = renderConfig->getConfig<RenderShadowTask>(); auto mainViewShadowConfig = renderConfig->getConfig<RenderShadowTask>("RenderMainView.RenderShadowTask");
if (shadowConfig) { auto camViewShadowConfig = renderConfig->getConfig<RenderShadowTask>("SecondaryCameraJob.RenderShadowTask");
auto getter = [shadowConfig]()->QString { return shadowConfig->getPreset(); }; if (mainViewShadowConfig && camViewShadowConfig) {
auto setter = [shadowConfig](QString preset) { shadowConfig->setPreset(preset); }; auto getter = [mainViewShadowConfig]()->QString { return mainViewShadowConfig->getPreset(); };
auto setter = [mainViewShadowConfig, camViewShadowConfig](QString preset) { mainViewShadowConfig->setPreset(preset); camViewShadowConfig->setPreset(preset); };
auto preference = new ComboBoxPreference(RENDER, "Shadows", getter, setter); auto preference = new ComboBoxPreference(RENDER, "Shadows", getter, setter);
preference->setItems(shadowConfig->getPresetList()); preference->setItems(mainViewShadowConfig->getPresetList());
preferences->addPreference(preference); preferences->addPreference(preference);
} }
} }

2
unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
View file

@ -153,7 +153,7 @@
// -showSpectatorInDesktop: Set to "true" to show the "SPECTATOR" app in desktop mode. // -showSpectatorInDesktop: Set to "true" to show the "SPECTATOR" app in desktop mode.
var button = false; var button = false;
var buttonName = "SPECTATOR"; var buttonName = "SPECTATOR";
var showSpectatorInDesktop = false; var showSpectatorInDesktop = true;
function addOrRemoveButton(isShuttingDown, isHMDMode) { function addOrRemoveButton(isShuttingDown, isHMDMode) {
if (!tablet) { if (!tablet) {
print("Warning in addOrRemoveButton(): 'tablet' undefined!"); print("Warning in addOrRemoveButton(): 'tablet' undefined!");