X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_sky.c;h=a830e85b391de20ebb21a493622738c18d1db172;hb=b2a1ec8cb2a845e6440d0dbc5a9a84464f3deecc;hp=367428c4664d3af6330532007c878775407a0550;hpb=fedb845e665b669ff11df23ce713842bd89c4ec4;p=xonotic%2Fdarkplaces.git

diff --git a/r_sky.c b/r_sky.c
index 367428c4..a830e85b 100644
--- a/r_sky.c
+++ b/r_sky.c
@@ -1,6 +1,8 @@
 
 #include "quakedef.h"
+#include "image.h"
 
+// FIXME: fix skybox after vid_restart
 cvar_t r_sky = {CVAR_SAVE, "r_sky", "1"};
 qboolean skyavailable_quake;
 qboolean skyavailable_box;
@@ -15,7 +17,6 @@ static rtexturepool_t *skytexturepool;
 static char skyname[256];
 static char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
 static rtexture_t *skyboxside[6];
-int R_SetSkyBox(char *sky);
 
 void R_SkyStartFrame(void)
 {
@@ -40,48 +41,69 @@ void R_SkyStartFrame(void)
 R_SetSkyBox
 ==================
 */
-int R_SetSkyBox(char *sky)
+void R_UnloadSkyBox(void)
 {
 	int i;
-	char name[1024];
-	qbyte *image_rgba;
-
-	if (strcmp(sky, skyname) == 0) // no change
-		return true;
-
-	skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
-	skyavailable_box = false;
-	skyname[0] = 0;
-
-	if (!sky[0])
-		return true;
-
-	if (strlen(sky) > 1000)
+	for (i = 0;i < 6;i++)
 	{
-		Con_Printf ("sky name too long (%i, max is 1000)\n", strlen(sky));
-		return false;
+		if (skyboxside[i])
+			R_FreeTexture(skyboxside[i]);
+		skyboxside[i] = NULL;;
 	}
+}
 
+void R_LoadSkyBox(void)
+{
+	int i;
+	char name[1024];
+	qbyte *image_rgba;
+	R_UnloadSkyBox();
+	if (!skyname[0])
+		return;
 	for (i = 0;i < 6;i++)
 	{
-		sprintf (name, "env/%s%s", sky, suf[i]);
-		if (!(image_rgba = loadimagepixels(name, false, 0, 0)))
+		if (snprintf(name, sizeof(name), "%s_%s", skyname, suf[i]) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
 		{
-			sprintf (name, "gfx/env/%s%s", sky, suf[i]);
-			if (!(image_rgba = loadimagepixels(name, false, 0, 0)))
+			if (snprintf(name, sizeof(name), "%s%s", skyname, suf[i]) >= (int)sizeof(name) || !(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;
+				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), "gfx/env/%s%s", skyname, suf[i]) >= (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;
+					}
+				}
 			}
 		}
-		skyboxside[i] = R_LoadTexture(skytexturepool, va("skyboxside%d", i), image_width, image_height, image_rgba, TEXTYPE_RGBA, TEXF_PRECACHE);
+		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);
 	}
+}
+
+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));
+		return false;
+	}
+
+	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;
@@ -96,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)))
@@ -104,108 +126,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;
 	}
 }
 
-int skyboxindex[6] = {0, 1, 2, 0, 2, 3};
+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]
+	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,
+	0, 0,
+	// skyside[4]
+	1, 0,
+	1, 1,
+	0, 1,
+	0, 0,
+	// skyside[5]
+	1, 0,
+	1, 1,
+	0, 1,
+	0, 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_vertex[i * 4 + 0] = (x) * 16.0f;\
-	varray_vertex[i * 4 + 1] = (y) * 16.0f;\
-	varray_vertex[i * 4 + 2] = (z) * 16.0f;\
-	varray_texcoord[0][i * 2 + 0] = (s) * (254.0f/256.0f) + (1.0f/256.0f);\
-	varray_texcoord[0][i * 2 + 1] = (t) * (254.0f/256.0f) + (1.0f/256.0f);
-
+	GL_Color(1, 1, 1, 1);
 	memset(&m, 0, sizeof(m));
-	m.blendfunc1 = GL_ONE;
-	m.blendfunc2 = GL_ZERO;
-	m.wantoverbright = false;
-	m.depthdisable = true; // don't modify or read zbuffer
-	m.tex[0] = R_GetTexture(skyboxside[3]); // front
-	R_Mesh_State(&m);
-
-	memcpy(varray_element, skyboxindex, sizeof(int[6]));
-	varray_color[0] = varray_color[4] = varray_color[8] = varray_color[12] = mesh_colorscale;
-	varray_color[1] = varray_color[5] = varray_color[9] = varray_color[13] = mesh_colorscale;
-	varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = mesh_colorscale;
-	varray_color[3] = varray_color[7] = varray_color[11] = varray_color[15] = 1;
-	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);
-	m.tex[0] = R_GetTexture(skyboxside[1]); // back
-	R_Mesh_State(&m);
-	memcpy(varray_element, skyboxindex, sizeof(int[6]));
-	varray_color[0] = varray_color[4] = varray_color[8] = varray_color[12] = mesh_colorscale;
-	varray_color[1] = varray_color[5] = varray_color[9] = varray_color[13] = mesh_colorscale;
-	varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = mesh_colorscale;
-	varray_color[3] = varray_color[7] = varray_color[11] = varray_color[15] = 1;
-	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);
-	m.tex[0] = R_GetTexture(skyboxside[0]); // right
-	R_Mesh_State(&m);
-	memcpy(varray_element, skyboxindex, sizeof(int[6]));
-	varray_color[0] = varray_color[4] = varray_color[8] = varray_color[12] = mesh_colorscale;
-	varray_color[1] = varray_color[5] = varray_color[9] = varray_color[13] = mesh_colorscale;
-	varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = mesh_colorscale;
-	varray_color[3] = varray_color[7] = varray_color[11] = varray_color[15] = 1;
-	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);
-	m.tex[0] = R_GetTexture(skyboxside[2]); // left
-	R_Mesh_State(&m);
-	memcpy(varray_element, skyboxindex, sizeof(int[6]));
-	varray_color[0] = varray_color[4] = varray_color[8] = varray_color[12] = mesh_colorscale;
-	varray_color[1] = varray_color[5] = varray_color[9] = varray_color[13] = mesh_colorscale;
-	varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = mesh_colorscale;
-	varray_color[3] = varray_color[7] = varray_color[11] = varray_color[15] = 1;
-	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);
-	m.tex[0] = R_GetTexture(skyboxside[4]); // up
-	R_Mesh_State(&m);
-	memcpy(varray_element, skyboxindex, sizeof(int[6]));
-	varray_color[0] = varray_color[4] = varray_color[8] = varray_color[12] = mesh_colorscale;
-	varray_color[1] = varray_color[5] = varray_color[9] = varray_color[13] = mesh_colorscale;
-	varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = mesh_colorscale;
-	varray_color[3] = varray_color[7] = varray_color[11] = varray_color[15] = 1;
-	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);
-	m.tex[0] = R_GetTexture(skyboxside[5]); // down
-	R_Mesh_State(&m);
-	memcpy(varray_element, skyboxindex, sizeof(int[6]));
-	varray_color[0] = varray_color[4] = varray_color[8] = varray_color[12] = mesh_colorscale;
-	varray_color[1] = varray_color[5] = varray_color[9] = varray_color[13] = mesh_colorscale;
-	varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = mesh_colorscale;
-	varray_color[3] = varray_color[7] = varray_color[11] = varray_color[15] = 1;
-	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);
+	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
@@ -214,13 +254,22 @@ static void R_SkyBox(void)
 #define skygridy 32
 #define skygridy1 (skygridy + 1)
 #define skygridyrecip (1.0f / (skygridy))
+#define skysphere_numverts (skygridx1 * skygridy1)
+#define skysphere_numtriangles (skygridx * skygridy * 2)
+static float skysphere_vertex3f[skysphere_numverts * 3];
+static float skysphere_texcoord2f[skysphere_numverts * 2];
+static int skysphere_element3i[skysphere_numtriangles * 3];
 
-static float skysphere[skygridx1*skygridy1*5];
-static int skysphereindices[skygridx*skygridy*6];
-static void skyspherecalc(float *sphere, float dx, float dy, float dz)
+static void skyspherecalc(void)
 {
-	float a, b, x, ax, ay, v[3], length;
-	int i, j, *index;
+	int i, j, *e;
+	float a, b, x, ax, ay, v[3], length, *vertex3f, *texcoord2f;
+	float dx, dy, dz;
+	dx = 16;
+	dy = 16;
+	dz = 16 / 3;
+	vertex3f = skysphere_vertex3f;
+	texcoord2f = skysphere_texcoord2f;
 	for (j = 0;j <= skygridy;j++)
 	{
 		a = j * skygridyrecip;
@@ -229,94 +278,92 @@ static void skyspherecalc(float *sphere, float dx, float dy, float dz)
 		for (i = 0;i <= skygridx;i++)
 		{
 			b = i * skygridxrecip;
-			x = cos(b * M_PI * 2);
+			x = cos((b + 0.5) * M_PI);
 			v[0] = ax*x * dx;
 			v[1] = ay*x * dy;
-			v[2] = -sin(b * M_PI * 2) * dz;
+			v[2] = -sin((b + 0.5) * M_PI) * dz;
 			length = 3.0f / sqrt(v[0]*v[0]+v[1]*v[1]+(v[2]*v[2]*9));
-			*sphere++ = v[0] * length;
-			*sphere++ = v[1] * length;
-			*sphere++ = v[0];
-			*sphere++ = v[1];
-			*sphere++ = v[2];
+			*texcoord2f++ = v[0] * length;
+			*texcoord2f++ = v[1] * length;
+			*vertex3f++ = v[0];
+			*vertex3f++ = v[1];
+			*vertex3f++ = v[2];
 		}
 	}
-	index = skysphereindices;
+	e = skysphere_element3i;
 	for (j = 0;j < skygridy;j++)
 	{
 		for (i = 0;i < skygridx;i++)
 		{
-			*index++ =  j      * skygridx1 + i;
-			*index++ =  j      * skygridx1 + i + 1;
-			*index++ = (j + 1) * skygridx1 + i;
+			*e++ =  j      * skygridx1 + i;
+			*e++ =  j      * skygridx1 + i + 1;
+			*e++ = (j + 1) * skygridx1 + i;
 
-			*index++ =  j      * skygridx1 + i + 1;
-			*index++ = (j + 1) * skygridx1 + i + 1;
-			*index++ = (j + 1) * skygridx1 + i;
+			*e++ =  j      * skygridx1 + i + 1;
+			*e++ = (j + 1) * skygridx1 + i + 1;
+			*e++ = (j + 1) * skygridx1 + i;
 		}
-		i++;
-	}
-}
-
-static void skyspherearrays(float *v, float *t, float *c, float *source, float s, float colorscale)
-{
-	int i;
-	for (i = 0;i < (skygridx1*skygridy1);i++, c += 4, t += 2, v += 4, source += 5)
-	{
-		c[0] = colorscale;
-		c[1] = colorscale;
-		c[2] = colorscale;
-		c[3] = 1;
-		t[0] = source[0] + s;
-		t[1] = source[1] + s;
-		v[0] = source[2];
-		v[1] = source[3];
-		v[2] = source[4];
 	}
 }
 
 static void R_SkySphere(void)
 {
-	int numverts, numtriangles;
-	float speedscale, speedscale2;
+	float speedscale;
 	static qboolean skysphereinitialized = false;
 	rmeshstate_t m;
+	matrix4x4_t scroll1matrix, scroll2matrix;
 	if (!skysphereinitialized)
 	{
 		skysphereinitialized = true;
-		skyspherecalc(skysphere, 16, 16, 16 / 3);
+		skyspherecalc();
 	}
 
+	// scroll speed for upper layer
 	speedscale = cl.time*8.0/128.0;
+	// wrap the scroll just to be extra kind to float accuracy
 	speedscale -= (int)speedscale;
-	speedscale2 = cl.time*16.0/128.0;
-	speedscale2 -= (int)speedscale2;
-
-	numverts = skygridx1*skygridy1;
-	numtriangles = skygridx*skygridy*2;
 
-	R_Mesh_ResizeCheck(numverts, numtriangles);
+	// 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.blendfunc1 = GL_ONE;
-	m.blendfunc2 = GL_ZERO;
-	m.wantoverbright = false;
-	m.depthdisable = true; // don't modify or read zbuffer
+	m.pointer_vertex = skysphere_vertex3f;
 	m.tex[0] = R_GetTexture(solidskytexture);
-	R_Mesh_State(&m);
-
-	memcpy(varray_element, skysphereindices, numtriangles * sizeof(int[3]));
-	skyspherearrays(varray_vertex, varray_texcoord[0], varray_color, skysphere, speedscale, mesh_colorscale);
-	R_Mesh_Draw(numverts, numtriangles);
-
-	m.blendfunc1 = GL_SRC_ALPHA;
-	m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-	m.tex[0] = R_GetTexture(alphaskytexture);
-	R_Mesh_State(&m);
-
-	memcpy(varray_element, skysphereindices, numtriangles * sizeof(int[3]));
-	skyspherearrays(varray_vertex, varray_texcoord[0], varray_color, skysphere, speedscale2, mesh_colorscale);
-	R_Mesh_Draw(numverts, numtriangles);
+	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
+		m.tex[1] = R_GetTexture(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);
+		GL_LockArrays(0, skysphere_numverts);
+		R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+		GL_LockArrays(0, 0);
+	}
+	else
+	{
+		// two pass
+		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);
+		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);
+	}
 }
 
 void R_Sky(void)
@@ -324,7 +371,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)
 		{
@@ -342,7 +389,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_ClearDepth();
+			//GL_Clear(GL_DEPTH_BUFFER_BIT);
 		}
 		*/
 	}
@@ -359,9 +406,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;
 
@@ -374,61 +420,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] = 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 = &d_8to24table[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_LoadTexture (skytexturepool, "sky_solidtexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_PRECACHE);
-
-	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] = 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] = d_8to24table[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_LoadTexture (skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
+	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)
@@ -448,10 +485,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;
@@ -465,5 +504,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);
 }
+