X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_sky.c;h=71bc3c04016f53c47c9c3528d9a5385b88c0818b;hp=3e9d9bf58945eed13182d45f2b1d768a4e3dca75;hb=4a0c55c2f53d3b18ae28eddb822a0c670636c0f9;hpb=bc8b80ee19f7a87e326fa765427d0c4e8dfe9940

diff --git a/r_sky.c b/r_sky.c
index 3e9d9bf5..71bc3c04 100644
--- a/r_sky.c
+++ b/r_sky.c
@@ -1,52 +1,54 @@
 
 #include "quakedef.h"
+#include "image.h"
 
-void LoadSky_f(void);
-
-cvar_t r_sky = {CVAR_SAVE, "r_sky", "1"};
-
-static char skyworldname[1024];
-rtexture_t *solidskytexture;
-rtexture_t *alphaskytexture;
-static qboolean skyavailable_quake;
-static qboolean skyavailable_box;
-static rtexturepool_t *skytexturepool;
-
+// FIXME: fix skybox after vid_restart
+cvar_t r_sky = {CVAR_SAVE, "r_sky", "1", "enables sky rendering (black otherwise)"};
+cvar_t r_skyscroll1 = {CVAR_SAVE, "r_skyscroll1", "1", "speed at which upper clouds layer scrolls in quake sky"};
+cvar_t r_skyscroll2 = {CVAR_SAVE, "r_skyscroll2", "2", "speed at which lower clouds layer scrolls in quake sky"};
 int skyrendernow;
 int skyrendermasked;
 
-static void r_sky_start(void)
-{
-	skytexturepool = R_AllocTexturePool();
-	solidskytexture = NULL;
-	alphaskytexture = NULL;
-}
-
-static void r_sky_shutdown(void)
-{
-	R_FreeTexturePool(&skytexturepool);
-	solidskytexture = NULL;
-	alphaskytexture = NULL;
-}
-
-int R_SetSkyBox(char *sky);
+static int skyrendersphere;
+static int skyrenderbox;
+static rtexturepool_t *skytexturepool;
+static char skyname[MAX_QPATH];
 
-static void r_sky_newmap(void)
+typedef struct suffixinfo_s
 {
-	skyavailable_quake = false;
-	if (!strcmp(skyworldname, cl.worldmodel->name))
-		skyavailable_quake = true;
+	char *suffix;
+	qboolean flipx, flipy, flipdiagonal;
 }
-
-void R_Sky_Init(void)
+suffixinfo_t;
+static suffixinfo_t suffix[3][6] =
 {
-	Cmd_AddCommand ("loadsky", &LoadSky_f);
-	Cvar_RegisterVariable (&r_sky);
-	R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
-}
+	{
+		{"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",   false, false,  true},
+		{"lf",    true,  true,  true},
+		{"bk",   false,  true, false},
+		{"ft",    true, false, false},
+		{"up",   false, false,  true},
+		{"dn",   false, false,  true}
+	}
+};
 
-static int skyrendersphere;
-static int skyrenderbox;
+static rtexture_t *skyboxside[6];
 
 void R_SkyStartFrame(void)
 {
@@ -54,11 +56,11 @@ void R_SkyStartFrame(void)
 	skyrendersphere = false;
 	skyrenderbox = false;
 	skyrendermasked = false;
-	if (r_sky.integer && !fogenabled)
+	if (r_sky.integer && !r_refdef.fogenabled)
 	{
-		if (skyavailable_box)
+		if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
 			skyrenderbox = true;
-		else if (skyavailable_quake)
+		else if (r_refdef.worldmodel && r_refdef.worldmodel->brush.solidskytexture)
 			skyrendersphere = true;
 		// for depth-masked sky, render the sky on the first sky surface encountered
 		skyrendernow = true;
@@ -66,60 +68,83 @@ void R_SkyStartFrame(void)
 	}
 }
 
-static char skyname[256];
-
 /*
 ==================
 R_SetSkyBox
 ==================
 */
-static char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
-static rtexture_t *skyboxside[6];
-int R_SetSkyBox(char *sky)
+void R_UnloadSkyBox(void)
 {
 	int i;
-	char name[1024];
-	qbyte *image_rgba;
+	for (i = 0;i < 6;i++)
+	{
+		if (skyboxside[i])
+			R_FreeTexture(skyboxside[i]);
+		skyboxside[i] = NULL;
+	}
+}
 
-	if (strcmp(sky, skyname) == 0) // no change
-		return true;
+int R_LoadSkyBox(void)
+{
+	int i, j, success;
+	int indices[4] = {0,1,2,3};
+	char name[MAX_INPUTLINE];
+	unsigned char *image_rgba;
+	unsigned char *temp;
 
-	skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
-	skyavailable_box = false;
-	skyname[0] = 0;
+	R_UnloadSkyBox();
 
-	if (!sky[0])
+	if (!skyname[0])
 		return true;
 
-	if (strlen(sky) > 1000)
-	{
-		Con_Printf ("sky name too long (%i, max is 1000)\n", strlen(sky));
-		return false;
-	}
-
-	for (i = 0;i < 6;i++)
+	for (j=0; j<3; j++)
 	{
-		sprintf (name, "env/%s%s", sky, suf[i]);
-		if (!(image_rgba = loadimagepixels(name, false, 0, 0)))
+		success = 0;
+		for (i=0; i<6; i++)
 		{
-			sprintf (name, "gfx/env/%s%s", sky, suf[i]);
-			if (!(image_rgba = loadimagepixels(name, false, 0, 0)))
+			if (dpsnprintf(name, sizeof(name), "%s_%s", skyname, suffix[j][i].suffix) < 0 || !(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 (dpsnprintf(name, sizeof(name), "%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+				{
+					if (dpsnprintf(name, sizeof(name), "env/%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+					{
+						if (dpsnprintf(name, sizeof(name), "gfx/env/%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+							continue;
+					}
+				}
 			}
+			temp = (unsigned char *)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 | (gl_texturecompression_sky.integer ? TEXF_COMPRESS : 0), NULL);
+			Mem_Free(image_rgba);
+			Mem_Free(temp);
+			success++;
 		}
-		skyboxside[i] = R_LoadTexture(skytexturepool, va("skyboxside%d", i), image_width, image_height, image_rgba, TEXTYPE_RGBA, TEXF_PRECACHE);
-		Mem_Free(image_rgba);
+
+		if (success)
+			break;
 	}
 
-	if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
-	{
-		skyavailable_box = true;
-		strcpy(skyname, sky);
+	if (j == 3)
+		return false;
+
+	return true;
+}
+
+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", (int)strlen(sky));
+		return false;
 	}
-	return false;
+
+	strlcpy(skyname, sky, sizeof(skyname));
+
+	return R_LoadSkyBox();
 }
 
 // LordHavoc: added LoadSky console command
@@ -131,7 +156,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)))
@@ -139,130 +164,152 @@ 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]
+	0, 1,
+	1, 1,
+	1, 0,
+	0, 0,
+	// skyside[1]
+	1, 0,
+	0, 0,
+	0, 1,
+	1, 1,
+	// skyside[2]
+	1, 1,
+	1, 0,
+	0, 0,
+	0, 1,
+	// skyside[3]
+	0, 0,
+	0, 1,
+	1, 1,
+	1, 0,
+	// skyside[4]
+	0, 1,
+	1, 1,
+	1, 0,
+	0, 0,
+	// skyside[5]
+	0, 1,
+	1, 1,
+	1, 0,
+	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)
 {
-	rmeshbufferinfo_t m;
-
-#define R_SkyBoxPolyVec(i,s,t,x,y,z) \
-	m.vertex[i * 4 + 0] = (x) * 16.0f + r_origin[0];\
-	m.vertex[i * 4 + 1] = (y) * 16.0f + r_origin[1];\
-	m.vertex[i * 4 + 2] = (z) * 16.0f + r_origin[2];\
-	m.texcoords[0][i * 2 + 0] = (s) * (254.0f/256.0f) + (1.0f/256.0f);\
-	m.texcoords[0][i * 2 + 1] = (t) * (254.0f/256.0f) + (1.0f/256.0f);
-
-	memset(&m, 0, sizeof(m));
-	m.transparent = false;
-	m.blendfunc1 = GL_ONE;
-	m.blendfunc2 = GL_ZERO;
-	m.depthdisable = true; // don't modify or read zbuffer
-	m.numtriangles = 2;
-	m.numverts = 4;
-	m.tex[0] = R_GetTexture(skyboxside[3]); // front
-	if (R_Mesh_Draw_GetBuffer(&m))
-	{
-		memcpy(m.index, skyboxindex, sizeof(int[6]));
-		m.color[0] = m.color[4] = m.color[8] = m.color[12] = m.colorscale;
-		m.color[1] = m.color[5] = m.color[9] = m.color[13] = m.colorscale;
-		m.color[2] = m.color[6] = m.color[10] = m.color[14] = m.colorscale;
-		m.color[3] = m.color[7] = m.color[11] = m.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);
-	}
-	m.tex[0] = R_GetTexture(skyboxside[1]); // back
-	if (R_Mesh_Draw_GetBuffer(&m))
-	{
-		memcpy(m.index, skyboxindex, sizeof(int[6]));
-		m.color[0] = m.color[4] = m.color[8] = m.color[12] = m.colorscale;
-		m.color[1] = m.color[5] = m.color[9] = m.color[13] = m.colorscale;
-		m.color[2] = m.color[6] = m.color[10] = m.color[14] = m.colorscale;
-		m.color[3] = m.color[7] = m.color[11] = m.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);
-	}
-	m.tex[0] = R_GetTexture(skyboxside[0]); // right
-	if (R_Mesh_Draw_GetBuffer(&m))
-	{
-		memcpy(m.index, skyboxindex, sizeof(int[6]));
-		m.color[0] = m.color[4] = m.color[8] = m.color[12] = m.colorscale;
-		m.color[1] = m.color[5] = m.color[9] = m.color[13] = m.colorscale;
-		m.color[2] = m.color[6] = m.color[10] = m.color[14] = m.colorscale;
-		m.color[3] = m.color[7] = m.color[11] = m.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);
-	}
-	m.tex[0] = R_GetTexture(skyboxside[2]); // left
-	if (R_Mesh_Draw_GetBuffer(&m))
-	{
-		memcpy(m.index, skyboxindex, sizeof(int[6]));
-		m.color[0] = m.color[4] = m.color[8] = m.color[12] = m.colorscale;
-		m.color[1] = m.color[5] = m.color[9] = m.color[13] = m.colorscale;
-		m.color[2] = m.color[6] = m.color[10] = m.color[14] = m.colorscale;
-		m.color[3] = m.color[7] = m.color[11] = m.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);
-	}
-	m.tex[0] = R_GetTexture(skyboxside[4]); // up
-	if (R_Mesh_Draw_GetBuffer(&m))
-	{
-		memcpy(m.index, skyboxindex, sizeof(int[6]));
-		m.color[0] = m.color[4] = m.color[8] = m.color[12] = m.colorscale;
-		m.color[1] = m.color[5] = m.color[9] = m.color[13] = m.colorscale;
-		m.color[2] = m.color[6] = m.color[10] = m.color[14] = m.colorscale;
-		m.color[3] = m.color[7] = m.color[11] = m.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);
-	}
-	m.tex[0] = R_GetTexture(skyboxside[5]); // down
-	if (R_Mesh_Draw_GetBuffer(&m))
+	int i;
+	// FIXME: fixed function path can't properly handle r_view.colorscale > 1
+	GL_Color(1 * r_view.colorscale, 1 * r_view.colorscale, 1 * r_view.colorscale, 1);
+	GL_BlendFunc(GL_ONE, GL_ZERO);
+	GL_DepthMask(false);
+	GL_DepthRange(0, 1);
+	GL_PolygonOffset(0, 0);
+	GL_DepthTest(false); // don't modify or read zbuffer
+	R_Mesh_VertexPointer(skyboxvertex3f, 0, 0);
+	R_Mesh_ColorPointer(NULL, 0, 0);
+	R_Mesh_ResetTextureState();
+	R_Mesh_TexCoordPointer(0, 2, skyboxtexcoord2f, 0, 0);
+	GL_LockArrays(0, 6*4);
+	for (i = 0;i < 6;i++)
 	{
-		memcpy(m.index, skyboxindex, sizeof(int[6]));
-		m.color[0] = m.color[4] = m.color[8] = m.color[12] = m.colorscale;
-		m.color[1] = m.color[5] = m.color[9] = m.color[13] = m.colorscale;
-		m.color[2] = m.color[6] = m.color[10] = m.color[14] = m.colorscale;
-		m.color[3] = m.color[7] = m.color[11] = m.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_TexBind(0, R_GetTexture(skyboxside[i]));
+		R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6, 0, 0);
 	}
+	GL_LockArrays(0, 0);
 }
 
-#define skygridx 16
+#define skygridx 32
 #define skygridx1 (skygridx + 1)
 #define skygridxrecip (1.0f / (skygridx))
 #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;
@@ -271,95 +318,102 @@ 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] + r_origin[0];
-		v[1] = source[3] + r_origin[1];
-		v[2] = source[4] + r_origin[2];
 	}
 }
 
 static void R_SkySphere(void)
 {
-	float speedscale, speedscale2;
+	float speedscale;
 	static qboolean skysphereinitialized = false;
-	rmeshbufferinfo_t m;
+	matrix4x4_t scroll1matrix, scroll2matrix;
 	if (!skysphereinitialized)
 	{
 		skysphereinitialized = true;
-		skyspherecalc(skysphere, 16, 16, 16 / 3);
+		skyspherecalc();
 	}
 
-	speedscale = cl.time*8.0/128.0;
+	// wrap the scroll values just to be extra kind to float accuracy
+
+	// scroll speed for upper layer
+	speedscale = r_refdef.time*r_skyscroll1.value*8.0/128.0;
 	speedscale -= (int)speedscale;
-	speedscale2 = cl.time*16.0/128.0;
-	speedscale2 -= (int)speedscale2;
-
-	memset(&m, 0, sizeof(m));
-	m.transparent = false;
-	m.blendfunc1 = GL_ONE;
-	m.blendfunc2 = GL_ZERO;
-	m.depthdisable = true; // don't modify or read zbuffer
-	m.numtriangles = skygridx*skygridy*2;
-	m.numverts = skygridx1*skygridy1;
-	m.tex[0] = R_GetTexture(solidskytexture);
-	if (R_Mesh_Draw_GetBuffer(&m))
+	Matrix4x4_CreateTranslate(&scroll1matrix, speedscale, speedscale, 0);
+	// scroll speed for lower layer (transparent layer)
+	speedscale = r_refdef.time*r_skyscroll2.value*8.0/128.0;
+	speedscale -= (int)speedscale;
+	Matrix4x4_CreateTranslate(&scroll2matrix, speedscale, speedscale, 0);
+
+	// FIXME: fixed function path can't properly handle r_view.colorscale > 1
+	GL_Color(1 * r_view.colorscale, 1 * r_view.colorscale, 1 * r_view.colorscale, 1);
+	GL_BlendFunc(GL_ONE, GL_ZERO);
+	GL_DepthMask(true);
+	GL_DepthRange(0, 1);
+	GL_PolygonOffset(0, 0);
+	GL_DepthTest(false); // don't modify or read zbuffer
+	R_Mesh_VertexPointer(skysphere_vertex3f, 0, 0);
+	R_Mesh_ColorPointer(NULL, 0, 0);
+	R_Mesh_ResetTextureState();
+	R_Mesh_TexBind(0, R_GetTexture(r_refdef.worldmodel->brush.solidskytexture));
+	R_Mesh_TexCoordPointer(0, 2, skysphere_texcoord2f, 0, 0);
+	R_Mesh_TexMatrix(0, &scroll1matrix);
+	if (r_textureunits.integer >= 2 && r_view.colorscale == 1)
 	{
-		memcpy(m.index, skysphereindices, m.numtriangles * sizeof(int[3]));
-		skyspherearrays(m.vertex, m.texcoords[0], m.color, skysphere, speedscale, m.colorscale);
+		// one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer
+		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, 0, 0);
+		R_Mesh_TexMatrix(1, &scroll2matrix);
+		GL_LockArrays(0, skysphere_numverts);
+		R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
+		GL_LockArrays(0, 0);
 	}
-	m.blendfunc1 = GL_SRC_ALPHA;
-	m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-	m.tex[0] = R_GetTexture(alphaskytexture);
-	if (R_Mesh_Draw_GetBuffer(&m))
+	else
 	{
-		memcpy(m.index, skysphereindices, m.numtriangles * sizeof(int[3]));
-		skyspherearrays(m.vertex, m.texcoords[0], m.color, skysphere, speedscale2, m.colorscale);
+		// two pass
+		GL_LockArrays(0, skysphere_numverts);
+		R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
+
+		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		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, 0, 0);
+		GL_LockArrays(0, 0);
 	}
 }
 
 void R_Sky(void)
 {
+	matrix4x4_t skymatrix;
 	if (skyrendermasked)
 	{
+		Matrix4x4_CreateTranslate(&skymatrix, r_view.origin[0], r_view.origin[1], r_view.origin[2]);
+		R_Mesh_Matrix(&skymatrix);
 		if (skyrendersphere)
 		{
 			// this does not modify depth buffer
@@ -376,92 +430,49 @@ 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);
 		}
 		*/
+		GL_DepthRange(0, 1);
+		GL_DepthTest(true);
+		GL_DepthMask(true);
 	}
 }
 
 //===============================================================
 
-/*
-=============
-R_InitSky
-
-A sky texture is 256*128, with the right side being a masked overlay
-==============
-*/
-void R_InitSky (qbyte *src, int bytesperpixel)
+void R_ResetSkyBox(void)
 {
-	int i, j, p, r, g, b;
-	qbyte skyupperlayerpixels[128*128*4], skylowerlayerpixels[128*128*4];
-	unsigned trans[128*128], transpix, *rgba;
-
-	strcpy(skyworldname, loadmodel->name);
+	R_UnloadSkyBox();
+	skyname[0] = 0;
+	R_LoadSkyBox();
+}
 
-	// flush skytexturepool so we won't build up a leak from uploading textures multiple times
-	R_FreeTexturePool(&skytexturepool);
+static void r_sky_start(void)
+{
 	skytexturepool = R_AllocTexturePool();
-	solidskytexture = NULL;
-	alphaskytexture = NULL;
-
-	if (bytesperpixel == 4)
-	{
-		for (i = 0;i < 128;i++)
-			for (j = 0;j < 128;j++)
-				trans[(i*128) + j] = src[i*256+j+128];
-	}
-	else
-	{
-		// make an average value for the back to avoid
-		// a fringe on the top level
-		r = g = b = 0;
-		for (i=0 ; i<128 ; i++)
-		{
-			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];
-			}
-		}
-
-		((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);
+	R_LoadSkyBox();
+}
 
-	solidskytexture = R_LoadTexture (skytexturepool, "sky_solidtexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_PRECACHE);
+static void r_sky_shutdown(void)
+{
+	R_UnloadSkyBox();
+	R_FreeTexturePool(&skytexturepool);
+}
 
-	if (bytesperpixel == 4)
-	{
-		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++)
-			{
-				p = src[i*256 + j];
-				if (p == 0)
-					trans[(i*128) + j] = transpix;
-				else
-					trans[(i*128) + j] = d_8to24table[p];
-			}
-		}
-	}
+static void r_sky_newmap(void)
+{
+}
 
-	memcpy(skylowerlayerpixels, trans, 128*128*4);
 
-	alphaskytexture = R_LoadTexture (skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
+void R_Sky_Init(void)
+{
+	Cmd_AddCommand ("loadsky", &LoadSky_f, "load a skybox by basename (for example loadsky mtnsun_ loads mtnsun_ft.tga and so on)");
+	Cvar_RegisterVariable (&r_sky);
+	Cvar_RegisterVariable (&r_skyscroll1);
+	Cvar_RegisterVariable (&r_skyscroll2);
+	memset(&skyboxside, 0, sizeof(skyboxside));
+	skyname[0] = 0;
+	R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
 }