]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - r_sky.c
Tomaz added support for loading a cubemap as skybox
[xonotic/darkplaces.git] / r_sky.c
diff --git a/r_sky.c b/r_sky.c
index 9a60d6d9532c59d456bb5f023d5631c70951f827..5e76d2a1d44b4af39d78f1f1720550a65f43df52 100644 (file)
--- a/r_sky.c
+++ b/r_sky.c
@@ -15,7 +15,33 @@ static int skyrendersphere;
 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[2][6] =
+{
+       {
+               {"rt", false, false, false},
+               {"bk", false, false, false},
+               {"lf", false, false, false},
+               {"ft", false, false, false},
+               {"up", false, false, false},
+               {"dn", false, false, false},
+       },
+       {
+               {"px", false,  true,  true},
+               {"ny", false, false, false},
+               {"nx",  true, false,  true},
+               {"py",  true,  true, false},
+               {"pz", false,  true,  true},
+               {"nz", false,  true,  true}
+       }
+};
+
 static rtexture_t *skyboxside[6];
 
 void R_SkyStartFrame(void)
@@ -41,48 +67,87 @@ void R_SkyStartFrame(void)
 R_SetSkyBox
 ==================
 */
-int R_SetSkyBox(const char *sky)
+void R_UnloadSkyBox(void)
 {
        int i;
+       for (i = 0;i < 6;i++)
+       {
+               if (skyboxside[i])
+                       R_FreeTexture(skyboxside[i]);
+               skyboxside[i] = NULL;
+       }
+}
+
+void R_LoadSkyBox(void)
+{
+       int i, j;
+       int indices[4] = {0,1,2,3};
        char name[1024];
        qbyte *image_rgba;
+       qbyte *temp;
+       R_UnloadSkyBox();
+       if (!skyname[0])
+               return;
 
-       if (strcmp(sky, skyname) == 0) // no change
-               return true;
+       for (j=0; j<2; j++)
+       {
+               for (i=0; i<6; i++)
+               {
+                       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), "%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, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+                                       {
+                                               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);
+               }
 
-       skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
-       skyavailable_box = false;
-       skyname[0] = 0;
+               for (i=0; i<6; i++)
+               {
+                       if (skyboxside[i] == NULL)
+                       {
+                               R_UnloadSkyBox();
+                               break;
+                       }
+               }
+
+               if (skyboxside[0] != NULL)
+                       return;
+       }
+}
 
-       if (!sky[0])
+int R_SetSkyBox(const char *sky)
+{
+       if (strcmp(sky, skyname) == 0) // no change
                return true;
 
        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;
        }
 
-       for (i = 0;i < 6;i++)
-       {
-               sprintf (name, "env/%s%s", sky, suf[i]);
-               if (!(image_rgba = loadimagepixels(name, false, 0, 0)))
-               {
-                       sprintf (name, "gfx/env/%s%s", sky, suf[i]);
-                       if (!(image_rgba = loadimagepixels(name, false, 0, 0)))
-                       {
-                               Con_Printf ("Couldn't load env/%s%s or gfx/env/%s%s\n", sky, suf[i], sky, suf[i]);
-                               continue;
-                       }
-               }
-               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);
-       }
+       skyavailable_box = false;
+       strcpy(skyname, sky);
+
+       R_UnloadSkyBox();
+       R_LoadSkyBox();
+
+       if (!skyname[0])
+               return true;
 
        if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
        {
                skyavailable_box = true;
-               strcpy(skyname, sky);
                return true;
        }
        return false;
@@ -97,7 +162,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)))
@@ -105,88 +170,126 @@ 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;
        }
 }
 
+float skyboxvertex3f[6*4*3] =
+{
+       // skyside[0]
+        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[3]
+        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,
+       // skyside[5]
+        16, -16, -16,
+       -16, -16, -16,
+       -16,  16, -16,
+        16,  16, -16
+};
+
+float skyboxtexcoord2f[6*4*2] =
+{
+       // skyside[0]
+       0, 0,
+       0, 1,
+       1, 1,
+       1, 0,
+       // skyside[1]
+       0, 0,
+       0, 1,
+       1, 1,
+       1, 0,
+       // skyside[2]
+       0, 0,
+       0, 1,
+       1, 1,
+       1, 0,
+       // skyside[3]
+       0, 0,
+       0, 1,
+       1, 1,
+       1, 0,
+       // skyside[4]
+       0, 0,
+       0, 1,
+       1, 1,
+       1, 0,
+       // skyside[5]
+       0, 0,
+       0, 1,
+       1, 1,
+       1, 0
+};
+
+int skyboxelements[6*2*3] =
+{
+       // skyside[3]
+        0,  1,  2,
+        0,  2,  3,
+       // skyside[1]
+        4,  5,  6,
+        4,  6,  7,
+       // skyside[0]
+        8,  9, 10,
+        8, 10, 11,
+       // skyside[2]
+       12, 13, 14,
+       12, 14, 15,
+       // skyside[4]
+       16, 17, 18,
+       16, 18, 19,
+       // skyside[5]
+       20, 21, 22,
+       20, 22, 23
+};
+
 static void R_SkyBox(void)
 {
+       int i;
        rmeshstate_t m;
-
-#define R_SkyBoxPolyVec(i,s,t,x,y,z) \
-       varray_vertex3f[i * 3 + 0] = (x) * 16.0f;\
-       varray_vertex3f[i * 3 + 1] = (y) * 16.0f;\
-       varray_vertex3f[i * 3 + 2] = (z) * 16.0f;\
-       varray_texcoord2f[0][i * 2 + 0] = (s);\
-       varray_texcoord2f[0][i * 2 + 1] = (t);
-
-       GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
-
+       GL_Color(1, 1, 1, 1);
        memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_ONE;
-       m.blendfunc2 = GL_ZERO;
-       m.depthdisable = true; // don't modify or read zbuffer
-
-       m.tex[0] = R_GetTexture(skyboxside[3]); // front
-       R_Mesh_State(&m);
-       R_Mesh_GetSpace(4);
-       R_SkyBoxPolyVec(0, 1, 0,  1, -1,  1);
-       R_SkyBoxPolyVec(1, 1, 1,  1, -1, -1);
-       R_SkyBoxPolyVec(2, 0, 1,  1,  1, -1);
-       R_SkyBoxPolyVec(3, 0, 0,  1,  1,  1);
-       R_Mesh_Draw(4, 2, polygonelements);
-
-       m.tex[0] = R_GetTexture(skyboxside[1]); // back
-       R_Mesh_TextureState(&m);
-       R_Mesh_GetSpace(4);
-       R_SkyBoxPolyVec(0, 1, 0, -1,  1,  1);
-       R_SkyBoxPolyVec(1, 1, 1, -1,  1, -1);
-       R_SkyBoxPolyVec(2, 0, 1, -1, -1, -1);
-       R_SkyBoxPolyVec(3, 0, 0, -1, -1,  1);
-       R_Mesh_Draw(4, 2, polygonelements);
-
-       m.tex[0] = R_GetTexture(skyboxside[0]); // right
-       R_Mesh_TextureState(&m);
-       R_Mesh_GetSpace(4);
-       R_SkyBoxPolyVec(0, 1, 0,  1,  1,  1);
-       R_SkyBoxPolyVec(1, 1, 1,  1,  1, -1);
-       R_SkyBoxPolyVec(2, 0, 1, -1,  1, -1);
-       R_SkyBoxPolyVec(3, 0, 0, -1,  1,  1);
-       R_Mesh_Draw(4, 2, polygonelements);
-
-       m.tex[0] = R_GetTexture(skyboxside[2]); // left
-       R_Mesh_TextureState(&m);
-       R_Mesh_GetSpace(4);
-       R_SkyBoxPolyVec(0, 1, 0, -1, -1,  1);
-       R_SkyBoxPolyVec(1, 1, 1, -1, -1, -1);
-       R_SkyBoxPolyVec(2, 0, 1,  1, -1, -1);
-       R_SkyBoxPolyVec(3, 0, 0,  1, -1,  1);
-       R_Mesh_Draw(4, 2, polygonelements);
-
-       m.tex[0] = R_GetTexture(skyboxside[4]); // up
-       R_Mesh_TextureState(&m);
-       R_Mesh_GetSpace(4);
-       R_SkyBoxPolyVec(0, 1, 0,  1, -1,  1);
-       R_SkyBoxPolyVec(1, 1, 1,  1,  1,  1);
-       R_SkyBoxPolyVec(2, 0, 1, -1,  1,  1);
-       R_SkyBoxPolyVec(3, 0, 0, -1, -1,  1);
-       R_Mesh_Draw(4, 2, polygonelements);
-
-       m.tex[0] = R_GetTexture(skyboxside[5]); // down
-       R_Mesh_TextureState(&m);
-       R_Mesh_GetSpace(4);
-       R_SkyBoxPolyVec(0, 1, 0,  1,  1, -1);
-       R_SkyBoxPolyVec(1, 1, 1,  1, -1, -1);
-       R_SkyBoxPolyVec(2, 0, 1, -1, -1, -1);
-       R_SkyBoxPolyVec(3, 0, 0, -1,  1, -1);
-       R_Mesh_Draw(4, 2, polygonelements);
+       GL_BlendFunc(GL_ONE, GL_ZERO);
+       GL_DepthMask(true);
+       GL_DepthTest(false); // don't modify or read zbuffer
+       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(&m);
+               R_Mesh_Draw(6*4, 2, skyboxelements + i * 6);
+       }
+       GL_LockArrays(0, 0);
 }
 
 #define skygridx 32
@@ -244,18 +347,15 @@ static void skyspherecalc(void)
                        *e++ = (j + 1) * skygridx1 + i + 1;
                        *e++ = (j + 1) * skygridx1 + i;
                }
-               i++;
        }
 }
 
 static void R_SkySphere(void)
 {
-       int i;
-       float speedscale, *out2f;
-       const float *in2f;
+       float speedscale;
        static qboolean skysphereinitialized = false;
        rmeshstate_t m;
-       rcachearrayrequest_t request;
+       matrix4x4_t scroll1matrix, scroll2matrix;
        if (!skysphereinitialized)
        {
                skysphereinitialized = true;
@@ -267,104 +367,46 @@ static void R_SkySphere(void)
        // wrap the scroll just to be extra kind to float accuracy
        speedscale -= (int)speedscale;
 
-       if (r_colorscale == 1 && r_textureunits.integer >= 2)
+       // 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);
+
+       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.texmatrix[0] = scroll1matrix;
+       if (r_textureunits.integer >= 2)
        {
                // one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer
-               // LordHavoc: note that color is not set here because it does not
-               // matter with GL_REPLACE
-               memset(&m, 0, sizeof(m));
-               m.blendfunc1 = GL_ONE;
-               m.blendfunc2 = GL_ZERO;
-               m.depthdisable = true; // don't modify or read zbuffer
-               m.tex[0] = R_GetTexture(solidskytexture);
                m.tex[1] = R_GetTexture(alphaskytexture);
-               m.texcombinergb[0] = GL_REPLACE;
                m.texcombinergb[1] = gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL;
-               if (gl_mesh_copyarrays.integer)
-               {
-                       R_Mesh_State(&m);
-                       R_Mesh_GetSpace(skysphere_numverts);
-                       R_Mesh_CopyVertex3f(skysphere_vertex3f, skysphere_numverts);
-                       R_ScrollTexCoord2f(varray_texcoord2f[0], skysphere_texcoord2f, skysphere_numverts, speedscale, speedscale);
-                       R_ScrollTexCoord2f(varray_texcoord2f[1], skysphere_texcoord2f, skysphere_numverts, speedscale*2, speedscale*2);
-               }
-               else
-               {
-                       m.pointervertexcount = skysphere_numverts;
-                       m.pointer_vertex = skysphere_vertex3f;
-                       memset(&request, 0, sizeof(request));
-                       request.data_size = skysphere_numverts * sizeof(float[2]);
-                       request.id_pointer1 = skysphere_texcoord2f;
-                       request.id_number1 = CRC_Block((void *)&speedscale, sizeof(speedscale));
-                       if (R_Mesh_CacheArray(&request))
-                               R_ScrollTexCoord2f(request.data, skysphere_texcoord2f, skysphere_numverts, speedscale, speedscale);
-                       m.pointer_texcoord[0] = request.data;
-                       speedscale *= 2;
-                       request.id_number1 = CRC_Block((void *)&speedscale, sizeof(speedscale));
-                       if (R_Mesh_CacheArray(&request))
-                               R_ScrollTexCoord2f(request.data, skysphere_texcoord2f, skysphere_numverts, speedscale, speedscale);
-                       m.pointer_texcoord[1] = request.data;
-                       R_Mesh_State(&m);
-               }
+               m.pointer_texcoord[1] = skysphere_texcoord2f;
+               m.texmatrix[1] = scroll2matrix;
+               R_Mesh_State(&m);
+               GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+               GL_LockArrays(0, 0);
        }
        else
        {
                // two pass
-               GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
-               memset(&m, 0, sizeof(m));
-               m.blendfunc1 = GL_ONE;
-               m.blendfunc2 = GL_ZERO;
-               m.depthdisable = true; // don't modify or read zbuffer
-               m.tex[0] = R_GetTexture(solidskytexture);
-               if (gl_mesh_copyarrays.integer)
-               {
-                       R_Mesh_State(&m);
-                       R_Mesh_GetSpace(skysphere_numverts);
-                       R_Mesh_CopyVertex3f(skysphere_vertex3f, skysphere_numverts);
-                       R_ScrollTexCoord2f(varray_texcoord2f[0], skysphere_texcoord2f, skysphere_numverts, speedscale, speedscale);
-               }
-               else
-               {
-                       m.pointervertexcount = skysphere_numverts;
-                       m.pointer_vertex = skysphere_vertex3f;
-                       memset(&request, 0, sizeof(request));
-                       request.data_size = skysphere_numverts * sizeof(float[2]);
-                       request.id_pointer1 = skysphere_texcoord2f;
-                       request.id_number1 = CRC_Block((void *)&speedscale, sizeof(speedscale));
-                       if (R_Mesh_CacheArray(&request))
-                               R_ScrollTexCoord2f(request.data, skysphere_texcoord2f, skysphere_numverts, speedscale, speedscale);
-                       m.pointer_texcoord[0] = request.data;
-                       R_Mesh_State(&m);
-               }
+               R_Mesh_State(&m);
+               GL_LockArrays(0, skysphere_numverts);
                R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+               GL_LockArrays(0, 0);
 
-               // scroll the lower cloud layer twice as fast (just like quake did)
-               speedscale *= 2;
-
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                m.tex[0] = R_GetTexture(alphaskytexture);
-               if (gl_mesh_copyarrays.integer)
-               {
-                       R_Mesh_State(&m);
-                       R_Mesh_GetSpace(skysphere_numverts);
-                       R_Mesh_CopyVertex3f(skysphere_vertex3f, skysphere_numverts);
-                       R_ScrollTexCoord2f(varray_texcoord2f[0], skysphere_texcoord2f, skysphere_numverts, speedscale, speedscale);
-               }
-               else
-               {
-                       m.pointervertexcount = skysphere_numverts;
-                       m.pointer_vertex = skysphere_vertex3f;
-                       request.data_size = skysphere_numverts * sizeof(float[2]);
-                       request.id_pointer1 = skysphere_texcoord2f;
-                       request.id_number1 = CRC_Block((void *)&speedscale, sizeof(speedscale));
-                       if (R_Mesh_CacheArray(&request))
-                               R_ScrollTexCoord2f(request.data, skysphere_texcoord2f, skysphere_numverts, speedscale, speedscale);
-                       m.pointer_texcoord[0] = request.data;
-                       R_Mesh_State(&m);
-               }
+               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);
        }
 }
 
@@ -373,7 +415,7 @@ void R_Sky(void)
        matrix4x4_t skymatrix;
        if (skyrendermasked)
        {
-               Matrix4x4_CreateTranslate(&skymatrix, r_origin[0], r_origin[1], r_origin[2]);
+               Matrix4x4_CreateTranslate(&skymatrix, r_vieworigin[0], r_vieworigin[1], r_vieworigin[2]);
                R_Mesh_Matrix(&skymatrix);
                if (skyrendersphere)
                {
@@ -391,8 +433,7 @@ void R_Sky(void)
                        // this modifies the depth buffer so we have to clear it afterward
                        //R_SkyRoom();
                        // clear the depthbuffer that was used while rendering the skyroom
-                       //R_Mesh_EndBatch();
-                       //qglClear(GL_DEPTH_BUFFER_BIT);
+                       //GL_Clear(GL_DEPTH_BUFFER_BIT);
                }
                */
        }
@@ -409,9 +450,8 @@ A sky texture is 256*128, with the right side being a masked overlay
 */
 void R_InitSky (qbyte *src, int bytesperpixel)
 {
-       int i, j, p, r, g, b;
-       qbyte skyupperlayerpixels[128*128*4], skylowerlayerpixels[128*128*4];
-       unsigned trans[128*128], transpix, *rgba;
+       int i, j;
+       unsigned solidpixels[128*128], alphapixels[128*128];
 
        skyavailable_quake = true;
 
@@ -424,61 +464,52 @@ void R_InitSky (qbyte *src, int bytesperpixel)
        if (bytesperpixel == 4)
        {
                for (i = 0;i < 128;i++)
+               {
                        for (j = 0;j < 128;j++)
-                               trans[(i*128) + j] = ((unsigned *)src)[i*256+j+128];
+                       {
+                               solidpixels[(i*128) + j] = ((unsigned *)src)[i*256+j+128];
+                               alphapixels[(i*128) + j] = ((unsigned *)src)[i*256+j];
+                       }
+               }
        }
        else
        {
                // make an average value for the back to avoid
                // a fringe on the top level
+               int p, r, g, b;
+               union
+               {
+                       unsigned int i;
+                       unsigned char b[4];
+               }
+               rgba;
                r = g = b = 0;
-               for (i=0 ; i<128 ; i++)
+               for (i = 0;i < 128;i++)
                {
-                       for (j=0 ; j<128 ; j++)
+                       for (j = 0;j < 128;j++)
                        {
-                               p = src[i*256 + j + 128];
-                               rgba = &palette_complete[p];
-                               trans[(i*128) + j] = *rgba;
-                               r += ((qbyte *)rgba)[0];
-                               g += ((qbyte *)rgba)[1];
-                               b += ((qbyte *)rgba)[2];
+                               rgba.i = palette_complete[src[i*256 + j + 128]];
+                               r += rgba.b[0];
+                               g += rgba.b[1];
+                               b += rgba.b[2];
                        }
                }
-
-               ((qbyte *)&transpix)[0] = r/(128*128);
-               ((qbyte *)&transpix)[1] = g/(128*128);
-               ((qbyte *)&transpix)[2] = b/(128*128);
-               ((qbyte *)&transpix)[3] = 0;
-       }
-
-       memcpy(skyupperlayerpixels, trans, 128*128*4);
-
-       solidskytexture = R_LoadTexture2D(skytexturepool, "sky_solidtexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
-
-       if (bytesperpixel == 4)
-       {
+               rgba.b[0] = r/(128*128);
+               rgba.b[1] = g/(128*128);
+               rgba.b[2] = b/(128*128);
+               rgba.b[3] = 0;
                for (i = 0;i < 128;i++)
-                       for (j = 0;j < 128;j++)
-                               trans[(i*128) + j] = ((unsigned *)src)[i*256+j];
-       }
-       else
-       {
-               for (i=0 ; i<128 ; i++)
                {
-                       for (j=0 ; j<128 ; j++)
+                       for (j = 0;j < 128;j++)
                        {
-                               p = src[i*256 + j];
-                               if (p == 0)
-                                       trans[(i*128) + j] = transpix;
-                               else
-                                       trans[(i*128) + j] = palette_complete[p];
+                               solidpixels[(i*128) + j] = palette_complete[src[i*256 + j + 128]];
+                               alphapixels[(i*128) + j] = (p = src[i*256 + j]) ? palette_complete[p] : rgba.i;
                        }
                }
        }
 
-       memcpy(skylowerlayerpixels, trans, 128*128*4);
-
-       alphaskytexture = R_LoadTexture2D(skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+       solidskytexture = R_LoadTexture2D(skytexturepool, "sky_solidtexture", 128, 128, (qbyte *) solidpixels, TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
+       alphaskytexture = R_LoadTexture2D(skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) alphapixels, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
 
 void R_ResetQuakeSky(void)
@@ -498,10 +529,12 @@ static void r_sky_start(void)
        skytexturepool = R_AllocTexturePool();
        solidskytexture = NULL;
        alphaskytexture = NULL;
+       R_LoadSkyBox();
 }
 
 static void r_sky_shutdown(void)
 {
+       R_UnloadSkyBox();
        R_FreeTexturePool(&skytexturepool);
        solidskytexture = NULL;
        alphaskytexture = NULL;
@@ -515,5 +548,8 @@ void R_Sky_Init(void)
 {
        Cmd_AddCommand ("loadsky", &LoadSky_f);
        Cvar_RegisterVariable (&r_sky);
+       R_ResetSkyBox();
+       R_ResetQuakeSky();
        R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
 }
+