mirror of https://github.com/AxioDL/metaforce.git
Remove FLIPFROMGL from shaders, use F1 key for uncapping frame-rate
This commit is contained in:
parent
3f4aeffb17
commit
2eb4573e53
|
@ -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<TestGameView> m_testGameView;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
2
hecl
2
hecl
|
@ -1 +1 @@
|
|||
Subproject commit 9fe82ea92f5719a698a32dc7bea0fce66d1b3391
|
||||
Subproject commit ec70fea916fd65574f0425478e21343452f9d785
|
2
specter
2
specter
|
@ -1 +1 @@
|
|||
Subproject commit 8653be549c224160fe3bc9ad0c41131dd2fe549d
|
||||
Subproject commit 7ff240567107e87d46b6ce1b00cb73f6c249b08d
|
Loading…
Reference in New Issue