X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_rmain.c;h=8dc3369796969bf2889407bf3c6a89a0504ad90c;hb=bdb63282edaaa746a60ce4f9ddcdd914a4c4395f;hp=c613c66f57f452b1825fac67a82491b7ae321566;hpb=1c47ebbd998296306342310be858be14921aa084;p=xonotic%2Fdarkplaces.git

diff --git a/gl_rmain.c b/gl_rmain.c
index c613c66f..8dc33697 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -103,6 +103,9 @@ cvar_t r_bloom_intensity = {CVAR_SAVE, "r_bloom_intensity", "2"};
 cvar_t r_bloom_blur = {CVAR_SAVE, "r_bloom_blur", "8"};
 cvar_t r_bloom_resolution = {CVAR_SAVE, "r_bloom_resolution", "320"};
 cvar_t r_bloom_power = {CVAR_SAVE, "r_bloom_power", "4"};
+
+cvar_t developer_texturelogging = {0, "developer_texturelogging", "1"};
+
 rtexturepool_t *r_main_texturepool;
 rtexture_t *r_bloom_texture_screen;
 rtexture_t *r_bloom_texture_bloom;
@@ -110,6 +113,10 @@ rtexture_t *r_texture_blanknormalmap;
 rtexture_t *r_texture_white;
 rtexture_t *r_texture_black;
 rtexture_t *r_texture_notexture;
+rtexture_t *r_texture_whitecube;
+rtexture_t *r_texture_normalizationcube;
+rtexture_t *r_texture_detailtextures[NUM_DETAILTEXTURES];
+rtexture_t *r_texture_distorttexture[64];
 
 void R_ModulateColors(float *in, float *out, int verts, float r, float g, float b)
 {
@@ -209,14 +216,97 @@ void FOG_registercvars(void)
 	}
 }
 
-void gl_main_start(void)
+static void R_BuildDetailTextures (void)
+{
+	int i, x, y, light;
+	float vc[3], vx[3], vy[3], vn[3], lightdir[3];
+#define DETAILRESOLUTION 256
+	qbyte data[DETAILRESOLUTION][DETAILRESOLUTION][4], noise[DETAILRESOLUTION][DETAILRESOLUTION];
+	lightdir[0] = 0.5;
+	lightdir[1] = 1;
+	lightdir[2] = -0.25;
+	VectorNormalize(lightdir);
+	for (i = 0;i < NUM_DETAILTEXTURES;i++)
+	{
+		fractalnoise(&noise[0][0], DETAILRESOLUTION, DETAILRESOLUTION >> 4);
+		for (y = 0;y < DETAILRESOLUTION;y++)
+		{
+			for (x = 0;x < DETAILRESOLUTION;x++)
+			{
+				vc[0] = x;
+				vc[1] = y;
+				vc[2] = noise[y][x] * (1.0f / 32.0f);
+				vx[0] = x + 1;
+				vx[1] = y;
+				vx[2] = noise[y][(x + 1) % DETAILRESOLUTION] * (1.0f / 32.0f);
+				vy[0] = x;
+				vy[1] = y + 1;
+				vy[2] = noise[(y + 1) % DETAILRESOLUTION][x] * (1.0f / 32.0f);
+				VectorSubtract(vx, vc, vx);
+				VectorSubtract(vy, vc, vy);
+				CrossProduct(vx, vy, vn);
+				VectorNormalize(vn);
+				light = 128 - DotProduct(vn, lightdir) * 128;
+				light = bound(0, light, 255);
+				data[y][x][0] = data[y][x][1] = data[y][x][2] = light;
+				data[y][x][3] = 255;
+			}
+		}
+		r_texture_detailtextures[i] = R_LoadTexture2D(r_main_texturepool, va("detailtexture%i", i), DETAILRESOLUTION, DETAILRESOLUTION, &data[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_PRECACHE, NULL);
+	}
+}
+
+static qbyte R_MorphDistortTexture (double y0, double y1, double y2, double y3, double morph)
+{
+	int m =	(int)(((y1 + y3 - (y0 + y2)) * morph * morph * morph) +
+			((2 * (y0 - y1) + y2 - y3) * morph * morph) +
+			((y2 - y0) * morph) +
+			(y1));
+	return (qbyte)bound(0, m, 255);
+}
+
+static void R_BuildDistortTexture (void)
+{
+	int x, y, i, j;
+#define DISTORTRESOLUTION 32
+	qbyte data[5][DISTORTRESOLUTION][DISTORTRESOLUTION][2];
+
+	for (i=0; i<4; i++)
+	{
+		for (y=0; y<DISTORTRESOLUTION; y++)
+		{
+			for (x=0; x<DISTORTRESOLUTION; x++)
+			{
+				data[i][y][x][0] = rand () & 255;
+				data[i][y][x][1] = rand () & 255;
+			}
+		}
+	}
+
+	for (i=0; i<4; i++)
+	{
+		for (j=0; j<16; j++)
+		{
+			r_texture_distorttexture[i*16+j] = NULL;
+			if (gl_textureshader)
+			{
+				for (y=0; y<DISTORTRESOLUTION; y++)
+				{
+					for (x=0; x<DISTORTRESOLUTION; x++)
+					{
+						data[4][y][x][0] = R_MorphDistortTexture (data[(i-1)&3][y][x][0], data[i][y][x][0], data[(i+1)&3][y][x][0], data[(i+2)&3][y][x][0], 0.0625*j);
+						data[4][y][x][1] = R_MorphDistortTexture (data[(i-1)&3][y][x][1], data[i][y][x][1], data[(i+1)&3][y][x][1], data[(i+2)&3][y][x][1], 0.0625*j);
+					}
+				}
+				r_texture_distorttexture[i*16+j] = R_LoadTexture2D(r_main_texturepool, va("distorttexture%i", i*16+j), DISTORTRESOLUTION, DISTORTRESOLUTION, &data[4][0][0][0], TEXTYPE_DSDT, TEXF_PRECACHE, NULL);
+			}
+		}
+	}
+}
+
+static void R_BuildBlankTextures(void)
 {
-	int x, y;
-	qbyte pix[16][16][4];
 	qbyte data[4];
-	r_main_texturepool = R_AllocTexturePool();
-	r_bloom_texture_screen = NULL;
-	r_bloom_texture_bloom = NULL;
 	data[0] = 128; // normal X
 	data[1] = 128; // normal Y
 	data[2] = 255; // normal Z
@@ -232,6 +322,12 @@ void gl_main_start(void)
 	data[2] = 0;
 	data[3] = 255;
 	r_texture_black = R_LoadTexture2D(r_main_texturepool, "blankblack", 1, 1, data, TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
+}
+
+static void R_BuildNoTexture(void)
+{
+	int x, y;
+	qbyte pix[16][16][4];
 	// this makes a light grey/dark grey checkerboard texture
 	for (y = 0;y < 16;y++)
 	{
@@ -253,7 +349,94 @@ void gl_main_start(void)
 			}
 		}
 	}
-	r_texture_notexture = R_LoadTexture2D(mod_shared_texturepool, "notexture", 16, 16, &pix[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP, NULL);
+	r_texture_notexture = R_LoadTexture2D(r_main_texturepool, "notexture", 16, 16, &pix[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP, NULL);
+}
+
+static void R_BuildWhiteCube(void)
+{
+	qbyte data[6*1*1*4];
+	data[ 0] = 255;data[ 1] = 255;data[ 2] = 255;data[ 3] = 255;
+	data[ 4] = 255;data[ 5] = 255;data[ 6] = 255;data[ 7] = 255;
+	data[ 8] = 255;data[ 9] = 255;data[10] = 255;data[11] = 255;
+	data[12] = 255;data[13] = 255;data[14] = 255;data[15] = 255;
+	data[16] = 255;data[17] = 255;data[18] = 255;data[19] = 255;
+	data[20] = 255;data[21] = 255;data[22] = 255;data[23] = 255;
+	r_texture_whitecube = R_LoadTextureCubeMap(r_main_texturepool, "whitecube", 1, data, TEXTYPE_RGBA, TEXF_PRECACHE | TEXF_CLAMP, NULL);
+}
+
+static void R_BuildNormalizationCube(void)
+{
+	int x, y, side;
+	vec3_t v;
+	vec_t s, t, intensity;
+#define NORMSIZE 64
+	qbyte data[6][NORMSIZE][NORMSIZE][4];
+	for (side = 0;side < 6;side++)
+	{
+		for (y = 0;y < NORMSIZE;y++)
+		{
+			for (x = 0;x < NORMSIZE;x++)
+			{
+				s = (x + 0.5f) * (2.0f / NORMSIZE) - 1.0f;
+				t = (y + 0.5f) * (2.0f / NORMSIZE) - 1.0f;
+				switch(side)
+				{
+				case 0:
+					v[0] = 1;
+					v[1] = -t;
+					v[2] = -s;
+					break;
+				case 1:
+					v[0] = -1;
+					v[1] = -t;
+					v[2] = s;
+					break;
+				case 2:
+					v[0] = s;
+					v[1] = 1;
+					v[2] = t;
+					break;
+				case 3:
+					v[0] = s;
+					v[1] = -1;
+					v[2] = -t;
+					break;
+				case 4:
+					v[0] = s;
+					v[1] = -t;
+					v[2] = 1;
+					break;
+				case 5:
+					v[0] = -s;
+					v[1] = -t;
+					v[2] = -1;
+					break;
+				}
+				intensity = 127.0f / sqrt(DotProduct(v, v));
+				data[side][y][x][0] = 128.0f + intensity * v[0];
+				data[side][y][x][1] = 128.0f + intensity * v[1];
+				data[side][y][x][2] = 128.0f + intensity * v[2];
+				data[side][y][x][3] = 255;
+			}
+		}
+	}
+	r_texture_normalizationcube = R_LoadTextureCubeMap(r_main_texturepool, "normalcube", NORMSIZE, &data[0][0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE | TEXF_CLAMP, NULL);
+}
+
+void gl_main_start(void)
+{
+	r_main_texturepool = R_AllocTexturePool();
+	r_bloom_texture_screen = NULL;
+	r_bloom_texture_bloom = NULL;
+	R_BuildBlankTextures();
+	R_BuildNoTexture();
+	R_BuildDetailTextures();
+	R_BuildDistortTexture();
+	if (gl_texturecubemap)
+	{
+		R_BuildWhiteCube();
+		R_BuildNormalizationCube();
+	}
 }
 
 void gl_main_shutdown(void)
@@ -264,6 +447,8 @@ void gl_main_shutdown(void)
 	r_texture_blanknormalmap = NULL;
 	r_texture_white = NULL;
 	r_texture_black = NULL;
+	r_texture_whitecube = NULL;
+	r_texture_normalizationcube = NULL;
 }
 
 extern void CL_ParseEntityLump(char *entitystring);
@@ -316,6 +501,7 @@ void GL_Main_Init(void)
 	Cvar_RegisterVariable(&r_bloom_blur);
 	Cvar_RegisterVariable(&r_bloom_resolution);
 	Cvar_RegisterVariable(&r_bloom_power);
+	Cvar_RegisterVariable(&developer_texturelogging);
 	if (gamemode == GAME_NEHAHRA || gamemode == GAME_NEXUIZ || gamemode == GAME_TENEBRAE)
 		Cvar_SetValue("r_fullbrights", 0);
 	R_RegisterModule("GL_Main", gl_main_start, gl_main_shutdown, gl_main_newmap);
@@ -475,6 +661,7 @@ static void R_MarkEntities (void)
 	if (!r_drawentities.integer)
 		return;
 
+	r_refdef.worldentity->visframe = r_framecount;
 	renderimask = envmap ? (RENDER_EXTERIORMODEL | RENDER_VIEWMODEL) : (chase_active.integer ? 0 : RENDER_EXTERIORMODEL);
 	if (r_refdef.worldmodel && r_refdef.worldmodel->brush.BoxTouchingVisibleLeafs)
 	{
@@ -661,14 +848,14 @@ static void R_BlendView(void)
 		qglViewport(r_view_x, vid.realheight - (r_view_y + bloomheight), bloomwidth, bloomheight);
 		GL_BlendFunc(GL_ONE, GL_ZERO);
 		GL_Color(1, 1, 1, 1);
-		R_Mesh_Draw(4, 2, polygonelements);
+		R_Mesh_Draw(0, 4, 2, polygonelements);
 		c_bloomdraws++;
 		c_bloomdrawpixels += bloomwidth * bloomheight;
 		// render multiple times with a multiply blendfunc to raise to a power
 		GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
 		for (x = 1;x < r_bloom_power.integer;x++)
 		{
-			R_Mesh_Draw(4, 2, polygonelements);
+			R_Mesh_Draw(0, 4, 2, polygonelements);
 			c_bloomdraws++;
 			c_bloomdrawpixels += bloomwidth * bloomheight;
 		}
@@ -707,7 +894,7 @@ static void R_BlendView(void)
 			if (r < 0.01f)
 				continue;
 			GL_Color(r, r, r, 1);
-			R_Mesh_Draw(4, 2, polygonelements);
+			R_Mesh_Draw(0, 4, 2, polygonelements);
 			c_bloomdraws++;
 			c_bloomdrawpixels += bloomwidth * bloomheight;
 			GL_BlendFunc(GL_ONE, GL_ONE);
@@ -742,7 +929,7 @@ static void R_BlendView(void)
 			if (r < 0.01f)
 				continue;
 			GL_Color(r, r, r, 1);
-			R_Mesh_Draw(4, 2, polygonelements);
+			R_Mesh_Draw(0, 4, 2, polygonelements);
 			c_bloomdraws++;
 			c_bloomdrawpixels += bloomwidth * bloomheight;
 			GL_BlendFunc(GL_ONE, GL_ONE);
@@ -777,7 +964,7 @@ static void R_BlendView(void)
 		R_Mesh_State(&m);
 		GL_BlendFunc(GL_ONE, GL_ZERO);
 		GL_Color(1,1,1,1);
-		R_Mesh_Draw(4, 2, polygonelements);
+		R_Mesh_Draw(0, 4, 2, polygonelements);
 		c_bloomdraws++;
 		c_bloomdrawpixels += r_view_width * r_view_height;
 		// now blend on the bloom texture if multipass
@@ -790,7 +977,7 @@ static void R_BlendView(void)
 			R_Mesh_State(&m);
 			GL_BlendFunc(GL_ONE, GL_ONE);
 			GL_Color(1,1,1,1);
-			R_Mesh_Draw(4, 2, polygonelements);
+			R_Mesh_Draw(0, 4, 2, polygonelements);
 			c_bloomdraws++;
 			c_bloomdrawpixels += r_view_width * r_view_height;
 		}
@@ -803,7 +990,7 @@ static void R_BlendView(void)
 		R_Mesh_State(&m);
 		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 		GL_Color(r_refdef.viewblend[0], r_refdef.viewblend[1], r_refdef.viewblend[2], r_refdef.viewblend[3]);
-		R_Mesh_Draw(4, 2, polygonelements);
+		R_Mesh_Draw(0, 4, 2, polygonelements);
 	}
 }
 
@@ -960,10 +1147,10 @@ void R_RenderScene(void)
 	R_MeshQueue_Render();
 	R_MeshQueue_EndScene();
 
-	if (r_shadow_visiblevolumes.integer && !r_showtrispass)
+	if ((r_shadow_visiblelighting.integer || r_shadow_visiblevolumes.integer) && !r_showtrispass)
 	{
 		R_ShadowVolumeLighting(true);
-		R_TimeReport("shadowvolume");
+		R_TimeReport("visiblevolume");
 	}
 
 	GL_ShowTrisColor(0.05, 0.05, 0.05, 1);
@@ -1098,7 +1285,7 @@ void R_DrawNoModelCallback(const void *calldata1, int calldata2)
 	else
 		m.pointer_color = nomodelcolor4f;
 	R_Mesh_State(&m);
-	R_Mesh_Draw(6, 8, nomodelelements);
+	R_Mesh_Draw(0, 6, 8, nomodelelements);
 }
 
 void R_DrawNoModel(entity_render_t *ent)
@@ -1176,6 +1363,6 @@ void R_DrawSprite(int blendfunc1, int blendfunc2, rtexture_t *texture, int depth
 	m.pointer_vertex = varray_vertex3f;
 	R_Mesh_State(&m);
 	GL_Color(cr, cg, cb, ca);
-	R_Mesh_Draw(4, 2, polygonelements);
+	R_Mesh_Draw(0, 4, 2, polygonelements);
 }