X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=r_sky.c;h=c216ed2ac2be66c539c8f22b396bfd4876213eec;hb=83fe4d8441466918165cfc7ce822831ed1ba72f6;hp=9b237f908a3c19a186480a197cd06e1646185cb9;hpb=d88ce08f9848343ae8a8302286b8307c3ec5c4aa;p=xonotic%2Fdarkplaces.git

diff --git a/r_sky.c b/r_sky.c
index 9b237f90..c216ed2a 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;
@@ -73,7 +75,7 @@ int R_SetSkyBox(const char *sky)
 				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);
 	}
 
@@ -114,66 +116,113 @@ void LoadSky_f (void)
 	}
 }
 
+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.depthdisable = true; // don't modify or read zbuffer
-	m.tex[0] = R_GetTexture(skyboxside[3]); // front
-	R_Mesh_State(&m);
-
-	GL_Color(r_colorscale, r_colorscale, r_colorscale, 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, polygonelements);
-	m.tex[0] = R_GetTexture(skyboxside[1]); // back
-	R_Mesh_State(&m);
-	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_State(&m);
-	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_State(&m);
-	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_State(&m);
-	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_State(&m);
-	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
+	GL_VertexPointer(skyboxvertex3f);
+	m.pointer_texcoord[0] = skyboxtexcoord2f;
+	for (i = 0;i < 6;i++)
+	{
+		m.tex[0] = R_GetTexture(skyboxside[i]);
+		R_Mesh_State_Texture(&m);
+		R_Mesh_Draw(6*4, 2, skyboxelements + i * 6);
+	}
 }
 
 #define skygridx 32
@@ -182,13 +231,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;
@@ -197,89 +255,91 @@ 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 *source, float s)
-{
-	int i;
-	for (i = 0;i < (skygridx1*skygridy1);i++, t += 2, v += 4, source += 5)
-	{
-		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, identitymatrix;
 	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);
+	// 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.blendfunc1 = GL_ONE;
-	m.blendfunc2 = GL_ZERO;
-	m.depthdisable = true; // don't modify or read zbuffer
 	m.tex[0] = R_GetTexture(solidskytexture);
-	R_Mesh_State(&m);
-
-	GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
-
-	skyspherearrays(varray_vertex, varray_texcoord[0], skysphere, speedscale);
-	R_Mesh_Draw(numverts, numtriangles, skysphereindices);
-
-	m.blendfunc1 = GL_SRC_ALPHA;
-	m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-	m.tex[0] = R_GetTexture(alphaskytexture);
-	R_Mesh_State(&m);
-
-	skyspherearrays(varray_vertex, varray_texcoord[0], skysphere, speedscale2);
-	R_Mesh_Draw(numverts, numtriangles, skysphereindices);
+	m.pointer_texcoord[0] = skysphere_texcoord2f;
+	R_Mesh_TextureMatrix(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
+		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);
+		R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+		R_Mesh_TextureMatrix(1, &identitymatrix);
+	}
+	else
+	{
+		// two pass
+		R_Mesh_State_Texture(&m);
+		R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+
+		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);
+		R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+	}
+	R_Mesh_TextureMatrix(0, &identitymatrix);
 }
 
 void R_Sky(void)
@@ -305,7 +365,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();
+			//qglClear(GL_DEPTH_BUFFER_BIT);
 		}
 		*/
 	}
@@ -325,6 +385,12 @@ 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;
+	union
+	{
+		int i;
+		qbyte b[4];
+	}
+	transpixunion;
 
 	skyavailable_quake = true;
 
@@ -336,9 +402,10 @@ void R_InitSky (qbyte *src, int bytesperpixel)
 
 	if (bytesperpixel == 4)
 	{
+		transpixunion.i = 0;
 		for (i = 0;i < 128;i++)
 			for (j = 0;j < 128;j++)
-				trans[(i*128) + j] = src[i*256+j+128];
+				trans[(i*128) + j] = ((unsigned *)src)[i*256+j+128];
 	}
 	else
 	{
@@ -350,7 +417,7 @@ void R_InitSky (qbyte *src, int bytesperpixel)
 			for (j=0 ; j<128 ; j++)
 			{
 				p = src[i*256 + j + 128];
-				rgba = &d_8to24table[p];
+				rgba = &palette_complete[p];
 				trans[(i*128) + j] = *rgba;
 				r += ((qbyte *)rgba)[0];
 				g += ((qbyte *)rgba)[1];
@@ -358,21 +425,23 @@ void R_InitSky (qbyte *src, int bytesperpixel)
 			}
 		}
 
-		((qbyte *)&transpix)[0] = r/(128*128);
-		((qbyte *)&transpix)[1] = g/(128*128);
-		((qbyte *)&transpix)[2] = b/(128*128);
-		((qbyte *)&transpix)[3] = 0;
+		transpixunion.i = 0;
+		transpixunion.b[0] = r/(128*128);
+		transpixunion.b[1] = g/(128*128);
+		transpixunion.b[2] = b/(128*128);
+		transpixunion.b[3] = 0;
 	}
+	transpix = transpixunion.i;
 
 	memcpy(skyupperlayerpixels, trans, 128*128*4);
 
-	solidskytexture = R_LoadTexture (skytexturepool, "sky_solidtexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_PRECACHE);
+	solidskytexture = R_LoadTexture2D(skytexturepool, "sky_solidtexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
 
 	if (bytesperpixel == 4)
 	{
 		for (i = 0;i < 128;i++)
 			for (j = 0;j < 128;j++)
-				trans[(i*128) + j] = src[i*256+j];
+				trans[(i*128) + j] = ((unsigned *)src)[i*256+j];
 	}
 	else
 	{
@@ -384,14 +453,14 @@ void R_InitSky (qbyte *src, int bytesperpixel)
 				if (p == 0)
 					trans[(i*128) + j] = transpix;
 				else
-					trans[(i*128) + j] = d_8to24table[p];
+					trans[(i*128) + j] = palette_complete[p];
 			}
 		}
 	}
 
 	memcpy(skylowerlayerpixels, trans, 128*128*4);
 
-	alphaskytexture = R_LoadTexture (skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
+	alphaskytexture = R_LoadTexture2D(skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
 
 void R_ResetQuakeSky(void)
@@ -430,3 +499,4 @@ void R_Sky_Init(void)
 	Cvar_RegisterVariable (&r_sky);
 	R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
 }
+