X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_light.c;h=395af9ec520b35648e3105d125effeb9a3849932;hb=4596c46213ae652af1b2e4bc6b691076cff2c416;hp=e233ff7e188c4ffdc98a77cd539fa62f2e8c7f1c;hpb=63a4ff4563c4bbd232c265a288e9890e4015bd93;p=xonotic%2Fdarkplaces.git

diff --git a/r_light.c b/r_light.c
index e233ff7e..395af9ec 100644
--- a/r_light.c
+++ b/r_light.c
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include "cl_collision.h"
+#include "r_shadow.h"
 
 rdlight_t r_dlight[MAX_DLIGHTS];
 int r_numdlights = 0;
@@ -153,10 +154,6 @@ void R_DrawCoronas(void)
 	R_Mesh_Matrix(&r_identitymatrix);
 	R_Mesh_State(&m);
 	viewdist = DotProduct(r_origin, vpn);
-	varray_texcoord[0][ 0] = 0;varray_texcoord[0][ 1] = 0;
-	varray_texcoord[0][ 4] = 0;varray_texcoord[0][ 5] = 1;
-	varray_texcoord[0][ 8] = 1;varray_texcoord[0][ 9] = 1;
-	varray_texcoord[0][12] = 1;varray_texcoord[0][13] = 0;
 	for (i = 0;i < r_numdlights;i++)
 	{
 		rd = r_dlight + i;
@@ -175,19 +172,7 @@ void R_DrawCoronas(void)
 			scale = rd->cullradius * 0.25f;
 			if (gl_flashblend.integer)
 				scale *= 2.0f;
-			varray_vertex[0] = rd->origin[0] - vright[0] * scale - vup[0] * scale;
-			varray_vertex[1] = rd->origin[1] - vright[1] * scale - vup[1] * scale;
-			varray_vertex[2] = rd->origin[2] - vright[2] * scale - vup[2] * scale;
-			varray_vertex[4] = rd->origin[0] - vright[0] * scale + vup[0] * scale;
-			varray_vertex[5] = rd->origin[1] - vright[1] * scale + vup[1] * scale;
-			varray_vertex[6] = rd->origin[2] - vright[2] * scale + vup[2] * scale;
-			varray_vertex[8] = rd->origin[0] + vright[0] * scale + vup[0] * scale;
-			varray_vertex[9] = rd->origin[1] + vright[1] * scale + vup[1] * scale;
-			varray_vertex[10] = rd->origin[2] + vright[2] * scale + vup[2] * scale;
-			varray_vertex[12] = rd->origin[0] + vright[0] * scale - vup[0] * scale;
-			varray_vertex[13] = rd->origin[1] + vright[1] * scale - vup[1] * scale;
-			varray_vertex[14] = rd->origin[2] + vright[2] * scale - vup[2] * scale;
-			R_Mesh_Draw(4, 2, polygonelements);
+			R_DrawSpriteMesh(rd->origin, vright, vup, scale, -scale, -scale, scale);
 		}
 	}
 }
@@ -284,6 +269,8 @@ loc0:
 		{
 			surf->dlightbits[0] = surf->dlightbits[1] = surf->dlightbits[2] = surf->dlightbits[3] = surf->dlightbits[4] = surf->dlightbits[5] = surf->dlightbits[6] = surf->dlightbits[7] = 0;
 			surf->dlightframe = r_framecount;
+			if (r_dlightmap.integer)
+				surf->cached_dlight = true;
 		}
 		surf->dlightbits[bitindex] |= bit;
 	}
@@ -423,6 +410,8 @@ static void R_VisMarkLights (entity_render_t *ent, rdlight_t *rd, int bit, int b
 								{
 									surf->dlightbits[0] = surf->dlightbits[1] = surf->dlightbits[2] = surf->dlightbits[3] = surf->dlightbits[4] = surf->dlightbits[5] = surf->dlightbits[6] = surf->dlightbits[7] = 0;
 									surf->dlightframe = r_framecount;
+									if (r_dlightmap.integer)
+										surf->cached_dlight = true;
 								}
 								surf->dlightbits[bitindex] |= bit;
 							}
@@ -647,21 +636,6 @@ void R_CompleteLightPoint (vec3_t color, const vec3_t p, int dynamic, const mlea
 	}
 }
 
-void R_ModelLightPoint (const entity_render_t *ent, vec3_t color, const vec3_t p)
-{
-	mleaf_t *leaf;
-	leaf = Mod_PointInLeaf(p, cl.worldmodel);
-	if (!leaf || leaf->contents == CONTENTS_SOLID || r_fullbright.integer || !cl.worldmodel->lightdata || ent->effects & EF_FULLBRIGHT)
-	{
-		color[0] = color[1] = color[2] = 1;
-		return;
-	}
-
-	color[0] = color[1] = color[2] = r_ambient.value * (2.0f / 128.0f);
-	if (!cl.worldmodel->numlights)
-		RecursiveLightPoint (color, cl.worldmodel->nodes, p[0], p[1], p[2], p[2] - 65536);
-}
-
 void R_LightModel(const entity_render_t *ent, int numverts, float *vertices, float *normals, float *colors, float colorr, float colorg, float colorb, int worldcoords)
 {
 	int i, j, nearlights = 0, maxnearlights = r_modellights.integer;
@@ -682,14 +656,28 @@ void R_LightModel(const entity_render_t *ent, int numverts, float *vertices, flo
 	nearlight[MAX_DLIGHTS], *nl;
 	mlight_t *sl;
 	rdlight_t *rd;
+	mleaf_t *leaf;
 	a = ent->alpha;
 	// scale of the model's coordinate space, to alter light attenuation to match
 	// make the mscale squared so it can scale the squared distance results
 	mscale = ent->scale * ent->scale;
-	if ((maxnearlights != 0) && !r_fullbright.integer && !(ent->effects & EF_FULLBRIGHT))
+	if (r_fullbright.integer || (ent->effects & EF_FULLBRIGHT))
+		basecolor[0] = basecolor[1] = basecolor[2] = 1.0f;
+	else if (r_shadow_realtime_world.integer)
+		basecolor[0] = basecolor[1] = basecolor[2] = r_ambient.value * (2.0f / 128.0f);
+	else if (maxnearlights == 0)
+		R_CompleteLightPoint (basecolor, ent->origin, true, NULL);
+	else
 	{
-		R_ModelLightPoint(ent, basecolor, ent->origin);
-
+		leaf = Mod_PointInLeaf(ent->origin, cl.worldmodel);
+		if (!leaf || leaf->contents == CONTENTS_SOLID || !cl.worldmodel->lightdata)
+			basecolor[0] = basecolor[1] = basecolor[2] = 1;
+		else
+		{
+			basecolor[0] = basecolor[1] = basecolor[2] = r_ambient.value * (2.0f / 128.0f);
+			if (!cl.worldmodel->numlights)
+				RecursiveLightPoint (basecolor, cl.worldmodel->nodes, ent->origin[0], ent->origin[1], ent->origin[2], ent->origin[2] - 65536);
+		}
 		nl = &nearlight[0];
 		for (i = 0;i < ent->numentlights;i++)
 		{
@@ -741,88 +729,88 @@ void R_LightModel(const entity_render_t *ent, int numverts, float *vertices, flo
 				nl->offset = sl->distbias;
 			}
 		}
-		for (i = 0;i < r_numdlights;i++)
+		if (!r_shadow_realtime_dlight.integer)
 		{
-			rd = r_dlight + i;
-			VectorCopy(rd->origin, v);
-			if (v[0] < ent->mins[0]) v[0] = ent->mins[0];if (v[0] > ent->maxs[0]) v[0] = ent->maxs[0];
-			if (v[1] < ent->mins[1]) v[1] = ent->mins[1];if (v[1] > ent->maxs[1]) v[1] = ent->maxs[1];
-			if (v[2] < ent->mins[2]) v[2] = ent->mins[2];if (v[2] > ent->maxs[2]) v[2] = ent->maxs[2];
-			VectorSubtract (v, rd->origin, v);
-			if (DotProduct(v, v) < rd->cullradius2)
+			for (i = 0;i < r_numdlights;i++)
 			{
-				if (CL_TraceLine(ent->origin, rd->origin, NULL, NULL, 0, false, NULL) != 1)
-					continue;
-				VectorSubtract (ent->origin, rd->origin, v);
-				f = ((1.0f / (DotProduct(v, v) + LIGHTOFFSET)) - rd->subtract);
-				VectorScale(rd->light, f, ambientcolor);
-				intensity = DotProduct(ambientcolor, ambientcolor);
-				if (f < 0)
-					intensity *= -1.0f;
-				if (nearlights < maxnearlights)
-					j = nearlights++;
-				else
+				rd = r_dlight + i;
+				VectorCopy(rd->origin, v);
+				if (v[0] < ent->mins[0]) v[0] = ent->mins[0];if (v[0] > ent->maxs[0]) v[0] = ent->maxs[0];
+				if (v[1] < ent->mins[1]) v[1] = ent->mins[1];if (v[1] > ent->maxs[1]) v[1] = ent->maxs[1];
+				if (v[2] < ent->mins[2]) v[2] = ent->mins[2];if (v[2] > ent->maxs[2]) v[2] = ent->maxs[2];
+				VectorSubtract (v, rd->origin, v);
+				if (DotProduct(v, v) < rd->cullradius2)
 				{
-					for (j = 0;j < maxnearlights;j++)
+					if (CL_TraceLine(ent->origin, rd->origin, NULL, NULL, 0, false, NULL) != 1)
+						continue;
+					VectorSubtract (ent->origin, rd->origin, v);
+					f = ((1.0f / (DotProduct(v, v) + LIGHTOFFSET)) - rd->subtract);
+					VectorScale(rd->light, f, ambientcolor);
+					intensity = DotProduct(ambientcolor, ambientcolor);
+					if (f < 0)
+						intensity *= -1.0f;
+					if (nearlights < maxnearlights)
+						j = nearlights++;
+					else
 					{
-						if (nearlight[j].intensity < intensity)
+						for (j = 0;j < maxnearlights;j++)
 						{
-							if (nearlight[j].intensity > 0)
-								VectorAdd(basecolor, nearlight[j].ambientlight, basecolor);
-							break;
+							if (nearlight[j].intensity < intensity)
+							{
+								if (nearlight[j].intensity > 0)
+									VectorAdd(basecolor, nearlight[j].ambientlight, basecolor);
+								break;
+							}
 						}
 					}
-				}
-				if (j >= maxnearlights)
-				{
-					// this light is less significant than all others,
-					// add it to ambient
-					if (intensity > 0)
-						VectorAdd(basecolor, ambientcolor, basecolor);
-				}
-				else
-				{
-					nl = nearlight + j;
-					nl->intensity = intensity;
-					// transform the light into the model's coordinate system
-					if (worldcoords)
-						VectorCopy(rd->origin, nl->origin);
+					if (j >= maxnearlights)
+					{
+						// this light is less significant than all others,
+						// add it to ambient
+						if (intensity > 0)
+							VectorAdd(basecolor, ambientcolor, basecolor);
+					}
 					else
 					{
-						Matrix4x4_Transform(&ent->inversematrix, rd->origin, nl->origin);
-						/*
-						Con_Printf("%i %s : %f %f %f : %f %f %f\n%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n"
-						, rd - r_dlight, ent->model->name
-						, rd->origin[0], rd->origin[1], rd->origin[2]
-						, nl->origin[0], nl->origin[1], nl->origin[2]
-						, ent->inversematrix.m[0][0], ent->inversematrix.m[0][1], ent->inversematrix.m[0][2], ent->inversematrix.m[0][3]
-						, ent->inversematrix.m[1][0], ent->inversematrix.m[1][1], ent->inversematrix.m[1][2], ent->inversematrix.m[1][3]
-						, ent->inversematrix.m[2][0], ent->inversematrix.m[2][1], ent->inversematrix.m[2][2], ent->inversematrix.m[2][3]
-						, ent->inversematrix.m[3][0], ent->inversematrix.m[3][1], ent->inversematrix.m[3][2], ent->inversematrix.m[3][3]);
-						*/
+						nl = nearlight + j;
+						nl->intensity = intensity;
+						// transform the light into the model's coordinate system
+						if (worldcoords)
+							VectorCopy(rd->origin, nl->origin);
+						else
+						{
+							Matrix4x4_Transform(&ent->inversematrix, rd->origin, nl->origin);
+							/*
+							Con_Printf("%i %s : %f %f %f : %f %f %f\n%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n"
+							, rd - r_dlight, ent->model->name
+							, rd->origin[0], rd->origin[1], rd->origin[2]
+							, nl->origin[0], nl->origin[1], nl->origin[2]
+							, ent->inversematrix.m[0][0], ent->inversematrix.m[0][1], ent->inversematrix.m[0][2], ent->inversematrix.m[0][3]
+							, ent->inversematrix.m[1][0], ent->inversematrix.m[1][1], ent->inversematrix.m[1][2], ent->inversematrix.m[1][3]
+							, ent->inversematrix.m[2][0], ent->inversematrix.m[2][1], ent->inversematrix.m[2][2], ent->inversematrix.m[2][3]
+							, ent->inversematrix.m[3][0], ent->inversematrix.m[3][1], ent->inversematrix.m[3][2], ent->inversematrix.m[3][3]);
+							*/
+						}
+						// integrate mscale into falloff, for maximum speed
+						nl->falloff = mscale;
+						VectorCopy(ambientcolor, nl->ambientlight);
+						nl->light[0] = rd->light[0] * colorr * 4.0f;
+						nl->light[1] = rd->light[1] * colorg * 4.0f;
+						nl->light[2] = rd->light[2] * colorb * 4.0f;
+						nl->subtract = rd->subtract;
+						nl->offset = LIGHTOFFSET;
 					}
-					// integrate mscale into falloff, for maximum speed
-					nl->falloff = mscale;
-					VectorCopy(ambientcolor, nl->ambientlight);
-					nl->light[0] = rd->light[0] * colorr * 4.0f;
-					nl->light[1] = rd->light[1] * colorg * 4.0f;
-					nl->light[2] = rd->light[2] * colorb * 4.0f;
-					nl->subtract = rd->subtract;
-					nl->offset = LIGHTOFFSET;
 				}
 			}
 		}
 	}
-	else
-	{
-		R_CompleteLightPoint (basecolor, ent->origin, true, NULL);
-	}
 	basecolor[0] *= colorr;
 	basecolor[1] *= colorg;
 	basecolor[2] *= colorb;
 	avc = colors;
 	if (nearlights)
 	{
+		GL_UseColorArray();
 		av = vertices;
 		avn = normals;
 		for (i = 0;i < numverts;i++)
@@ -830,7 +818,7 @@ void R_LightModel(const entity_render_t *ent, int numverts, float *vertices, flo
 			VectorCopy(basecolor, color);
 			for (j = 0, nl = &nearlight[0];j < nearlights;j++, nl++)
 			{
-				VectorSubtract(nl->origin, av, v);
+				VectorSubtract(av, nl->origin, v);
 				// directional shading
 				dot = DotProduct(avn,v);
 				if (dot > 0)
@@ -865,19 +853,12 @@ void R_LightModel(const entity_render_t *ent, int numverts, float *vertices, flo
 			VectorCopy(color, avc);
 			avc[3] = a;
 			avc += 4;
-			av += 4;
-			avn += 4;
+			av += 3;
+			avn += 3;
 		}
 	}
 	else
-	{
-		for (i = 0;i < numverts;i++)
-		{
-			VectorCopy(basecolor, avc);
-			avc[3] = a;
-			avc += 4;
-		}
-	}
+		GL_Color(basecolor[0], basecolor[1], basecolor[2], a);
 }
 
 void R_UpdateEntLights(entity_render_t *ent)
@@ -885,6 +866,8 @@ void R_UpdateEntLights(entity_render_t *ent)
 	int i;
 	const mlight_t *sl;
 	vec3_t v;
+	if (r_shadow_realtime_dlight.integer)
+		return;
 	VectorSubtract(ent->origin, ent->entlightsorigin, v);
 	if (ent->entlightsframe != (r_framecount - 1) || (realtime > ent->entlightstime && DotProduct(v,v) >= 1.0f))
 	{