Merge branch 'space-warp'

Editor/ViewManager.cpp

@@ -21,6 +21,7 @@ namespace urde
 {
 
 URDE_DECL_SPECIALIZE_SHADER(CThermalColdFilter)
+URDE_DECL_SPECIALIZE_SHADER(CSpaceWarpFilter)
 
 void ViewManager::BuildTestPART(urde::IObjectStore& objStore)
 {
@@ -92,26 +93,8 @@ void ViewManager::ParticleView::draw(boo::IGraphicsCommandQueue *gfxQ)
         m_vm.m_modelTest->GetInstance().ActivateLights(lights);
         m_vm.m_modelTest->Draw(flags);
 
-        zeus::CColor ctrlCol{0.7f, 0.f, 0.3f, 1.f};
+        m_spaceWarpFilter.setStrength(std::sin(m_theta * 5.f) * 0.5f + 0.5f);
-        float fac = 0.0f;
+        m_spaceWarpFilter.draw(zeus::CVector2f{0.f, 0.f});
-        zeus::CColor a = zeus::CColor::lerp(ctrlCol, zeus::CColor::skWhite, fac);
-        m_thermColdFilter.setColorA(a);
-        float bFac = 0.f;
-        float bAlpha = 1.f;
-        if (fac < 0.5f)
-        {
-            bAlpha = fac * 2.f;
-            bFac = (1.f - bAlpha) / 8.f;
-        }
-        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(zeus::CColor::skBlack);
-
-        m_thermColdFilter.setScale(std::sin(m_theta) * 0.5f + 0.5f);
-
-        m_thermColdFilter.setShift(m_random.Next() % 32);
-        //m_thermColdFilter.draw();
     }
     if (m_vm.m_partGen)
     {
@@ -380,6 +363,7 @@ void ViewManager::stop()
     m_videoVoice.reset();
     m_projManager.shutdown();
     TShader<CThermalColdFilter>::Shutdown();
+    TShader<CSpaceWarpFilter>::Shutdown();
     CElementGen::Shutdown();
     CMoviePlayer::Shutdown();
     CLineRenderer::Shutdown();

Editor/ViewManager.hpp

@@ -46,7 +46,7 @@ class ViewManager : public specter::IViewManager
     class ParticleView : public specter::View
     {
         ViewManager& m_vm;
-        CThermalColdFilter m_thermColdFilter;
+        CSpaceWarpFilter m_spaceWarpFilter;
         CRandom16 m_random;
         float m_theta = 0.f;
     public:

Runtime/Graphics/CBooRenderer.cpp

@@ -9,7 +9,6 @@
 #include "CMetroidModelInstance.hpp"
 #include "World/CAreaOctTree.hpp"
 
-#define MIRROR_RAMP_RES 32
 #define FOGVOL_RAMP_RES 256
 #define SPHERE_RAMP_RES 32
 
@@ -245,26 +244,6 @@ void CBooRenderer::HandleUnsortedModel(CAreaListItem* item, CBooModel& model)
     }
 }
 
-void CBooRenderer::GenerateMirrorRampTex(boo::IGraphicsDataFactory::Context& ctx)
-{
-    u8 data[MIRROR_RAMP_RES][MIRROR_RAMP_RES][4] = {};
-    float halfRes = MIRROR_RAMP_RES / 2.f;
-    for (int y=0 ; y<MIRROR_RAMP_RES ; ++y)
-    {
-        for (int x=0 ; x<MIRROR_RAMP_RES ; ++x)
-        {
-            zeus::CVector2f vec((x - halfRes) / halfRes, (y - halfRes) / halfRes);
-            if (vec.magnitude() <= halfRes && vec.canBeNormalized())
-                vec.normalize();
-            data[y][x][0] = zeus::clamp(0.f, vec.x, 1.f) * 255;
-            data[y][x][1] = zeus::clamp(0.f, vec.y, 1.f) * 255;
-        }
-    }
-    x150_mirrorRamp = ctx.newStaticTexture(MIRROR_RAMP_RES, MIRROR_RAMP_RES, 1,
-                                           boo::TextureFormat::RGBA8, data[0],
-                                           MIRROR_RAMP_RES * MIRROR_RAMP_RES * 4);
-}
-
 void CBooRenderer::GenerateFogVolumeRampTex(boo::IGraphicsDataFactory::Context& ctx)
 {
     u8 data[FOGVOL_RAMP_RES][FOGVOL_RAMP_RES] = {};
@@ -314,7 +293,6 @@ CBooRenderer::CBooRenderer(IObjectStore& store, IFactory& resFac)
 
     m_gfxToken = CGraphics::CommitResources([&](boo::IGraphicsDataFactory::Context& ctx) -> bool
     {
-        GenerateMirrorRampTex(ctx);
         GenerateFogVolumeRampTex(ctx);
         GenerateSphereRampTex(ctx);
         return true;
@@ -534,10 +512,6 @@ void CBooRenderer::SetWorldViewpoint(const zeus::CTransform& xf)
     xb0_viewPlane.d = xf.basis[1].dot(xf.origin);
 }
 
-void CBooRenderer::SetPerspectiveFovScalar(float)
-{
-}
-
 void CBooRenderer::SetPerspective(float fovy, float width, float height, float znear, float zfar)
 {
     CGraphics::SetPerspective(fovy, width / height, znear, zfar);
@@ -548,8 +522,16 @@ void CBooRenderer::SetPerspective(float fovy, float aspect, float znear, float z
     CGraphics::SetPerspective(fovy, aspect, znear, zfar);
 }
 
-void CBooRenderer::SetViewportOrtho(bool, float, float)
+void CBooRenderer::SetViewportOrtho(bool centered, float znear, float zfar)
 {
+    float left = centered ? CGraphics::g_ViewportResolutionHalf.x : 0;
+    float bottom = centered ? CGraphics::g_ViewportResolutionHalf.y : 0;
+    float top = centered ? CGraphics::g_ViewportResolutionHalf.y : CGraphics::g_ViewportResolution.y;
+    float right = centered ? CGraphics::g_ViewportResolutionHalf.x : CGraphics::g_ViewportResolution.x;
+
+    CGraphics::SetOrtho(left, right, top, bottom, znear, zfar);
+    CGraphics::SetViewPointMatrix(zeus::CTransform::Identity());
+    CGraphics::SetModelMatrix(zeus::CTransform::Identity());
 }
 
 void CBooRenderer::SetClippingPlanes(const zeus::CFrustum& frustum)
@@ -557,8 +539,10 @@ void CBooRenderer::SetClippingPlanes(const zeus::CFrustum& frustum)
     x44_frustumPlanes = frustum;
 }
 
-void CBooRenderer::SetViewport(int, int, int, int)
+void CBooRenderer::SetViewport(int l, int b, int w, int h)
 {
+    CGraphics::SetViewport(l, b, w, h);
+    CGraphics::SetScissor(l, b, w, h);
 }
 
 void CBooRenderer::SetDepthReadWrite(bool, bool)
@@ -603,10 +587,15 @@ void CBooRenderer::SetDebugOption(EDebugOption, int)
 
 void CBooRenderer::BeginScene()
 {
+    CGraphics::SetViewport(0, 0, CGraphics::g_ViewportResolution.x, CGraphics::g_ViewportResolution.y);
+    CGraphics::SetPerspective(75.f, CGraphics::g_ProjAspect, 1.f, 4096.f);
+    CGraphics::SetModelMatrix(zeus::CTransform::Identity());
+    CGraphics::BeginScene();
 }
 
 void CBooRenderer::EndScene()
 {
+    CGraphics::EndScene();
 }
 
 void CBooRenderer::BeginPrimitive(EPrimitiveType, int)
@@ -653,12 +642,9 @@ void CBooRenderer::EndPrimitive()
 {
 }
 
-void CBooRenderer::SetAmbientColor(const zeus::CColor&)
+void CBooRenderer::SetAmbientColor(const zeus::CColor& color)
-{
-}
-
-void CBooRenderer::SetStaticWorldAmbientColor(const zeus::CColor&)
 {
+    CGraphics::SetAmbientColor(color);
 }
 
 void CBooRenderer::DrawString(const char*, int, int)
@@ -670,12 +656,9 @@ u32 CBooRenderer::GetFPS()
     return 0;
 }
 
-void CBooRenderer::CacheReflection(TReflectionCallback, void*, bool)
+void CBooRenderer::DrawSpaceWarp(const zeus::CVector3f& pt, float)
 {
-}
 
-void CBooRenderer::DrawSpaceWarp(const zeus::CVector3f&, float)
-{
 }
 
 void CBooRenderer::DrawThermalModel(const CModel&, const zeus::CColor&, const zeus::CColor&, const float*, const float*)

Runtime/Graphics/CBooRenderer.hpp

@@ -6,8 +6,10 @@
 #include "CDrawable.hpp"
 #include "CDrawablePlaneObject.hpp"
 #include "Shaders/CThermalColdFilter.hpp"
+#include "Shaders/CSpaceWarpFilter.hpp"
 #include "CRandom16.hpp"
 #include "CPVSVisSet.hpp"
+#include "zeus/CRectangle.hpp"
 
 namespace urde
 {
@@ -85,7 +87,7 @@ class CBooRenderer : public IRenderer
     bool xee_24_ : 1;
 
     boo::ITextureR* x14c_reflectionTex = nullptr;
-    boo::ITextureS* x150_mirrorRamp = nullptr;
+    //boo::ITextureS* x150_mirrorRamp = nullptr;
     boo::ITextureS* x1b8_fogVolumeRamp = nullptr;
     boo::ITextureS* x220_sphereRamp = nullptr;
     TLockedToken<CTexture> m_thermoPaletteTex;
@@ -119,7 +121,6 @@ class CBooRenderer : public IRenderer
         u16 dummy = 0;
     };
 
-    void GenerateMirrorRampTex(boo::IGraphicsDataFactory::Context& ctx);
     void GenerateFogVolumeRampTex(boo::IGraphicsDataFactory::Context& ctx);
     void GenerateSphereRampTex(boo::IGraphicsDataFactory::Context& ctx);
     void LoadThermoPalette();
@@ -147,7 +148,6 @@ public:
     void AddDrawable(void const *, const zeus::CVector3f&, const zeus::CAABox&, int, EDrawableSorting);
     void SetDrawableCallback(TDrawableCallback&&, const void*);
     void SetWorldViewpoint(const zeus::CTransform&);
-    void SetPerspectiveFovScalar(float);
     void SetPerspective(float, float, float, float, float);
     void SetPerspective(float, float, float, float);
     void SetViewportOrtho(bool, float, float);
@@ -177,10 +177,9 @@ public:
     void PrimColor(const zeus::CColor&);
     void EndPrimitive();
     void SetAmbientColor(const zeus::CColor&);
-    void SetStaticWorldAmbientColor(const zeus::CColor&);
     void DrawString(const char*, int, int);
     u32 GetFPS();
-    void CacheReflection(TReflectionCallback, void*, bool);
+    //void CacheReflection(TReflectionCallback, void*, bool);
     void DrawSpaceWarp(const zeus::CVector3f&, float);
     void DrawThermalModel(const CModel&, const zeus::CColor&, const zeus::CColor&, const float*, const float*);
     void DrawXRayOutline(const CModel&, const float*, const float*);

Runtime/Graphics/CGraphics.cpp

@@ -79,6 +79,10 @@ void CGraphics::SetCullMode(ERglCullMode)
 {
 }
 
+void CGraphics::BeginScene()
+{
+}
+
 void CGraphics::EndScene()
 {
     /* Spinwait until g_NumBreakpointsWaiting is 0 */

Runtime/Graphics/CMakeLists.txt

@@ -1,7 +1,14 @@
 if(WIN32)
-  set(PLAT_SRCS Shaders/CLineRendererShadersHLSL.cpp Shaders/CModelShadersHLSL.cpp Shaders/CThermalColdFilterHLSL.cpp)
+  set(PLAT_SRCS 
+      Shaders/CLineRendererShadersHLSL.cpp
+      Shaders/CModelShadersHLSL.cpp
+      Shaders/CThermalColdFilterHLSL.cpp
+      Shaders/CSpaceWarpFilterHLSL.cpp)
 elseif(APPLE)
-  set(PLAT_SRCS Shaders/CLineRendererShadersMetal.cpp Shaders/CModelShadersMetal.cpp Shaders/CThermalColdFilterMetal.cpp)
+  set(PLAT_SRCS Shaders/CLineRendererShadersMetal.cpp
+      Shaders/CModelShadersMetal.cpp
+      Shaders/CThermalColdFilterMetal.cpp
+      Shaders/CSpaceWarpFilterMetal.cpp)
 endif()
 
 set(GRAPHICS_SOURCES
@@ -31,6 +38,7 @@ set(GRAPHICS_SOURCES
     Shaders/CXrayOutlineFilter.hpp Shaders/CXrayOutlineFilter.cpp Shaders/CXrayOutlineFilterGLSL.cpp
     Shaders/CThermalColdFilter.hpp Shaders/CThermalColdFilter.cpp Shaders/CThermalColdFilterGLSL.cpp
     Shaders/CThermalHotFilter.hpp Shaders/CThermalHotFilter.cpp Shaders/CThermalHotFilterGLSL.cpp
+    Shaders/CSpaceWarpFilter.hpp Shaders/CSpaceWarpFilter.cpp Shaders/CSpaceWarpFilterGLSL.cpp
     ${PLAT_SRCS})
 
 runtime_add_list(Graphics GRAPHICS_SOURCES)

Runtime/Graphics/IRenderer.hpp

@@ -54,7 +54,6 @@ public:
     virtual void AddDrawable(void const *, const zeus::CVector3f&, const zeus::CAABox&, int, EDrawableSorting)=0;
     virtual void SetDrawableCallback(TDrawableCallback&&, const void*)=0;
     virtual void SetWorldViewpoint(const zeus::CTransform&)=0;
-    virtual void SetPerspectiveFovScalar(float)=0;
     virtual void SetPerspective(float, float, float, float, float)=0;
     virtual void SetPerspective(float, float, float, float)=0;
     virtual void SetViewportOrtho(bool, float, float)=0;
@@ -84,10 +83,9 @@ public:
     virtual void PrimColor(const zeus::CColor&)=0;
     virtual void EndPrimitive()=0;
     virtual void SetAmbientColor(const zeus::CColor&)=0;
-    virtual void SetStaticWorldAmbientColor(const zeus::CColor&)=0;
     virtual void DrawString(const char*, int, int)=0;
     virtual u32 GetFPS()=0;
-    virtual void CacheReflection(TReflectionCallback, void*, bool)=0;
+    //virtual void CacheReflection(TReflectionCallback, void*, bool)=0;
     virtual void DrawSpaceWarp(const zeus::CVector3f&, float)=0;
     virtual void DrawThermalModel(const CModel&, const zeus::CColor&, const zeus::CColor&, const float*, const float*)=0;
     virtual void DrawXRayOutline(const CModel&, const float*, const float*)=0;

Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp

@@ -0,0 +1,134 @@
+#include "CSpaceWarpFilter.hpp"
+#include "Graphics/CGraphics.hpp"
+#include "Graphics/CBooRenderer.hpp"
+
+#define WARP_RAMP_RES 32
+
+namespace urde
+{
+
+void CSpaceWarpFilter::GenerateWarpRampTex(boo::IGraphicsDataFactory::Context& ctx)
+{
+    u8 data[WARP_RAMP_RES+1][WARP_RAMP_RES+1][4] = {};
+    float halfRes = WARP_RAMP_RES / 2.f;
+    for (int y=0 ; y<WARP_RAMP_RES+1 ; ++y)
+    {
+        for (int x=0 ; x<WARP_RAMP_RES+1 ; ++x)
+        {
+            zeus::CVector2f vec((x - halfRes) / halfRes, (y - halfRes) / halfRes);
+            float mag = vec.magnitude();
+            if (mag < 1.f && vec.canBeNormalized())
+            {
+                vec.normalize();
+                vec *= std::sqrt(mag);
+            }
+            data[y][x][0] = zeus::clamp(0, int((((vec.x / 2.f + 0.5f) - x / float(WARP_RAMP_RES)) + 0.5f) * 255), 255);
+            data[y][x][1] = zeus::clamp(0, int((((vec.y / 2.f + 0.5f) - y / float(WARP_RAMP_RES)) + 0.5f) * 255), 255);
+        }
+    }
+    m_warpTex = ctx.newStaticTexture(WARP_RAMP_RES+1, WARP_RAMP_RES+1, 1,
+                                     boo::TextureFormat::RGBA8, data[0],
+                                     (WARP_RAMP_RES+1) * (WARP_RAMP_RES+1) * 4);
+}
+
+CSpaceWarpFilter::CSpaceWarpFilter()
+{
+    m_token = CGraphics::g_BooFactory->commitTransaction([&](boo::IGraphicsDataFactory::Context& ctx) -> bool
+    {
+        GenerateWarpRampTex(ctx);
+        struct Vert
+        {
+            zeus::CVector2f m_pos;
+            zeus::CVector2f m_uv;
+        } verts[4] =
+        {
+        {{-1.0, -1.0}, {0.0, 0.0}},
+        {{-1.0,  1.0}, {0.0, 1.0}},
+        {{ 1.0, -1.0}, {1.0, 0.0}},
+        {{ 1.0,  1.0}, {1.0, 1.0}},
+        };
+        m_vbo = ctx.newStaticBuffer(boo::BufferUse::Vertex, verts, 32, 4);
+        m_uniBuf = ctx.newDynamicBuffer(boo::BufferUse::Uniform, sizeof(Uniform), 1);
+        m_dataBind = TShader<CSpaceWarpFilter>::BuildShaderDataBinding(ctx, *this);
+        return true;
+    });
+}
+
+void CSpaceWarpFilter::draw(const zeus::CVector2f& pt)
+{
+    /* Indirect coords are full-texture sampling when warp is completely in viewport */
+    m_uniform.m_indXf[1][1] = 1.f;
+    m_uniform.m_indXf[0][0] = 1.f;
+    m_uniform.m_indXf[2][0] = 0.f;
+    m_uniform.m_indXf[2][1] = 0.f;
+
+    /* Warp effect is fixed at 192x192 rectangle in original (1/2.5 viewport height) */
+    m_uniform.m_matrix[1][1] = 1.f / 2.5f;
+    m_uniform.m_matrix[0][0] = m_uniform.m_matrix[1][1] / CGraphics::g_ProjAspect;
+
+    SClipScreenRect clipRect = {};
+    clipRect.x4_left = ((pt[0] - m_uniform.m_matrix[0][0]) / 2.f + 0.5f) * CGraphics::g_ViewportResolution.x;
+    if (clipRect.x4_left >= CGraphics::g_ViewportResolution.x)
+        return;
+    clipRect.x8_top = ((pt[1] - m_uniform.m_matrix[1][1]) / 2.f + 0.5f) * CGraphics::g_ViewportResolution.y;
+    if (clipRect.x8_top >= CGraphics::g_ViewportResolution.y)
+        return;
+    clipRect.xc_width = CGraphics::g_ViewportResolution.x * m_uniform.m_matrix[0][0];
+    if (clipRect.x4_left + clipRect.xc_width <= 0)
+        return;
+    clipRect.x10_height = CGraphics::g_ViewportResolution.y * m_uniform.m_matrix[1][1];
+    if (clipRect.x8_top + clipRect.x10_height <= 0)
+        return;
+
+    float oldW = clipRect.xc_width;
+    if (clipRect.x4_left < 0)
+    {
+        clipRect.xc_width += clipRect.x4_left;
+        m_uniform.m_indXf[0][0] = clipRect.xc_width / oldW;
+        m_uniform.m_indXf[2][0] = -clipRect.x4_left / oldW;
+        clipRect.x4_left = 0;
+    }
+    
+    float oldH = clipRect.x10_height;
+    if (clipRect.x8_top < 0)
+    {
+        clipRect.x10_height += clipRect.x8_top;
+        m_uniform.m_indXf[1][1] = clipRect.x10_height / oldH;
+        m_uniform.m_indXf[2][1] = -clipRect.x8_top / oldH;
+        clipRect.x8_top = 0;
+    }
+
+    float tmp = clipRect.x4_left + clipRect.xc_width;
+    if (tmp >= CGraphics::g_ViewportResolution.x)
+    {
+        clipRect.xc_width = CGraphics::g_ViewportResolution.x - clipRect.x4_left;
+        m_uniform.m_indXf[0][0] = clipRect.xc_width / oldW;
+    }
+    
+    tmp = clipRect.x8_top + clipRect.x10_height;
+    if (tmp >= CGraphics::g_ViewportResolution.y)
+    {
+        clipRect.x10_height = CGraphics::g_ViewportResolution.y - clipRect.x8_top;
+        m_uniform.m_indXf[1][1] = clipRect.x10_height / oldH;
+    }
+
+    CGraphics::ResolveSpareTexture(clipRect);
+
+    /* Transform UV coordinates of rectangle within viewport and sampled scene texels (clamped to viewport bounds) */
+    zeus::CVector2f vp{CGraphics::g_ViewportResolution.x, CGraphics::g_ViewportResolution.y};
+    m_uniform.m_matrix[0][0] = clipRect.xc_width / vp.x;
+    m_uniform.m_matrix[1][1] = clipRect.x10_height / vp.y;
+    m_uniform.m_matrix[2][0] = pt.x;
+    m_uniform.m_matrix[2][1] = pt.y;
+    
+    m_uniform.m_strength.x = m_uniform.m_matrix[0][0] * m_strength * 0.5f;
+    m_uniform.m_strength.y = m_uniform.m_matrix[1][1] * m_strength * 0.5f;
+    m_uniBuf->load(&m_uniform, sizeof(m_uniform));
+
+    CGraphics::g_BooMainCommandQueue->setShaderDataBinding(m_dataBind);
+    CGraphics::g_BooMainCommandQueue->draw(0, 4);
+}
+
+URDE_SPECIALIZE_SHADER(CSpaceWarpFilter)
+
+}

Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp

@@ -0,0 +1,44 @@
+#ifndef __URDE_CSPACEWARPFILTER_HPP__
+#define __URDE_CSPACEWARPFILTER_HPP__
+
+#include "TShader.hpp"
+#include "zeus/CMatrix4f.hpp"
+#include "zeus/CColor.hpp"
+
+namespace urde
+{
+
+class CSpaceWarpFilter
+{
+    friend struct CSpaceWarpFilterGLDataBindingFactory;
+    friend struct CSpaceWarpFilterVulkanDataBindingFactory;
+
+    struct Uniform
+    {
+        zeus::CMatrix4f m_matrix;
+        zeus::CMatrix4f m_indXf;
+        zeus::CVector3f m_strength;
+    };
+    u8 m_shiftTexture[4][8][4] = {};
+    boo::GraphicsDataToken m_token;
+    boo::ITexture* m_warpTex;
+    boo::IGraphicsBufferS* m_vbo;
+    boo::IGraphicsBufferD* m_uniBuf;
+    boo::IShaderDataBinding* m_dataBind = nullptr;
+    Uniform m_uniform;
+    float m_strength = 1.f;
+
+    void GenerateWarpRampTex(boo::IGraphicsDataFactory::Context& ctx);
+
+public:
+    CSpaceWarpFilter();
+    void setStrength(float strength) { m_strength = strength; }
+    void draw(const zeus::CVector2f& pt);
+
+    using _CLS = CSpaceWarpFilter;
+#include "TShaderDecl.hpp"
+};
+
+}
+
+#endif // __URDE_CSPACEWARPFILTER_HPP__

Runtime/Graphics/Shaders/CSpaceWarpFilterGLSL.cpp

@@ -0,0 +1,120 @@
+#include "CSpaceWarpFilter.hpp"
+
+namespace urde
+{
+
+static const char* VS =
+"#version 330\n"
+BOO_GLSL_BINDING_HEAD
+"layout(location=0) in vec4 posIn;\n"
+"layout(location=1) in vec4 uvIn;\n"
+"\n"
+"UBINDING0 uniform SpaceWarpUniform\n"
+"{\n"
+"    mat4 mainMtx;\n"
+"    mat4 indMtx;\n"
+"    vec4 strength;\n"
+"};\n"
+"\n"
+"struct VertToFrag\n"
+"{\n"
+"    vec2 sceneUv;\n"
+"    vec2 indUv;\n"
+"    vec2 strength;\n"
+"};\n"
+"\n"
+"SBINDING(0) out VertToFrag vtf;\n"
+"void main()\n"
+"{\n"
+"    gl_Position = vec4(mat3(mainMtx) * vec3(posIn.xy, 1.0), 1.0);\n"
+"    vtf.sceneUv = gl_Position.xy * vec2(0.5) + vec2(0.5);\n"
+"    vtf.indUv = (mat3(indMtx) * vec3(uvIn.xy, 1.0)).xy;\n"
+"    vtf.strength = strength.xy;\n"
+"}\n";
+
+static const char* FS =
+"#version 330\n"
+BOO_GLSL_BINDING_HEAD
+"struct VertToFrag\n"
+"{\n"
+"    vec2 sceneUv;\n"
+"    vec2 indUv;\n"
+"    vec2 strength;\n"
+"};\n"
+"\n"
+"SBINDING(0) in VertToFrag vtf;\n"
+"layout(location=0) out vec4 colorOut;\n"
+"TBINDING0 uniform sampler2D sceneTex;\n"
+"TBINDING1 uniform sampler2D indTex;\n"
+"void main()\n"
+"{\n"
+"    colorOut = texture(sceneTex, vtf.sceneUv + (texture(indTex, vtf.indUv).xy * vec2(2.0) - vec2(1.0 - 1.0 / 256.0)) * vtf.strength.xy);\n"
+"}\n";
+
+URDE_DECL_SPECIALIZE_SHADER(CSpaceWarpFilter)
+
+struct CSpaceWarpFilterGLDataBindingFactory : TShader<CSpaceWarpFilter>::IDataBindingFactory
+{
+    boo::IShaderDataBinding* BuildShaderDataBinding(boo::IGraphicsDataFactory::Context& ctx, CSpaceWarpFilter& filter)
+    {
+        boo::GLDataFactory::Context& cctx = static_cast<boo::GLDataFactory::Context&>(ctx);
+
+        const boo::VertexElementDescriptor VtxVmt[] =
+        {
+            {filter.m_vbo, nullptr, boo::VertexSemantic::Position4},
+            {filter.m_vbo, nullptr, boo::VertexSemantic::UV4}
+        };
+        boo::IGraphicsBuffer* bufs[] = {filter.m_uniBuf};
+        boo::PipelineStage stages[] = {boo::PipelineStage::Vertex};
+        boo::ITexture* texs[] = {CGraphics::g_SpareTexture, filter.m_warpTex};
+        return cctx.newShaderDataBinding(TShader<CSpaceWarpFilter>::m_pipeline,
+                                         ctx.newVertexFormat(2, VtxVmt), filter.m_vbo, nullptr, nullptr,
+                                         1, bufs, stages, nullptr, nullptr, 2, texs);
+    }
+};
+
+#if BOO_HAS_VULKAN
+struct CSpaceWarpFilterVulkanDataBindingFactory : TShader<CSpaceWarpFilter>::IDataBindingFactory
+{
+    boo::IShaderDataBinding* BuildShaderDataBinding(boo::IGraphicsDataFactory::Context& ctx, CSpaceWarpFilter& filter)
+    {
+        boo::VulkanDataFactory::Context& cctx = static_cast<boo::VulkanDataFactory::Context&>(ctx);
+
+        boo::IGraphicsBuffer* bufs[] = {filter.m_uniBuf};
+        boo::ITexture* texs[] = {CGraphics::g_SpareTexture, filter.m_warpTex};
+        return cctx.newShaderDataBinding(TShader<CSpaceWarpFilter>::m_pipeline,
+                                         TShader<CSpaceWarpFilter>::m_vtxFmt,
+                                         filter.m_vbo, nullptr, nullptr, 1, bufs,
+                                         nullptr, nullptr, nullptr, 2, texs);
+    }
+};
+#endif
+
+TShader<CSpaceWarpFilter>::IDataBindingFactory* CSpaceWarpFilter::Initialize(boo::GLDataFactory::Context& ctx,
+                                                                             boo::IShaderPipeline*& pipeOut)
+{
+    const char* texNames[] = {"sceneTex", "indTex"};
+    const char* uniNames[] = {"SpaceWarpUniform"};
+    pipeOut = ctx.newShaderPipeline(VS, FS, 2, texNames, 1, uniNames, boo::BlendFactor::One,
+                                    boo::BlendFactor::Zero, boo::Primitive::TriStrips, false, false, false);
+    return new CSpaceWarpFilterGLDataBindingFactory;
+}
+
+#if BOO_HAS_VULKAN
+TShader<CSpaceWarpFilter>::IDataBindingFactory* CSpaceWarpFilter::Initialize(boo::VulkanDataFactory::Context& ctx,
+                                                                             boo::IShaderPipeline*& pipeOut,
+                                                                             boo::IVertexFormat*& vtxFmtOut)
+{
+    const boo::VertexElementDescriptor VtxVmt[] =
+    {
+        {nullptr, nullptr, boo::VertexSemantic::Position4},
+        {nullptr, nullptr, boo::VertexSemantic::UV4}
+    };
+    vtxFmtOut = ctx.newVertexFormat(2, VtxVmt);
+    pipeOut = ctx.newShaderPipeline(VS, FS, vtxFmtOut, boo::BlendFactor::One,
+                                    boo::BlendFactor::Zero, boo::Primitive::TriStrips, false, false, false);
+    return new CSpaceWarpFilterVulkanDataBindingFactory;
+}
+#endif
+
+}

Runtime/Graphics/Shaders/CSpaceWarpFilterMetal.cpp

@@ -0,0 +1,13 @@
+#include "CSpaceWarpFilter.hpp"
+
+namespace urde
+{
+
+TShader<CSpaceWarpFilter>::IDataBindingFactory* CSpaceWarpFilter::Initialize(boo::MetalDataFactory::Context& ctx,
+                                                                             boo::IShaderPipeline*& pipeOut,
+                                                                             boo::IVertexFormat*& vtxFmtOut)
+{
+    return nullptr;
+}
+
+}

Runtime/Graphics/Shaders/CThermalColdFilter.cpp

@@ -9,25 +9,24 @@ CThermalColdFilter::CThermalColdFilter()
     m_token = CGraphics::g_BooFactory->commitTransaction([&](boo::IGraphicsDataFactory::Context& ctx) -> bool
     {
         m_shiftTex = ctx.newDynamicTexture(8, 4, boo::TextureFormat::RGBA8);
-        m_vbo = ctx.newDynamicBuffer(boo::BufferUse::Vertex, 32, 4);
+
+        struct Vert
+        {
+            zeus::CVector2f m_pos;
+            zeus::CVector2f m_uv;
+        } verts[4] =
+        {
+        {{-1.0, -1.0}, {0.0, 0.0}},
+        {{-1.0,  1.0}, {0.0, 1.0}},
+        {{ 1.0, -1.0}, {1.0, 0.0}},
+        {{ 1.0,  1.0}, {1.0, 1.0}},
+        };
+        m_vbo = ctx.newStaticBuffer(boo::BufferUse::Vertex, verts, 32, 4);
         m_uniBuf = ctx.newDynamicBuffer(boo::BufferUse::Uniform, sizeof(Uniform), 1);
         m_dataBind = TShader<CThermalColdFilter>::BuildShaderDataBinding(ctx, *this);
         return true;
     });
 
-    struct Vert
-    {
-        zeus::CVector2f m_pos;
-        zeus::CVector2f m_uv;
-    } verts[4] =
-    {
-    {{-1.0, -1.0}, {0.0, 0.0}},
-    {{-1.0,  1.0}, {0.0, 1.0}},
-    {{ 1.0, -1.0}, {1.0, 0.0}},
-    {{ 1.0,  1.0}, {1.0, 1.0}},
-    };
-    m_vbo->load(verts, sizeof(verts));
-
     setShift(0);
     setScale(0.f);
 }

Runtime/Graphics/Shaders/CThermalColdFilter.hpp

@@ -23,7 +23,7 @@ class CThermalColdFilter
     u8 m_shiftTexture[4][8][4] = {};
     boo::GraphicsDataToken m_token;
     boo::ITextureD* m_shiftTex = nullptr;
-    boo::IGraphicsBufferD* m_vbo;
+    boo::IGraphicsBufferS* m_vbo;
     boo::IGraphicsBufferD* m_uniBuf;
     boo::IShaderDataBinding* m_dataBind = nullptr;
     Uniform m_uniform;

Runtime/MP1/MP1.cpp

@@ -1,10 +1,12 @@
 #include "MP1.hpp"
 #include "Graphics/Shaders/CModelShaders.hpp"
 #include "Graphics/Shaders/CThermalColdFilter.hpp"
+#include "Graphics/Shaders/CSpaceWarpFilter.hpp"
 
 namespace urde
 {
 URDE_DECL_SPECIALIZE_SHADER(CThermalColdFilter)
+URDE_DECL_SPECIALIZE_SHADER(CSpaceWarpFilter)
 
 namespace MP1
 {
@@ -33,6 +35,7 @@ void CMain::InitializeSubsystems(boo::IGraphicsDataFactory* factory,
     CGraphics::InitializeBoo(factory, cc, renderTex);
     CModelShaders::Initialize(storeMgr, factory);
     TShader<CThermalColdFilter>::Initialize();
+    TShader<CSpaceWarpFilter>::Initialize();
     CMoviePlayer::Initialize();
     CLineRenderer::Initialize();
     CElementGen::Initialize();