AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update submodule

This commit is contained in:
Jack Andersen 2016-07-26 18:14:46 -10:00
parent f2a7c0cc4d
commit dcd41271c3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Editor/ViewManager.cpp
View File

@ -90,8 +90,8 @@ void ViewManager::ParticleView::draw(boo::IGraphicsCommandQueue *gfxQ)
m_vm.m_modelTest->GetInstance().ActivateLights(lights); m_vm.m_modelTest->GetInstance().ActivateLights(lights);
m_vm.m_modelTest->Draw(flags); m_vm.m_modelTest->Draw(flags);
zeus::CColor ctrlCol{1.f, 0.f, 0.f, 1.f}; zeus::CColor ctrlCol{0.7f, 0.f, 0.3f, 1.f};
float fac = 0.5f; float fac = 0.0f;
zeus::CColor a = zeus::CColor::lerp(ctrlCol, zeus::CColor::skWhite, fac); zeus::CColor a = zeus::CColor::lerp(ctrlCol, zeus::CColor::skWhite, fac);
m_thermColdFilter.setColorA(a); m_thermColdFilter.setColorA(a);
float bFac = 0.f; float bFac = 0.f;
@ -104,7 +104,7 @@ void ViewManager::ParticleView::draw(boo::IGraphicsCommandQueue *gfxQ)
zeus::CColor b{bFac, bFac, bFac, bAlpha}; zeus::CColor b{bFac, bFac, bFac, bAlpha};
m_thermColdFilter.setColorB(b); m_thermColdFilter.setColorB(b);
zeus::CColor c = zeus::CColor::lerp(zeus::CColor::skBlack, zeus::CColor::skWhite, fac * 0.75f + 0.25f); 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); m_thermColdFilter.setScale(std::sin(m_theta) * 0.5f + 0.5f);

2
Runtime/Graphics/Shaders/CThermalColdFilterGLSL.cpp
View File

@ -40,7 +40,7 @@ BOO_GLSL_BINDING_HEAD
" vtf.sceneUv = uvIn.xy;\n" " vtf.sceneUv = uvIn.xy;\n"
" vtf.shiftUv = (mat3(shiftMtx) * uvIn.xyz).xy;\n" " vtf.shiftUv = (mat3(shiftMtx) * uvIn.xyz).xy;\n"
" vtf.shiftScale = shiftScale.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"; "}\n";
static const char* FS = static const char* FS =

2
hecl

@ -1 +1 @@
Subproject commit 1c4de40f6053ff71c5c40fbfeb6a656ac3949365 Subproject commit ba0684b9153beb9d098a87b048ec642f289b0ed5