reorganized a lot of renderer variables into r_refdef, and split some things out...

[xonotic/darkplaces.git] / r_sky.c

diff --git a/r_sky.c b/r_sky.c
index 8ed9da7b5f6d4bb9176fd068f6c80478290e0261..487ebb5ccec6b128ddcd4a757f08726409a890b4 100644 (file)
--- a/r_sky.c
+++ b/r_sky.c
@@ -56,7 +56,7 @@ void R_SkyStartFrame(void)
        skyrendersphere = false;
        skyrenderbox = false;
        skyrendermasked = false;
-       if (r_sky.integer && !fogenabled)
+       if (r_sky.integer && !r_refdef.fogenabled)
        {
                if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
                        skyrenderbox = true;
@@ -268,19 +268,18 @@ int skyboxelements[6*2*3] =
 static void R_SkyBox(void)
 {
        int i;
-       rmeshstate_t m;
        GL_Color(1, 1, 1, 1);
-       memset(&m, 0, sizeof(m));
        GL_BlendFunc(GL_ONE, GL_ZERO);
        GL_DepthMask(false);
        GL_DepthTest(false); // don't modify or read zbuffer
-       m.pointer_vertex = skyboxvertex3f;
-       m.pointer_texcoord[0] = skyboxtexcoord2f;
+       R_Mesh_VertexPointer(skyboxvertex3f);
+       R_Mesh_ColorPointer(NULL);
+       R_Mesh_ResetTextureState();
+       R_Mesh_TexCoordPointer(0, 2, skyboxtexcoord2f);
        GL_LockArrays(0, 6*4);
        for (i = 0;i < 6;i++)
        {
-               m.tex[0] = R_GetTexture(skyboxside[i]);
-               R_Mesh_State(&m);
+               R_Mesh_TexBind(0, R_GetTexture(skyboxside[i]));
                R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6);
        }
        GL_LockArrays(0, 0);
@@ -348,7 +347,6 @@ static void R_SkySphere(void)
 {
        float speedscale;
        static qboolean skysphereinitialized = false;
-       rmeshstate_t m;
        matrix4x4_t scroll1matrix, scroll2matrix;
        if (!skysphereinitialized)
        {
@@ -371,19 +369,19 @@ static void R_SkySphere(void)
        GL_BlendFunc(GL_ONE, GL_ZERO);
        GL_DepthMask(true);
        GL_DepthTest(false); // don't modify or read zbuffer
-       memset(&m, 0, sizeof(m));
-       m.pointer_vertex = skysphere_vertex3f;
-       m.tex[0] = R_GetTexture(r_refdef.worldmodel->brush.solidskytexture);
-       m.pointer_texcoord[0] = skysphere_texcoord2f;
-       m.texmatrix[0] = scroll1matrix;
+       R_Mesh_VertexPointer(skysphere_vertex3f);
+       R_Mesh_ColorPointer(NULL);
+       R_Mesh_ResetTextureState();
+       R_Mesh_TexBind(0, R_GetTexture(r_refdef.worldmodel->brush.solidskytexture));
+       R_Mesh_TexCoordPointer(0, 2, skysphere_texcoord2f);
+       R_Mesh_TexMatrix(0, &scroll1matrix);
        if (r_textureunits.integer >= 2)
        {
                // one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer
-               m.tex[1] = R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture);
-               m.texcombinergb[1] = gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL;
-               m.pointer_texcoord[1] = skysphere_texcoord2f;
-               m.texmatrix[1] = scroll2matrix;
-               R_Mesh_State(&m);
+               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_Mesh_TexCoordPointer(1, 2, skysphere_texcoord2f);
+               R_Mesh_TexMatrix(1, &scroll2matrix);
                GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
                GL_LockArrays(0, 0);
@@ -391,15 +389,12 @@ static void R_SkySphere(void)
        else
        {
                // two pass
-               R_Mesh_State(&m);
                GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
-               GL_LockArrays(0, 0);
 
                GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-               m.tex[0] = R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture);
-               m.texmatrix[0] = scroll2matrix;
-               R_Mesh_State(&m);
+               R_Mesh_TexBind(0, R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture));
+               R_Mesh_TexMatrix(0, &scroll2matrix);
                GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
                GL_LockArrays(0, 0);
@@ -411,7 +406,7 @@ void R_Sky(void)
        matrix4x4_t skymatrix;
        if (skyrendermasked)
        {
-               Matrix4x4_CreateTranslate(&skymatrix, r_vieworigin[0], r_vieworigin[1], r_vieworigin[2]);
+               Matrix4x4_CreateTranslate(&skymatrix, r_view.origin[0], r_view.origin[1], r_view.origin[2]);
                R_Mesh_Matrix(&skymatrix);
                if (skyrendersphere)
                {
@@ -433,6 +428,7 @@ void R_Sky(void)
                }
                */
                GL_DepthTest(true);
+               GL_DepthMask(true);
        }
 }