From 2eb4573e53398204998ba05423e627faf4d6e2a5 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Mon, 15 Oct 2018 21:28:41 -1000 Subject: [PATCH] Remove FLIPFROMGL from shaders, use F1 key for uncapping frame-rate --- Editor/ViewManager.hpp | 12 ++++++------ Shaders/CElementGenShaders.shader | 1 - Shaders/CMoviePlayerShader.shader | 1 - Shaders/CNESShader.shader | 1 - Shaders/CRandomStaticFilter.shader | 9 +++++---- Shaders/CTexturedQuadFilter.shader | 1 - hecl | 2 +- specter | 2 +- 8 files changed, 13 insertions(+), 16 deletions(-) diff --git a/Editor/ViewManager.hpp b/Editor/ViewManager.hpp index f2478cd28..7685825dc 100644 --- a/Editor/ViewManager.hpp +++ b/Editor/ViewManager.hpp @@ -98,9 +98,6 @@ class ViewManager final : public specter::IViewManager if (MP1::CMain* m = m_vm.m_projManager.gameMain()) if (MP1::CGameArchitectureSupport* as = m->GetArchSupport()) as->charKeyDown(cc, mkey, repeat); - - if (cc == '\t') - m_vm.m_skipWait = true; } void charKeyUp(unsigned long cc, boo::EModifierKey mkey) @@ -108,9 +105,6 @@ class ViewManager final : public specter::IViewManager if (MP1::CMain* m = m_vm.m_projManager.gameMain()) if (MP1::CGameArchitectureSupport* as = m->GetArchSupport()) as->charKeyUp(cc, mkey); - - if (cc == '\t') - m_vm.m_skipWait = false; } void specialKeyDown(boo::ESpecialKey skey, boo::EModifierKey mkey, bool repeat) @@ -118,6 +112,9 @@ class ViewManager final : public specter::IViewManager if (MP1::CMain* m = m_vm.m_projManager.gameMain()) if (MP1::CGameArchitectureSupport* as = m->GetArchSupport()) as->specialKeyDown(skey, mkey, repeat); + + if (skey == boo::ESpecialKey::F1) + m_vm.m_skipWait = true; } void specialKeyUp(boo::ESpecialKey skey, boo::EModifierKey mkey) @@ -125,6 +122,9 @@ class ViewManager final : public specter::IViewManager if (MP1::CMain* m = m_vm.m_projManager.gameMain()) if (MP1::CGameArchitectureSupport* as = m->GetArchSupport()) as->specialKeyUp(skey, mkey); + + if (skey == boo::ESpecialKey::F1) + m_vm.m_skipWait = false; } }; std::unique_ptr m_testGameView; diff --git a/Shaders/CElementGenShaders.shader b/Shaders/CElementGenShaders.shader index fa86d73d2..44fecdacc 100644 --- a/Shaders/CElementGenShaders.shader +++ b/Shaders/CElementGenShaders.shader @@ -298,7 +298,6 @@ void main() vtf.uvTexr = uvsInTexrTind[gl_VertexID].xy; vtf.uvTind = uvsInTexrTind[gl_VertexID].zw; gl_Position = mvp * pos; - gl_Position = FLIPFROMGL(gl_Position); } #fragment glsl diff --git a/Shaders/CMoviePlayerShader.shader b/Shaders/CMoviePlayerShader.shader index 0bdd7906f..288bec710 100644 --- a/Shaders/CMoviePlayerShader.shader +++ b/Shaders/CMoviePlayerShader.shader @@ -27,7 +27,6 @@ void main() vtf.uv = uvIn; vtf.color = mulColor; gl_Position = mv * vec4(posIn, 1.0); - gl_Position = FLIPFROMGL(gl_Position); } #fragment glsl diff --git a/Shaders/CNESShader.shader b/Shaders/CNESShader.shader index 5ed5bbc16..51cdff59b 100644 --- a/Shaders/CNESShader.shader +++ b/Shaders/CNESShader.shader @@ -30,7 +30,6 @@ void main() vtf.color = color; vtf.uv = uvIn.xy; gl_Position = mtx * vec4(posIn.xyz, 1.0); - gl_Position = FLIPFROMGL(gl_Position); } #fragment glsl diff --git a/Shaders/CRandomStaticFilter.shader b/Shaders/CRandomStaticFilter.shader index 6fee875e9..fb13c3c5d 100644 --- a/Shaders/CRandomStaticFilter.shader +++ b/Shaders/CRandomStaticFilter.shader @@ -204,13 +204,14 @@ fragment float4 fmain(VertToFrag vtf [[ stage_in ]], #dstfac one #shader CRandomStaticFilterMult : CRandomStaticFilterAlpha -#srcfac srccolor -#dstfac dstcolor +#srcfac zero +#dstfac srccolor #shader CRandomStaticFilterCookieCutter : CRandomStaticFilterAlpha -#srcfac srccolor -#dstfac dstcolor +#srcfac zero +#dstfac srccolor #depthwrite true +#colorwrite false #depthtest lequal #fragment glsl diff --git a/Shaders/CTexturedQuadFilter.shader b/Shaders/CTexturedQuadFilter.shader index 72f4f6566..3d362bd53 100644 --- a/Shaders/CTexturedQuadFilter.shader +++ b/Shaders/CTexturedQuadFilter.shader @@ -33,7 +33,6 @@ void main() vtf.uv = uvIn.xy; vtf.lod = lod; gl_Position = mtx * vec4(posIn.xyz, 1.0); - gl_Position = FLIPFROMGL(gl_Position); } #fragment glsl diff --git a/hecl b/hecl index 9fe82ea92..ec70fea91 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 9fe82ea92f5719a698a32dc7bea0fce66d1b3391 +Subproject commit ec70fea916fd65574f0425478e21343452f9d785 diff --git a/specter b/specter index 8653be549..7ff240567 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 8653be549c224160fe3bc9ad0c41131dd2fe549d +Subproject commit 7ff240567107e87d46b6ce1b00cb73f6c249b08d