]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - r_sky.c
projects / xonotic / darkplaces.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Tomaz changed skybox rendering/loading to flip skyboxes and use cubemaps directly...
[xonotic/darkplaces.git] / r_sky.c
diff --git a/r_sky.c b/r_sky.c
index 0fe747a241c6d3762bf253efd4b75af0f658ea35..505db1a50b5a9daf86530a568de088ba7927610d 100644 (file)
--- a/r_sky.c
+++ b/r_sky.c
@@ -15,7 +15,41 @@ static int skyrendersphere;
 static int skyrenderbox;
 static rtexturepool_t *skytexturepool;
 static char skyname[256];
 static int skyrenderbox;
 static rtexturepool_t *skytexturepool;
 static char skyname[256];
-static char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
+
+typedef struct suffixinfo_s
+{
+       char *suffix;
+       qboolean flipx, flipy, flipdiagonal;
+}
+suffixinfo_t;
+static suffixinfo_t suffix[3][6] =
+{
+       {
+               {"px",   false, false, false},
+               {"nx",   false, false, false},
+               {"py",   false, false, false},
+               {"ny",   false, false, false},
+               {"pz",   false, false, false},
+               {"nz",   false, false, false}
+       },
+       {
+               {"posx", false, false, false},
+               {"negx", false, false, false},
+               {"posy", false, false, false},
+               {"negy", false, false, false},
+               {"posz", false, false, false},
+               {"negz", false, false, false}
+       },
+       {
+               {"rt",    true, false,  true},
+               {"lf",   false,  true,  true},
+               {"ft",    true,  true, false},
+               {"bk",   false, false, false},
+               {"up",    true, false,  true},
+               {"dn",    true, false,  true}
+       }
+};
+
 static rtexture_t *skyboxside[6];
 
 void R_SkyStartFrame(void)
 static rtexture_t *skyboxside[6];
 
 void R_SkyStartFrame(void)
@@ -48,37 +82,57 @@ void R_UnloadSkyBox(void)
        {
                if (skyboxside[i])
                        R_FreeTexture(skyboxside[i]);
        {
                if (skyboxside[i])
                        R_FreeTexture(skyboxside[i]);
-               skyboxside[i] = NULL;;
+               skyboxside[i] = NULL;
        }
 }
 
 void R_LoadSkyBox(void)
 {
        }
 }
 
 void R_LoadSkyBox(void)
 {
-       int i;
+       int i, j;
+       int indices[4] = {0,1,2,3};
        char name[1024];
        qbyte *image_rgba;
        char name[1024];
        qbyte *image_rgba;
+       qbyte *temp;
        R_UnloadSkyBox();
        if (!skyname[0])
                return;
        R_UnloadSkyBox();
        if (!skyname[0])
                return;
-       for (i = 0;i < 6;i++)
+
+       for (j=0; j<3; j++)
        {
        {
-               if (snprintf(name, sizeof(name), "%s_%s", skyname, suf[i]) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+               for (i=0; i<6; i++)
                {
                {
-                       if (snprintf(name, sizeof(name), "%s%s", skyname, suf[i]) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+                       if (snprintf(name, sizeof(name), "%s_%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
                        {
                        {
-                               if (snprintf(name, sizeof(name), "env/%s%s", skyname, suf[i]) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+                               if (snprintf(name, sizeof(name), "%s%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
                                {
                                {
-                                       if (snprintf(name, sizeof(name), "gfx/env/%s%s", skyname, suf[i]) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+                                       if (snprintf(name, sizeof(name), "env/%s%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
                                        {
                                        {
-                                               Con_Printf("Couldn't load %s_%s or %s%s or env/%s%s or gfx/env/%s%s\n", skyname, suf[i], skyname, suf[i], skyname, suf[i], skyname, suf[i]);
-                                               continue;
+                                               if (snprintf(name, sizeof(name), "gfx/env/%s%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+                                                       continue;
                                        }
                                }
                        }
                                        }
                                }
                        }
+                       temp = Mem_Alloc(tempmempool, image_width*image_height*4);
+                       Image_CopyMux (temp, image_rgba, image_width, image_height, suffix[j][i].flipx, suffix[j][i].flipy, suffix[j][i].flipdiagonal, 4, 4, indices);
+                       skyboxside[i] = R_LoadTexture2D(skytexturepool, va("skyboxside%d", i), image_width, image_height, temp, TEXTYPE_RGBA, TEXF_CLAMP | TEXF_PRECACHE, NULL);
+                       Mem_Free(image_rgba);
+                       Mem_Free(temp);
+               }
+
+               for (i=0; i<6; i++)
+               {
+                       if (skyboxside[i] == NULL)
+                       {
+                               R_UnloadSkyBox();
+                               break;
+                       }
                }
                }
-               skyboxside[i] = R_LoadTexture2D(skytexturepool, va("skyboxside%d", i), image_width, image_height, image_rgba, TEXTYPE_RGBA, TEXF_CLAMP | TEXF_PRECACHE, NULL);
-               Mem_Free(image_rgba);
+
+               if (skyboxside[0] != NULL)
+                       return;
        }
        }
+
+       Con_Printf ("Failed to load %s as skybox\n", skyname);
 }
 
 int R_SetSkyBox(const char *sky)
 }
 
 int R_SetSkyBox(const char *sky)
@@ -140,68 +194,68 @@ void LoadSky_f (void)
 float skyboxvertex3f[6*4*3] =
 {
        // skyside[0]
 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,
+        16,  16,  16,
        // skyside[1]
        -16,  16,  16,
        -16,  16, -16,
        -16, -16, -16,
        -16, -16,  16,
        // skyside[2]
        // 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[3]
        -16, -16,  16,
        -16, -16, -16,
         16, -16, -16,
         16, -16,  16,
        -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,
        // skyside[4]
        // skyside[4]
+       -16, -16,  16,
         16, -16,  16,
         16,  16,  16,
        -16,  16,  16,
         16, -16,  16,
         16,  16,  16,
        -16,  16,  16,
-       -16, -16,  16,
        // skyside[5]
        // skyside[5]
-        16,  16, -16,
         16, -16, -16,
        -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]
 };
 
 float skyboxtexcoord2f[6*4*2] =
 {
        // skyside[0]
-       1, 0,
-       1, 1,
        0, 1,
        0, 1,
+       1, 1,
+       1, 0,
        0, 0,
        // skyside[1]
        1, 0,
        0, 0,
        // skyside[1]
        1, 0,
-       1, 1,
-       0, 1,
        0, 0,
        0, 0,
+       0, 1,
+       1, 1,
        // skyside[2]
        // skyside[2]
-       1, 0,
        1, 1,
        1, 1,
-       0, 1,
-       0, 0,
-       // skyside[3]
        1, 0,
        1, 0,
-       1, 1,
+       0, 0,
        0, 1,
        0, 1,
+       // skyside[3]
        0, 0,
        0, 0,
-       // skyside[4]
-       1, 0,
+       0, 1,
        1, 1,
        1, 1,
+       1, 0,
+       // skyside[4]
        0, 1,
        0, 1,
+       1, 1,
+       1, 0,
        0, 0,
        // skyside[5]
        0, 0,
        // skyside[5]
-       1, 0,
-       1, 1,
        0, 1,
        0, 1,
+       1, 1,
+       1, 0,
        0, 0
 };
 
        0, 0
 };
 
@@ -231,20 +285,21 @@ static void R_SkyBox(void)
 {
        int i;
        rmeshstate_t m;
 {
        int i;
        rmeshstate_t m;
-       GL_ColorPointer(NULL);
        GL_Color(1, 1, 1, 1);
        memset(&m, 0, sizeof(m));
        GL_BlendFunc(GL_ONE, GL_ZERO);
        GL_DepthMask(true);
        GL_DepthTest(false); // don't modify or read zbuffer
        GL_Color(1, 1, 1, 1);
        memset(&m, 0, sizeof(m));
        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;
        m.pointer_texcoord[0] = skyboxtexcoord2f;
+       GL_LockArrays(0, 6*4);
        for (i = 0;i < 6;i++)
        {
                m.tex[0] = R_GetTexture(skyboxside[i]);
        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);
        }
                R_Mesh_Draw(6*4, 2, skyboxelements + i * 6);
        }
+       GL_LockArrays(0, 0);
 }
 
 #define skygridx 32
 }
 
 #define skygridx 32
@@ -310,7 +365,7 @@ static void R_SkySphere(void)
        float speedscale;
        static qboolean skysphereinitialized = false;
        rmeshstate_t m;
        float speedscale;
        static qboolean skysphereinitialized = false;
        rmeshstate_t m;
-       matrix4x4_t scroll1matrix, scroll2matrix, identitymatrix;
+       matrix4x4_t scroll1matrix, scroll2matrix;
        if (!skysphereinitialized)
        {
                skysphereinitialized = true;
        if (!skysphereinitialized)
        {
                skysphereinitialized = true;
@@ -325,42 +380,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);
        // 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_ColorPointer(NULL);
        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));
        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;
        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;
        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_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
-               R_Mesh_TextureMatrix(1, &identitymatrix);
+               GL_LockArrays(0, 0);
        }
        else
        {
                // two pass
        }
        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);
                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);
 
                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);
                R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+               GL_LockArrays(0, 0);
        }
        }
-       R_Mesh_TextureMatrix(0, &identitymatrix);
 }
 
 void R_Sky(void)
 }
 
 void R_Sky(void)