X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_sky.c;h=403e4ad75e49011333d842c4842e96d49f09cd3c;hp=c216ed2ac2be66c539c8f22b396bfd4876213eec;hb=52191260b6e0d2a486e8da890e06e5821804595f;hpb=cd21cb3be9de4da3b2c1d2cb029352947b48166c

diff --git a/r_sky.c b/r_sky.c
index c216ed2a..403e4ad7 100644
--- a/r_sky.c
+++ b/r_sky.c
@@ -3,19 +3,51 @@
 #include "image.h"
 
 // FIXME: fix skybox after vid_restart
-cvar_t r_sky = {CVAR_SAVE, "r_sky", "1"};
-qboolean skyavailable_quake;
-qboolean skyavailable_box;
+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 rtexture_t *solidskytexture;
-static rtexture_t *alphaskytexture;
 static int skyrendersphere;
 static int skyrenderbox;
 static rtexturepool_t *skytexturepool;
-static char skyname[256];
-static char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
+static char skyname[MAX_QPATH];
+
+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",   false, false,  true},
+		{"lf",    true,  true,  true},
+		{"bk",   false,  true, false},
+		{"ft",    true, false, false},
+		{"up",   false, false,  true},
+		{"dn",   false, false,  true}
+	}
+};
+
 static rtexture_t *skyboxside[6];
 
 void R_SkyStartFrame(void)
@@ -24,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->brush.solidskytexture)
 			skyrendersphere = true;
 		// for depth-masked sky, render the sky on the first sky surface encountered
 		skyrendernow = true;
@@ -41,51 +73,78 @@ void R_SkyStartFrame(void)
 R_SetSkyBox
 ==================
 */
-int R_SetSkyBox(const 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, NULL);
+			Mem_Free(image_rgba);
+			Mem_Free(temp);
+			success++;
 		}
-		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 (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
@@ -97,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)))
@@ -105,13 +164,13 @@ 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;
 	}
 }
@@ -119,68 +178,68 @@ void LoadSky_f (void)
 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,
 	// 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[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,
-	-16, -16,  16,
 	// skyside[5]
-	 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]
-	1, 0,
-	1, 1,
 	0, 1,
+	1, 1,
+	1, 0,
 	0, 0,
 	// skyside[1]
 	1, 0,
-	1, 1,
-	0, 1,
 	0, 0,
+	0, 1,
+	1, 1,
 	// skyside[2]
-	1, 0,
 	1, 1,
-	0, 1,
-	0, 0,
-	// skyside[3]
 	1, 0,
-	1, 1,
+	0, 0,
 	0, 1,
+	// skyside[3]
 	0, 0,
-	// skyside[4]
-	1, 0,
+	0, 1,
 	1, 1,
+	1, 0,
+	// skyside[4]
 	0, 1,
+	1, 1,
+	1, 0,
 	0, 0,
 	// skyside[5]
-	1, 0,
-	1, 1,
 	0, 1,
+	1, 1,
+	1, 0,
 	0, 0
 };
 
@@ -209,20 +268,22 @@ int skyboxelements[6*2*3] =
 static void R_SkyBox(void)
 {
 	int i;
-	rmeshstate_t m;
-	GL_Color(1, 1, 1, 1);
-	memset(&m, 0, sizeof(m));
+	// 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_DepthMask(false);
 	GL_DepthTest(false); // don't modify or read zbuffer
-	GL_VertexPointer(skyboxvertex3f);
-	m.pointer_texcoord[0] = skyboxtexcoord2f;
+	R_Mesh_VertexPointer(skyboxvertex3f);
+	R_Mesh_ColorPointer(NULL);
+	R_Mesh_ResetTextureState();
+	R_Mesh_TexCoordPointer(0, 2, skyboxtexcoord2f);
+	GL_LockArrays(0, 6*4);
 	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);
+		R_Mesh_TexBind(0, R_GetTexture(skyboxside[i]));
+		R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6);
 	}
+	GL_LockArrays(0, 0);
 }
 
 #define skygridx 32
@@ -287,59 +348,59 @@ static void R_SkySphere(void)
 {
 	float speedscale;
 	static qboolean skysphereinitialized = false;
-	rmeshstate_t m;
-	matrix4x4_t scroll1matrix, scroll2matrix, identitymatrix;
+	matrix4x4_t scroll1matrix, scroll2matrix;
 	if (!skysphereinitialized)
 	{
 		skysphereinitialized = true;
 		skyspherecalc();
 	}
 
+	// wrap the scroll values just to be extra kind to float accuracy
+
 	// scroll speed for upper layer
-	speedscale = cl.time*8.0/128.0;
-	// wrap the scroll just to be extra kind to float accuracy
+	speedscale = r_refdef.time*r_skyscroll1.value*8.0/128.0;
 	speedscale -= (int)speedscale;
-
-	// 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);
+	// 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);
 
-	GL_VertexPointer(skysphere_vertex3f);
-	GL_Color(1, 1, 1, 1);
+	// 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_DepthTest(false); // don't modify or read zbuffer
-	memset(&m, 0, sizeof(m));
-	m.tex[0] = R_GetTexture(solidskytexture);
-	m.pointer_texcoord[0] = skysphere_texcoord2f;
-	R_Mesh_TextureMatrix(0, &scroll1matrix);
-	if (r_textureunits.integer >= 2)
+	R_Mesh_VertexPointer(skysphere_vertex3f);
+	R_Mesh_ColorPointer(NULL);
+	R_Mesh_ResetTextureState();
+	R_Mesh_TexBind(0, R_GetTexture(r_refdef.worldmodel->brush.solidskytexture));
+	R_Mesh_TexCoordPointer(0, 2, skysphere_texcoord2f);
+	R_Mesh_TexMatrix(0, &scroll1matrix);
+	if (r_textureunits.integer >= 2 && r_view.colorscale == 1)
 	{
 		// 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);
+		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);
+		R_Mesh_TexMatrix(1, &scroll2matrix);
+		GL_LockArrays(0, skysphere_numverts);
+		R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+		GL_LockArrays(0, 0);
 	}
 	else
 	{
 		// two pass
-		R_Mesh_State_Texture(&m);
-		R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+		GL_LockArrays(0, skysphere_numverts);
+		R_Mesh_Draw(0, 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_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);
+		GL_LockArrays(0, 0);
 	}
-	R_Mesh_TextureMatrix(0, &identitymatrix);
 }
 
 void R_Sky(void)
@@ -347,7 +408,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_view.origin[0], r_view.origin[1], r_view.origin[2]);
 		R_Mesh_Matrix(&skymatrix);
 		if (skyrendersphere)
 		{
@@ -365,138 +426,48 @@ 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
-			//qglClear(GL_DEPTH_BUFFER_BIT);
+			//GL_Clear(GL_DEPTH_BUFFER_BIT);
 		}
 		*/
+		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)
-{
-	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;
-
-	// flush skytexturepool so we won't build up a leak from uploading textures multiple times
-	R_FreeTexturePool(&skytexturepool);
-	skytexturepool = R_AllocTexturePool();
-	solidskytexture = NULL;
-	alphaskytexture = NULL;
-
-	if (bytesperpixel == 4)
-	{
-		transpixunion.i = 0;
-		for (i = 0;i < 128;i++)
-			for (j = 0;j < 128;j++)
-				trans[(i*128) + j] = ((unsigned *)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 = &palette_complete[p];
-				trans[(i*128) + j] = *rgba;
-				r += ((qbyte *)rgba)[0];
-				g += ((qbyte *)rgba)[1];
-				b += ((qbyte *)rgba)[2];
-			}
-		}
-
-		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_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] = ((unsigned *)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] = palette_complete[p];
-			}
-		}
-	}
-
-	memcpy(skylowerlayerpixels, trans, 128*128*4);
-
-	alphaskytexture = R_LoadTexture2D(skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
-}
-
-void R_ResetQuakeSky(void)
-{
-	skyavailable_quake = false;
-}
-
 void R_ResetSkyBox(void)
 {
-	skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
+	R_UnloadSkyBox();
 	skyname[0] = 0;
-	skyavailable_box = false;
+	R_LoadSkyBox();
 }
 
 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;
 }
 
 static void r_sky_newmap(void)
 {
 }
 
+
 void R_Sky_Init(void)
 {
-	Cmd_AddCommand ("loadsky", &LoadSky_f);
+	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);
 }