From 776bcb6655e3842e39491b1d4eae4d1c130b75f0 Mon Sep 17 00:00:00 2001 From: samcake Date: Thu, 14 Jul 2016 15:49:49 -0700 Subject: [PATCH] FIxing the web entity rendering --- libraries/render-utils/src/DeferredBufferWrite.slh | 4 ++-- libraries/render-utils/src/model_unlit.slf | 2 +- libraries/render/src/render/Task.h | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libraries/render-utils/src/DeferredBufferWrite.slh b/libraries/render-utils/src/DeferredBufferWrite.slh index dece8e9ce3..9adb7948df 100755 --- a/libraries/render-utils/src/DeferredBufferWrite.slh +++ b/libraries/render-utils/src/DeferredBufferWrite.slh @@ -70,8 +70,8 @@ void packDeferredFragmentUnlit(vec3 normal, float alpha, vec3 color) { } _fragColor0 = vec4(color, packUnlit()); _fragColor1 = vec4(packNormal(normal), 1.0); - _fragColor2 = vec4(vec3(0.0), 1.0); - _fragColor3 = vec4(color * isUnlitEnabled(), 1.0); + // _fragColor2 = vec4(vec3(0.0), 1.0); + _fragColor3 = vec4(color, 1.0); } void packDeferredFragmentTranslucent(vec3 normal, float alpha, vec3 albedo, vec3 fresnel, float roughness) { diff --git a/libraries/render-utils/src/model_unlit.slf b/libraries/render-utils/src/model_unlit.slf index 3c2e4ae2e0..c64f9a07d7 100644 --- a/libraries/render-utils/src/model_unlit.slf +++ b/libraries/render-utils/src/model_unlit.slf @@ -40,5 +40,5 @@ void main(void) { packDeferredFragmentUnlit( normalize(_normal), opacity, - albedo); + albedo * isUnlitEnabled()); } diff --git a/libraries/render/src/render/Task.h b/libraries/render/src/render/Task.h index 6a7b04198f..cc38830498 100644 --- a/libraries/render/src/render/Task.h +++ b/libraries/render/src/render/Task.h @@ -572,6 +572,12 @@ public: auto children = _config->children(); for (auto& child : children) { child->setParent(config.get()); + QObject::connect(child, SIGNAL(loaded()), config.get(), SLOT(refresh())); + static const char* DIRTY_SIGNAL = "dirty()"; + if (child->metaObject()->indexOfSignal(DIRTY_SIGNAL) != -1) { + // Connect dirty->refresh if defined + QObject::connect(child, SIGNAL(dirty()), config.get(), SLOT(refresh())); + } } } _config = config; @@ -588,6 +594,7 @@ public: void configure(const QObject& configuration) { for (auto& job : _jobs) { job.applyConfiguration(); + } }