X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_sky.c;h=c5e842598de8a1859bd64e0cdff49f26de3f2c33;hb=4c7b42b047585a7e609ec241b0e9c7e14ee11103;hp=1eecc6c79d468a10cf6209e32d9eb4996d62e975;hpb=a610cd9e97e8030bdb08dd02deee761e4152f5a1;p=xonotic%2Fdarkplaces.git

diff --git a/r_sky.c b/r_sky.c
index 1eecc6c7..c5e84259 100644
--- a/r_sky.c
+++ b/r_sky.c
@@ -16,11 +16,11 @@ static char skyname[MAX_QPATH];
 
 typedef struct suffixinfo_s
 {
-	char *suffix;
+	const char *suffix;
 	qboolean flipx, flipy, flipdiagonal;
 }
 suffixinfo_t;
-static suffixinfo_t suffix[3][6] =
+static const suffixinfo_t suffix[3][6] =
 {
 	{
 		{"px",   false, false, false},
@@ -56,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 && r_refdef.fogmasktable[FOGMASKTABLEWIDTH-1] < (1.0f / 256.0f)))
 	{
 		if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
 			skyrenderbox = true;
-		else if (r_refdef.worldmodel->brush.solidskytexture)
+		else if (r_refdef.scene.worldmodel && r_refdef.scene.worldmodel->brush.solidskytexture)
 			skyrendersphere = true;
 		// for depth-masked sky, render the sky on the first sky surface encountered
 		skyrendernow = true;
@@ -76,12 +76,18 @@ R_SetSkyBox
 void R_UnloadSkyBox(void)
 {
 	int i;
+	int c = 0;
 	for (i = 0;i < 6;i++)
 	{
 		if (skyboxside[i])
+		{
 			R_FreeTexture(skyboxside[i]);
+			c++;
+		}
 		skyboxside[i] = NULL;
 	}
+	if (c && developer_loading.integer)
+		Con_Printf("unloading skybox\n");
 }
 
 int R_LoadSkyBox(void)
@@ -89,7 +95,7 @@ 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 *image_buffer;
 	unsigned char *temp;
 
 	R_UnloadSkyBox();
@@ -102,21 +108,21 @@ int R_LoadSkyBox(void)
 		success = 0;
 		for (i=0; i<6; i++)
 		{
-			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), "%s_%s", skyname, suffix[j][i].suffix) < 0 || !(image_buffer = loadimagepixelsbgra(name, false, false)))
 			{
-				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), "%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_buffer = loadimagepixelsbgra(name, false, false)))
 				{
-					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), "env/%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_buffer = loadimagepixelsbgra(name, false, false)))
 					{
-						if (dpsnprintf(name, sizeof(name), "gfx/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_buffer = loadimagepixelsbgra(name, false, false)))
 							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);
+			Image_CopyMux (temp, image_buffer, 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_BGRA, TEXF_CLAMP | TEXF_PRECACHE | (gl_texturecompression_sky.integer ? TEXF_COMPRESS : 0), NULL);
+			Mem_Free(image_buffer);
 			Mem_Free(temp);
 			success++;
 		}
@@ -128,6 +134,9 @@ int R_LoadSkyBox(void)
 	if (j == 3)
 		return false;
 
+	if (developer_loading.integer)
+		Con_Printf("loading skybox \"%s\"\n", name);
+
 	return true;
 }
 
@@ -138,11 +147,11 @@ int R_SetSkyBox(const char *sky)
 
 	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", (int)strlen(sky));
 		return false;
 	}
 
-	strcpy(skyname, sky);
+	strlcpy(skyname, sky, sizeof(skyname));
 
 	return R_LoadSkyBox();
 }
@@ -175,7 +184,7 @@ void LoadSky_f (void)
 	}
 }
 
-float skyboxvertex3f[6*4*3] =
+static const float skyboxvertex3f[6*4*3] =
 {
 	// skyside[0]
 	 16, -16,  16,
@@ -209,7 +218,7 @@ float skyboxvertex3f[6*4*3] =
 	 16,  16, -16
 };
 
-float skyboxtexcoord2f[6*4*2] =
+static const float skyboxtexcoord2f[6*4*2] =
 {
 	// skyside[0]
 	0, 1,
@@ -243,7 +252,7 @@ float skyboxtexcoord2f[6*4*2] =
 	0, 0
 };
 
-int skyboxelements[6*2*3] =
+static const unsigned short skyboxelements[6*2*3] =
 {
 	// skyside[3]
 	 0,  1,  2,
@@ -268,21 +277,38 @@ 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_refdef.view.colorscale > 1
+	GL_Color(1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1);
 	GL_BlendFunc(GL_ONE, GL_ZERO);
+	GL_CullFace(GL_NONE);
 	GL_DepthMask(false);
+	GL_DepthRange(0, 1);
+	GL_PolygonOffset(0, 0);
 	GL_DepthTest(false); // don't modify or read zbuffer
-	m.pointer_vertex = skyboxvertex3f;
-	m.pointer_texcoord[0] = skyboxtexcoord2f;
+	R_Mesh_VertexPointer(skyboxvertex3f, 0, 0);
+	R_Mesh_ColorPointer(NULL, 0, 0);
+	R_Mesh_ResetTextureState();
+	R_Mesh_TexCoordPointer(0, 2, skyboxtexcoord2f, 0, 0);
+	R_SetupGenericShader(true);
 	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(0, 6*4, 2, skyboxelements + i * 6);
+		R_Mesh_TexBind(0, R_GetTexture(skyboxside[i]));
+		R_Mesh_Draw(0, 6*4, i*2, 2, NULL, skyboxelements, 0, 0);
 	}
+
+	if(r_refdef.fogenabled)
+	{
+		R_SetupGenericShader(false);
+		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		GL_Color(r_refdef.fogcolor[0], r_refdef.fogcolor[1], r_refdef.fogcolor[2], 1 - r_refdef.fogmasktable[FOGMASKTABLEWIDTH-1]);
+		for (i = 0;i < 6;i++)
+		{
+			R_Mesh_TexBind(0, 0);
+			R_Mesh_Draw(0, 6*4, i*2, 2, NULL, skyboxelements, 0, 0);
+		}
+	}
+
 	GL_LockArrays(0, 0);
 }
 
@@ -296,11 +322,12 @@ static void R_SkyBox(void)
 #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 unsigned short skysphere_elements[skysphere_numtriangles * 3];
 
 static void skyspherecalc(void)
 {
-	int i, j, *e;
+	int i, j;
+	unsigned short *e;
 	float a, b, x, ax, ay, v[3], length, *vertex3f, *texcoord2f;
 	float dx, dy, dz;
 	dx = 16;
@@ -328,7 +355,7 @@ static void skyspherecalc(void)
 			*vertex3f++ = v[2];
 		}
 	}
-	e = skysphere_element3i;
+	e = skysphere_elements;
 	for (j = 0;j < skygridy;j++)
 	{
 		for (i = 0;i < skygridx;i++)
@@ -348,7 +375,6 @@ static void R_SkySphere(void)
 {
 	float speedscale;
 	static qboolean skysphereinitialized = false;
-	rmeshstate_t m;
 	matrix4x4_t scroll1matrix, scroll2matrix;
 	if (!skysphereinitialized)
 	{
@@ -359,49 +385,63 @@ static void R_SkySphere(void)
 	// 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 = r_refdef.scene.time*r_skyscroll1.value*8.0/128.0;
 	speedscale -= (int)speedscale;
 	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 = r_refdef.scene.time*r_skyscroll2.value*8.0/128.0;
 	speedscale -= (int)speedscale;
 	Matrix4x4_CreateTranslate(&scroll2matrix, speedscale, speedscale, 0);
 
-	GL_Color(1, 1, 1, 1);
+	// FIXME: fixed function path can't properly handle r_refdef.view.colorscale > 1
+	GL_Color(1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1);
 	GL_BlendFunc(GL_ONE, GL_ZERO);
+	GL_CullFace(GL_NONE);
 	GL_DepthMask(true);
+	GL_DepthRange(0, 1);
+	GL_PolygonOffset(0, 0);
 	GL_DepthTest(false); // don't modify or read zbuffer
-	memset(&m, 0, sizeof(m));
-	m.pointer_vertex = skysphere_vertex3f;
-	m.tex[0] = R_GetTexture(r_refdef.worldmodel->brush.solidskytexture);
-	m.pointer_texcoord[0] = skysphere_texcoord2f;
-	m.texmatrix[0] = scroll1matrix;
-	if (r_textureunits.integer >= 2)
+	R_Mesh_VertexPointer(skysphere_vertex3f, 0, 0);
+	R_Mesh_ColorPointer(NULL, 0, 0);
+	R_Mesh_ResetTextureState();
+	R_Mesh_TexBind(0, R_GetTexture(r_refdef.scene.worldmodel->brush.solidskytexture));
+	R_Mesh_TexCoordPointer(0, 2, skysphere_texcoord2f, 0, 0);
+	R_Mesh_TexMatrix(0, &scroll1matrix);
+	if (r_textureunits.integer >= 2 && r_refdef.view.colorscale == 1)
 	{
 		// one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer
-		m.tex[1] = R_GetTexture(r_refdef.worldmodel->brush.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);
+		R_SetupGenericTwoTextureShader(GL_DECAL);
+		R_Mesh_TexBind(1, R_GetTexture(r_refdef.scene.worldmodel->brush.alphaskytexture));
+		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);
+		R_Mesh_Draw(0, skysphere_numverts, 0, skysphere_numtriangles, NULL, skysphere_elements, 0, 0);
 		GL_LockArrays(0, 0);
+		R_Mesh_TexBind(1, 0);
 	}
 	else
 	{
 		// two pass
-		R_Mesh_State(&m);
+		R_SetupGenericShader(true);
 		GL_LockArrays(0, skysphere_numverts);
-		R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+		R_Mesh_Draw(0, skysphere_numverts, 0, skysphere_numtriangles, NULL, skysphere_elements, 0, 0);
+
+		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		R_Mesh_TexBind(0, R_GetTexture(r_refdef.scene.worldmodel->brush.alphaskytexture));
+		R_Mesh_TexMatrix(0, &scroll2matrix);
+		GL_LockArrays(0, skysphere_numverts);
+		R_Mesh_Draw(0, skysphere_numverts, 0, skysphere_numtriangles, NULL, skysphere_elements, 0, 0);
 		GL_LockArrays(0, 0);
+	}
 
+	if(r_refdef.fogenabled)
+	{
+		R_SetupGenericShader(false);
+		R_Mesh_TexBind(0, 0);
 		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		m.tex[0] = R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture);
-		m.texmatrix[0] = scroll2matrix;
-		R_Mesh_State(&m);
+		GL_Color(r_refdef.fogcolor[0], r_refdef.fogcolor[1], r_refdef.fogcolor[2], 1 - r_refdef.fogmasktable[FOGMASKTABLEWIDTH-1]);
 		GL_LockArrays(0, skysphere_numverts);
-		R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+		R_Mesh_Draw(0, skysphere_numverts, 0, skysphere_numtriangles, NULL, skysphere_elements, 0, 0);
 		GL_LockArrays(0, 0);
 	}
 }
@@ -411,7 +451,7 @@ void R_Sky(void)
 	matrix4x4_t skymatrix;
 	if (skyrendermasked)
 	{
-		Matrix4x4_CreateTranslate(&skymatrix, r_vieworigin[0], r_vieworigin[1], r_vieworigin[2]);
+		Matrix4x4_CreateTranslate(&skymatrix, r_refdef.view.origin[0], r_refdef.view.origin[1], r_refdef.view.origin[2]);
 		R_Mesh_Matrix(&skymatrix);
 		if (skyrendersphere)
 		{
@@ -432,6 +472,7 @@ void R_Sky(void)
 			//GL_Clear(GL_DEPTH_BUFFER_BIT);
 		}
 		*/
+		GL_DepthRange(0, 1);
 		GL_DepthTest(true);
 		GL_DepthMask(true);
 	}