From ed7d00c1d821fb77e674281c894759da3627d689 Mon Sep 17 00:00:00 2001 From: Tleety Date: Mon, 1 Feb 2016 18:19:38 +0100 Subject: [PATCH] Bug where widgets did not get their ambient light now fixed. --- resources/Shaders/ForwardPlus.frag.glsl | 2 +- src/Engine/Editor/EditorRenderSystem.cpp | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/resources/Shaders/ForwardPlus.frag.glsl b/resources/Shaders/ForwardPlus.frag.glsl index 025068f7..d2c1c628 100644 --- a/resources/Shaders/ForwardPlus.frag.glsl +++ b/resources/Shaders/ForwardPlus.frag.glsl @@ -126,7 +126,7 @@ void main() tilePos.y = int(gl_FragCoord.y/TILE_SIZE); LightResult totalLighting; - totalLighting.Diffuse = AmbientColor; + totalLighting.Diffuse = vec4(AmbientColor.rgb, 1.0); int currentTile = int(floor(gl_FragCoord.x/TILE_SIZE) + (floor(gl_FragCoord.y/TILE_SIZE) * int(ScreenDimensions.x/TILE_SIZE))); int start = int(LightGrids.Data[currentTile].Start); diff --git a/src/Engine/Editor/EditorRenderSystem.cpp b/src/Engine/Editor/EditorRenderSystem.cpp index d1b9083c..ef1a33ce 100644 --- a/src/Engine/Editor/EditorRenderSystem.cpp +++ b/src/Engine/Editor/EditorRenderSystem.cpp @@ -23,6 +23,16 @@ void EditorRenderSystem::Update(double dt) scene.Camera = m_EditorCamera; scene.Viewport = Rectangle(1920, 1080); + auto cSceneLight = m_World->GetComponents("SceneLight"); + if (cSceneLight != nullptr) { + //m_RenderFrame->Gamma = (double)(*cSceneLight->begin())["Gamma"]; + //m_RenderFrame->Exposure = (double)(*cSceneLight->begin())["Exposure"]; + //scene.AmbientColor = (glm::vec4)(*cSceneLight->begin())["AmbientColor"]; + m_RenderFrame->Gamma = 2.2; + m_RenderFrame->Exposure = 1.0; + scene.AmbientColor = glm::vec4(0.6, 0.5, 0.5, 1.0); + } + auto models = m_World->GetComponents("Model"); if (models != nullptr) { for (auto& cModel : *models) {