From c45f810622e356412b08a7bea66fb3a4f385619d Mon Sep 17 00:00:00 2001 From: samcake Date: Thu, 14 Jul 2016 16:43:56 -0700 Subject: [PATCH 1/2] Fixing the mac build --- libraries/render/src/render/Task.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/render/src/render/Task.h b/libraries/render/src/render/Task.h index cc38830498..d5b41e539e 100644 --- a/libraries/render/src/render/Task.h +++ b/libraries/render/src/render/Task.h @@ -520,7 +520,7 @@ public: Model(const Varying& input, A&&... args) : Concept(nullptr), _data(Data(std::forward(args)...)), _input(input), _output(Output()) { // Recreate the Config to use the templated type - _data.createConfiguration(); + _data.template createConfiguration(); _config = _data.getConfiguration(); applyConfiguration(); } From d69be5e4d281bf7f8177a0ed5cfedfa80fc3b109 Mon Sep 17 00:00:00 2001 From: samcake Date: Thu, 14 Jul 2016 16:45:56 -0700 Subject: [PATCH 2/2] Fixing the default value for the lightingMOdel flag when using debugDeferredLighting --- libraries/render-utils/src/DeferredLightingEffect.cpp | 2 +- libraries/render-utils/src/model_translucent_unlit.slf | 3 ++- .../developer/utilities/render/deferredLighting.qml | 10 ++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index 1299cb428f..4f5544bab3 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -612,7 +612,7 @@ void RenderDeferredLocals::run(const render::SceneContextPointer& sceneContext, for (auto lightID : deferredLightingEffect->_spotLights) { auto light = deferredLightingEffect->_allocatedLights[lightID]; // IN DEBUG: - light->setShowContour(true); + // light->setShowContour(true); batch.setUniformBuffer(deferredLightingEffect->_spotLightLocations->lightBufferUnit, light->getSchemaBuffer()); auto eyeLightPos = eyePoint - light->getPosition(); diff --git a/libraries/render-utils/src/model_translucent_unlit.slf b/libraries/render-utils/src/model_translucent_unlit.slf index e2676636bf..b397cea5aa 100644 --- a/libraries/render-utils/src/model_translucent_unlit.slf +++ b/libraries/render-utils/src/model_translucent_unlit.slf @@ -16,6 +16,7 @@ <@include MaterialTextures.slh@> <$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, _SCRIBE_NULL, EMISSIVE, OCCLUSION)$> +<@include LightingModel.slh@> in vec2 _texCoord0; in vec3 _color; @@ -35,5 +36,5 @@ void main(void) { <$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>; albedo *= _color; - _fragColor = vec4(albedo, opacity); + _fragColor = vec4(albedo * isUnlitEnabled(), opacity); } diff --git a/scripts/developer/utilities/render/deferredLighting.qml b/scripts/developer/utilities/render/deferredLighting.qml index 9d92b79fd6..bc34423a9c 100644 --- a/scripts/developer/utilities/render/deferredLighting.qml +++ b/scripts/developer/utilities/render/deferredLighting.qml @@ -28,7 +28,7 @@ Column { ] CheckBox { text: modelData.split(":")[0] - checked: Render.getConfig(modelData.split(":")[1]) + checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked } } } @@ -46,7 +46,7 @@ Column { ] CheckBox { text: modelData.split(":")[0] - checked: Render.getConfig(modelData.split(":")[1]) + checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked } } } @@ -63,7 +63,7 @@ Column { ] CheckBox { text: modelData.split(":")[0] - checked: Render.getConfig(modelData.split(":")[1]) + checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked } } } @@ -76,7 +76,7 @@ Column { ] CheckBox { text: modelData.split(":")[0] - checked: Render.getConfig(modelData.split(":")[1]) + checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked } } } @@ -104,6 +104,7 @@ Column { } ComboBox { + anchors.right: root.right currentIndex: 1 model: ListModel { id: cbItems @@ -133,6 +134,7 @@ Column { } ComboBox { + anchors.right: root.right currentIndex: 0 model: ListModel { id: cbItemsFramebuffer