From dcd41271c33616e6791d2422c2091fbbdacddd56 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Tue, 26 Jul 2016 18:14:46 -1000 Subject: [PATCH] Update submodule --- Editor/ViewManager.cpp | 6 +++--- Runtime/Graphics/Shaders/CThermalColdFilterGLSL.cpp | 2 +- hecl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Editor/ViewManager.cpp b/Editor/ViewManager.cpp index 65f34ac04..6884317a4 100644 --- a/Editor/ViewManager.cpp +++ b/Editor/ViewManager.cpp @@ -90,8 +90,8 @@ void ViewManager::ParticleView::draw(boo::IGraphicsCommandQueue *gfxQ) m_vm.m_modelTest->GetInstance().ActivateLights(lights); m_vm.m_modelTest->Draw(flags); - zeus::CColor ctrlCol{1.f, 0.f, 0.f, 1.f}; - float fac = 0.5f; + zeus::CColor ctrlCol{0.7f, 0.f, 0.3f, 1.f}; + float fac = 0.0f; zeus::CColor a = zeus::CColor::lerp(ctrlCol, zeus::CColor::skWhite, fac); m_thermColdFilter.setColorA(a); float bFac = 0.f; @@ -104,7 +104,7 @@ void ViewManager::ParticleView::draw(boo::IGraphicsCommandQueue *gfxQ) zeus::CColor b{bFac, bFac, bFac, bAlpha}; m_thermColdFilter.setColorB(b); zeus::CColor c = zeus::CColor::lerp(zeus::CColor::skBlack, zeus::CColor::skWhite, fac * 0.75f + 0.25f); - m_thermColdFilter.setColorC(c); + m_thermColdFilter.setColorC(zeus::CColor::skBlack); m_thermColdFilter.setScale(std::sin(m_theta) * 0.5f + 0.5f); diff --git a/Runtime/Graphics/Shaders/CThermalColdFilterGLSL.cpp b/Runtime/Graphics/Shaders/CThermalColdFilterGLSL.cpp index 1dfa3dff1..3bffbcc0f 100644 --- a/Runtime/Graphics/Shaders/CThermalColdFilterGLSL.cpp +++ b/Runtime/Graphics/Shaders/CThermalColdFilterGLSL.cpp @@ -40,7 +40,7 @@ BOO_GLSL_BINDING_HEAD " vtf.sceneUv = uvIn.xy;\n" " vtf.shiftUv = (mat3(shiftMtx) * uvIn.xyz).xy;\n" " vtf.shiftScale = shiftScale.xy;\n" -" gl_Position = FLIPFROMGL(vec4(posIn.xyz, 1.0));\n" +" gl_Position = vec4(posIn.xyz, 1.0);\n" "}\n"; static const char* FS = diff --git a/hecl b/hecl index 1c4de40f6..ba0684b91 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 1c4de40f6053ff71c5c40fbfeb6a656ac3949365 +Subproject commit ba0684b9153beb9d098a87b048ec642f289b0ed5