xrRenderGL: fixed sun shafts

OpenXRay · Jul 3, 2019 · 3f97e8c · 3f97e8c
1 parent c61a7a7
commit 3f97e8c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/res/gamedata/shaders/gl/accum_volumetric_sun.ps b/res/gamedata/shaders/gl/accum_volumetric_sun.ps
diff --git a/src/Layers/xrRenderPC_GL/gl_rendertarget_accum_direct.cpp b/src/Layers/xrRenderPC_GL/gl_rendertarget_accum_direct.cpp
@@ -1151,8 +1151,10 @@ void CRenderTarget::accum_direct_volumetric(u32 sub_phase, const u32 Offset, con
         light* fuckingsun = (light*)RImplementation.Lights.sun._get();
 
         // Common constants (light-related)
-        Fvector L_clr;
+        Fvector L_dir, L_clr;
         L_clr.set(fuckingsun->color.r, fuckingsun->color.g, fuckingsun->color.b);
+        Device.mView.transform_dir(L_dir, fuckingsun->direction);
+        L_dir.normalize();
 
         //	Use g_combine_2UV that was set up by accum_direct
         //	RCache.set_Geometry			(g_combine_2UV);
@@ -1161,16 +1163,29 @@ void CRenderTarget::accum_direct_volumetric(u32 sub_phase, const u32 Offset, con
         //RCache.set_Element			(s_accum_direct_volumetric->E[sub_phase]);
         RCache.set_Element(Element);
         RCache.set_CullMode(CULL_CCW);
-        //		RCache.set_c				("Ldynamic_dir",		L_dir.x,L_dir.y,L_dir.z,0 );
+        RCache.set_c("Ldynamic_dir", L_dir.x, L_dir.y, L_dir.z, 0);
         RCache.set_c("Ldynamic_color", L_clr.x, L_clr.y, L_clr.z, 0);
         RCache.set_c("m_shadow", mShadow);
         Fmatrix m_Texgen;
         m_Texgen.identity();
         RCache.xforms.set_W(m_Texgen);
         RCache.xforms.set_V(Device.mView);
         RCache.xforms.set_P(Device.mProject);
-        u_compute_texgen_screen(m_Texgen);
-
+        //u_compute_texgen_screen(m_Texgen);
+        float _w = float(Device.dwWidth);
+        float _h = float(Device.dwHeight);
+        float o_w = (.5f / _w);
+        float o_h = (.5f / _h);
+        Fmatrix m_TexelAdjust =
+        {
+            0.5f, 0.0f, 0.0f, 0.0f,
+            0.0f, 0.5f, 0.0f, 0.0f,
+            0.0f, 0.0f, 1.0f, 0.0f,
+            //	Removing half pixel offset
+            0.5f + o_w, 0.5f + o_h, 0.0f, 1.0f
+            //0.5f, 0.5f , 0.0f, 1.0f
+        };
+        m_Texgen.mul(m_TexelAdjust, RCache.xforms.m_wvp);
         RCache.set_c("m_texgen", m_Texgen);
         //		RCache.set_c				("m_sunmask",			m_clouds_shadow);