fix bug in skybox render + r_glsl_usegeneric + fog; add gamma to postprocessing shader

[xonotic/darkplaces.git] / r_sky.c

diff --git a/r_sky.c b/r_sky.c
index 5d6362f803733babb4e4cb080a97f94ee4b90cc1..63df9efb869cb026909d10a800cab38f57b691ee 100644 (file)
--- a/r_sky.c
+++ b/r_sky.c
@@ -16,11 +16,11 @@ static char skyname[MAX_QPATH];
 
 typedef struct suffixinfo_s
 {
-       char *suffix;
+       const char *suffix;
        qboolean flipx, flipy, flipdiagonal;
 }
 suffixinfo_t;
-static suffixinfo_t suffix[3][6] =
+static const suffixinfo_t suffix[3][6] =
 {
        {
                {"px",   false, false, false},
@@ -56,11 +56,11 @@ void R_SkyStartFrame(void)
        skyrendersphere = false;
        skyrenderbox = false;
        skyrendermasked = false;
-       if (r_sky.integer && !r_refdef.fogenabled)
+       if (r_sky.integer && !(r_refdef.fogenabled && r_refdef.fogmasktable[FOGMASKTABLEWIDTH-1] < (1.0f / 256.0f)))
        {
                if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
                        skyrenderbox = true;
-               else if (r_refdef.worldmodel && r_refdef.worldmodel->brush.solidskytexture)
+               else if (r_refdef.scene.worldmodel && r_refdef.scene.worldmodel->brush.solidskytexture)
                        skyrendersphere = true;
                // for depth-masked sky, render the sky on the first sky surface encountered
                skyrendernow = true;
@@ -175,7 +175,7 @@ void LoadSky_f (void)
        }
 }
 
-float skyboxvertex3f[6*4*3] =
+static const float skyboxvertex3f[6*4*3] =
 {
        // skyside[0]
         16, -16,  16,
@@ -209,7 +209,7 @@ float skyboxvertex3f[6*4*3] =
         16,  16, -16
 };
 
-float skyboxtexcoord2f[6*4*2] =
+static const float skyboxtexcoord2f[6*4*2] =
 {
        // skyside[0]
        0, 1,
@@ -243,7 +243,7 @@ float skyboxtexcoord2f[6*4*2] =
        0, 0
 };
 
-int skyboxelements[6*2*3] =
+static const int skyboxelements[6*2*3] =
 {
        // skyside[3]
         0,  1,  2,
@@ -268,8 +268,8 @@ int skyboxelements[6*2*3] =
 static void R_SkyBox(void)
 {
        int i;
-       // FIXME: fixed function path can't properly handle r_view.colorscale > 1
-       GL_Color(1 * r_view.colorscale, 1 * r_view.colorscale, 1 * r_view.colorscale, 1);
+       // FIXME: fixed function path can't properly handle r_refdef.view.colorscale > 1
+       GL_Color(1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1);
        GL_BlendFunc(GL_ONE, GL_ZERO);
        GL_CullFace(GL_NONE);
        GL_DepthMask(false);
@@ -280,12 +280,26 @@ static void R_SkyBox(void)
        R_Mesh_ColorPointer(NULL, 0, 0);
        R_Mesh_ResetTextureState();
        R_Mesh_TexCoordPointer(0, 2, skyboxtexcoord2f, 0, 0);
+       R_SetupGenericShader(true);
        GL_LockArrays(0, 6*4);
        for (i = 0;i < 6;i++)
        {
                R_Mesh_TexBind(0, R_GetTexture(skyboxside[i]));
                R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6, 0, 0);
        }
+
+       if(r_refdef.fogenabled)
+       {
+               R_SetupGenericShader(false);
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+               GL_Color(r_refdef.fogcolor[0], r_refdef.fogcolor[1], r_refdef.fogcolor[2], 1 - r_refdef.fogmasktable[FOGMASKTABLEWIDTH-1]);
+               for (i = 0;i < 6;i++)
+               {
+                       R_Mesh_TexBind(0, 0);
+                       R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6, 0, 0);
+               }
+       }
+
        GL_LockArrays(0, 0);
 }
 
@@ -361,16 +375,16 @@ static void R_SkySphere(void)
        // wrap the scroll values just to be extra kind to float accuracy
 
        // scroll speed for upper layer
-       speedscale = r_refdef.time*r_skyscroll1.value*8.0/128.0;
+       speedscale = r_refdef.scene.time*r_skyscroll1.value*8.0/128.0;
        speedscale -= (int)speedscale;
        Matrix4x4_CreateTranslate(&scroll1matrix, speedscale, speedscale, 0);
        // scroll speed for lower layer (transparent layer)
-       speedscale = r_refdef.time*r_skyscroll2.value*8.0/128.0;
+       speedscale = r_refdef.scene.time*r_skyscroll2.value*8.0/128.0;
        speedscale -= (int)speedscale;
        Matrix4x4_CreateTranslate(&scroll2matrix, speedscale, speedscale, 0);
 
-       // FIXME: fixed function path can't properly handle r_view.colorscale > 1
-       GL_Color(1 * r_view.colorscale, 1 * r_view.colorscale, 1 * r_view.colorscale, 1);
+       // FIXME: fixed function path can't properly handle r_refdef.view.colorscale > 1
+       GL_Color(1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1);
        GL_BlendFunc(GL_ONE, GL_ZERO);
        GL_CullFace(GL_NONE);
        GL_DepthMask(true);
@@ -380,33 +394,46 @@ static void R_SkySphere(void)
        R_Mesh_VertexPointer(skysphere_vertex3f, 0, 0);
        R_Mesh_ColorPointer(NULL, 0, 0);
        R_Mesh_ResetTextureState();
-       R_Mesh_TexBind(0, R_GetTexture(r_refdef.worldmodel->brush.solidskytexture));
+       R_Mesh_TexBind(0, R_GetTexture(r_refdef.scene.worldmodel->brush.solidskytexture));
        R_Mesh_TexCoordPointer(0, 2, skysphere_texcoord2f, 0, 0);
        R_Mesh_TexMatrix(0, &scroll1matrix);
-       if (r_textureunits.integer >= 2 && r_view.colorscale == 1)
+       if (r_textureunits.integer >= 2 && r_refdef.view.colorscale == 1)
        {
                // one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer
-               R_Mesh_TexBind(1, R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture));
-               R_Mesh_TexCombine(1, gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL, GL_MODULATE, 1, 1);
+               R_SetupGenericTwoTextureShader(GL_DECAL);
+               R_Mesh_TexBind(1, R_GetTexture(r_refdef.scene.worldmodel->brush.alphaskytexture));
                R_Mesh_TexCoordPointer(1, 2, skysphere_texcoord2f, 0, 0);
                R_Mesh_TexMatrix(1, &scroll2matrix);
                GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
                GL_LockArrays(0, 0);
+               R_Mesh_TexBind(1, 0);
        }
        else
        {
                // two pass
+               R_SetupGenericShader(true);
                GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
 
                GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-               R_Mesh_TexBind(0, R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture));
+               R_Mesh_TexBind(0, R_GetTexture(r_refdef.scene.worldmodel->brush.alphaskytexture));
                R_Mesh_TexMatrix(0, &scroll2matrix);
                GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
                GL_LockArrays(0, 0);
        }
+
+       if(r_refdef.fogenabled)
+       {
+               R_SetupGenericShader(false);
+               R_Mesh_TexBind(0, 0);
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+               GL_Color(r_refdef.fogcolor[0], r_refdef.fogcolor[1], r_refdef.fogcolor[2], 1 - r_refdef.fogmasktable[FOGMASKTABLEWIDTH-1]);
+               GL_LockArrays(0, skysphere_numverts);
+               R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
+               GL_LockArrays(0, 0);
+       }
 }
 
 void R_Sky(void)
@@ -414,7 +441,7 @@ void R_Sky(void)
        matrix4x4_t skymatrix;
        if (skyrendermasked)
        {
-               Matrix4x4_CreateTranslate(&skymatrix, r_view.origin[0], r_view.origin[1], r_view.origin[2]);
+               Matrix4x4_CreateTranslate(&skymatrix, r_refdef.view.origin[0], r_refdef.view.origin[1], r_refdef.view.origin[2]);
                R_Mesh_Matrix(&skymatrix);
                if (skyrendersphere)
                {