Tomaz fixed the skybox arrangement to match glquake/quake2/quake3/3dstudio

[xonotic/darkplaces.git] / r_sky.c

diff --git a/r_sky.c b/r_sky.c
index 4bc07d89dceb6ffba94842e8c49fe86cbef2fd44..f70477e5c9a8788fd73f688a7c049c7cd2633648 100644 (file)
--- a/r_sky.c
+++ b/r_sky.c
@@ -88,7 +88,7 @@ int R_SetSkyBox(const char *sky)
 
        if (strlen(sky) > 1000)
        {
-               Con_Printf ("sky name too long (%i, max is 1000)\n", strlen(sky));
+               Con_Printf("sky name too long (%i, max is 1000)\n", strlen(sky));
                return false;
        }
 
@@ -118,7 +118,7 @@ void LoadSky_f (void)
                if (skyname[0])
                        Con_Printf("current sky: %s\n", skyname);
                else
-                       Con_Printf("no skybox has been set\n");
+                       Con_Print("no skybox has been set\n");
                break;
        case 2:
                if (R_SetSkyBox(Cmd_Argv(1)))
@@ -126,13 +126,13 @@ void LoadSky_f (void)
                        if (skyname[0])
                                Con_Printf("skybox set to %s\n", skyname);
                        else
-                               Con_Printf("skybox disabled\n");
+                               Con_Print("skybox disabled\n");
                }
                else
                        Con_Printf("failed to load skybox %s\n", Cmd_Argv(1));
                break;
        default:
-               Con_Printf("usage: loadsky skyname\n");
+               Con_Print("usage: loadsky skyname\n");
                break;
        }
 }
@@ -140,69 +140,69 @@ void LoadSky_f (void)
 float skyboxvertex3f[6*4*3] =
 {
        // skyside[0]
-        16,  16,  16,
+        16, -16,  16,
+        16, -16, -16,
         16,  16, -16,
-       -16,  16, -16,
-       -16,  16,  16,
+        16,  16,  16,
        // skyside[1]
-       -16,  16,  16,
-       -16,  16, -16,
-       -16, -16, -16,
-       -16, -16,  16,
-       // skyside[2]
        -16, -16,  16,
        -16, -16, -16,
         16, -16, -16,
         16, -16,  16,
+       // skyside[2]
+       -16,  16,  16,
+       -16,  16, -16,
+       -16, -16, -16,
+       -16, -16,  16,
        // skyside[3]
-        16, -16,  16,
-        16, -16, -16,
-        16,  16, -16,
         16,  16,  16,
+        16,  16, -16,
+       -16,  16, -16,
+       -16,  16,  16,
        // skyside[4]
+       -16, -16,  16,
         16, -16,  16,
         16,  16,  16,
        -16,  16,  16,
-       -16, -16,  16,
        // skyside[5]
-        16,  16, -16,
         16, -16, -16,
        -16, -16, -16,
-       -16,  16, -16
+       -16,  16, -16,
+        16,  16, -16
 };
 
 float skyboxtexcoord2f[6*4*2] =
 {
        // skyside[0]
-       1, 0,
-       1, 1,
-       0, 1,
        0, 0,
-       // skyside[1]
-       1, 0,
-       1, 1,
        0, 1,
-       0, 0,
-       // skyside[2]
-       1, 0,
        1, 1,
-       0, 1,
-       0, 0,
-       // skyside[3]
        1, 0,
-       1, 1,
-       0, 1,
+       // skyside[1]
        0, 0,
-       // skyside[4]
-       1, 0,
+       0, 1,
        1, 1,
+       1, 0,
+       // skyside[2]
+       0, 0,
        0, 1,
+       1, 1,
+       1, 0,
+       // skyside[3]
        0, 0,
-       // skyside[5]
+       0, 1,
+       1, 1,
        1, 0,
+       // skyside[4]
+       0, 0,
+       0, 1,
        1, 1,
+       1, 0,
+       // skyside[5]
+       0, 0,
        0, 1,
-       0, 0
+       1, 1,
+       1, 0
 };
 
 int skyboxelements[6*2*3] =
@@ -236,14 +236,16 @@ static void R_SkyBox(void)
        GL_BlendFunc(GL_ONE, GL_ZERO);
        GL_DepthMask(true);
        GL_DepthTest(false); // don't modify or read zbuffer
-       GL_VertexPointer(skyboxvertex3f);
+       m.pointer_vertex = skyboxvertex3f;
        m.pointer_texcoord[0] = skyboxtexcoord2f;
+       GL_LockArrays(0, 6*4);
        for (i = 0;i < 6;i++)
        {
                m.tex[0] = R_GetTexture(skyboxside[i]);
-               R_Mesh_State_Texture(&m);
+               R_Mesh_State(&m);
                R_Mesh_Draw(6*4, 2, skyboxelements + i * 6);
        }
+       GL_LockArrays(0, 0);
 }
 
 #define skygridx 32
@@ -309,7 +311,7 @@ static void R_SkySphere(void)
        float speedscale;
        static qboolean skysphereinitialized = false;
        rmeshstate_t m;
-       matrix4x4_t scroll1matrix, scroll2matrix, identitymatrix;
+       matrix4x4_t scroll1matrix, scroll2matrix;
        if (!skysphereinitialized)
        {
                skysphereinitialized = true;
@@ -324,41 +326,44 @@ static void R_SkySphere(void)
        // scroll the lower cloud layer twice as fast (just like quake did)
        Matrix4x4_CreateTranslate(&scroll1matrix, speedscale, speedscale, 0);
        Matrix4x4_CreateTranslate(&scroll2matrix, speedscale * 2, speedscale * 2, 0);
-       Matrix4x4_CreateIdentity(&identitymatrix);
 
-       GL_VertexPointer(skysphere_vertex3f);
        GL_Color(1, 1, 1, 1);
        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(solidskytexture);
        m.pointer_texcoord[0] = skysphere_texcoord2f;
-       R_Mesh_TextureMatrix(0, &scroll1matrix);
+       m.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(alphaskytexture);
                m.texcombinergb[1] = gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL;
                m.pointer_texcoord[1] = skysphere_texcoord2f;
-               R_Mesh_State_Texture(&m);
-               R_Mesh_TextureMatrix(1, &scroll2matrix);
+               m.texmatrix[1] = scroll2matrix;
+               R_Mesh_State(&m);
+               GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
-               R_Mesh_TextureMatrix(1, &identitymatrix);
+               GL_LockArrays(0, 0);
        }
        else
        {
                // two pass
-               R_Mesh_State_Texture(&m);
+               R_Mesh_State(&m);
+               GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(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(alphaskytexture);
-               R_Mesh_State_Texture(&m);
-               R_Mesh_TextureMatrix(0, &scroll2matrix);
+               m.texmatrix[0] = scroll2matrix;
+               R_Mesh_State(&m);
+               GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+               GL_LockArrays(0, 0);
        }
-       R_Mesh_TextureMatrix(0, &identitymatrix);
 }
 
 void R_Sky(void)