X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=r_light.c;h=e233ff7e188c4ffdc98a77cd539fa62f2e8c7f1c;hb=279f0872533dc81f28514584be5e41481fc106da;hp=57b9cc689609667c969b1484bb95707894032029;hpb=fedb845e665b669ff11df23ce713842bd89c4ec4;p=xonotic%2Fdarkplaces.git

diff --git a/r_light.c b/r_light.c
index 57b9cc68..e233ff7e 100644
--- a/r_light.c
+++ b/r_light.c
@@ -53,7 +53,7 @@ void r_light_start(void)
 			pixels[y][x][3] = 255;
 		}
 	}
-	lightcorona = R_LoadTexture (lighttexturepool, "lightcorona", 32, 32, &pixels[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE);
+	lightcorona = R_LoadTexture2D(lighttexturepool, "lightcorona", 32, 32, &pixels[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
 }
 
 void r_light_shutdown(void)
@@ -132,7 +132,7 @@ void R_BuildLightList(void)
 			rd->cullradius2 = (2048.0f * 2048.0f);
 		rd->cullradius = sqrt(rd->cullradius2);
 		rd->subtract = 1.0f / rd->cullradius2;
-		//rd->ent = cd->ent;
+		rd->ent = cd->ent;
 		c_dlights++; // count every dlight in use
 	}
 }
@@ -148,19 +148,22 @@ void R_DrawCoronas(void)
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_ONE;
 	m.blendfunc2 = GL_ONE;
-	m.wantoverbright = false;
 	m.depthdisable = true; // magic
 	m.tex[0] = R_GetTexture(lightcorona);
 	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;
 		dist = (DotProduct(rd->origin, vpn) - viewdist);
-		if (dist >= 24.0f && CL_TraceLine(rd->origin, r_origin, NULL, NULL, 0, true) == 1)
+		if (dist >= 24.0f && CL_TraceLine(rd->origin, r_origin, NULL, NULL, 0, true, NULL) == 1)
 		{
-			scale = mesh_colorscale * (1.0f / 131072.0f);
+			scale = r_colorscale * (1.0f / 131072.0f);
 			if (gl_flashblend.integer)
 				scale *= 4.0f;
 			if (fogenabled)
@@ -168,24 +171,7 @@ void R_DrawCoronas(void)
 				VectorSubtract(rd->origin, r_origin, diff);
 				scale *= 1 - exp(fogdensity/DotProduct(diff,diff));
 			}
-			varray_element[0] = 0;
-			varray_element[1] = 1;
-			varray_element[2] = 2;
-			varray_element[3] = 0;
-			varray_element[4] = 2;
-			varray_element[5] = 3;
-			varray_color[ 0] = varray_color[ 4] = varray_color[ 8] = varray_color[12] = rd->light[0] * scale;
-			varray_color[ 1] = varray_color[ 5] = varray_color[ 9] = varray_color[13] = rd->light[1] * scale;
-			varray_color[ 2] = varray_color[ 6] = varray_color[10] = varray_color[14] = rd->light[2] * scale;
-			varray_color[ 3] = varray_color[ 7] = varray_color[11] = varray_color[15] = 1;
-			varray_texcoord[0][0] = 0;
-			varray_texcoord[0][1] = 0;
-			varray_texcoord[0][2] = 0;
-			varray_texcoord[0][3] = 1;
-			varray_texcoord[0][4] = 1;
-			varray_texcoord[0][5] = 1;
-			varray_texcoord[0][6] = 1;
-			varray_texcoord[0][7] = 0;
+			GL_Color(rd->light[0] * scale, rd->light[1] * scale, rd->light[2] * scale, 1);
 			scale = rd->cullradius * 0.25f;
 			if (gl_flashblend.integer)
 				scale *= 2.0f;
@@ -201,7 +187,7 @@ void R_DrawCoronas(void)
 			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);
+			R_Mesh_Draw(4, 2, polygonelements);
 		}
 	}
 }
@@ -223,7 +209,7 @@ static void R_OldMarkLights (entity_render_t *ent, vec3_t lightorigin, rdlight_t
 {
 	float ndist, maxdist;
 	msurface_t *surf;
-	int i;
+	int i, *surfacepvsframes;
 	int d, impacts, impactt;
 	float dist, dist2, impact[3];
 
@@ -233,6 +219,7 @@ static void R_OldMarkLights (entity_render_t *ent, vec3_t lightorigin, rdlight_t
 	// for comparisons to minimum acceptable light
 	maxdist = rd->cullradius2;
 
+	surfacepvsframes = ent->model->surfacepvsframes;
 loc0:
 	if (node->contents < 0)
 		return;
@@ -254,7 +241,7 @@ loc0:
 	surf = ent->model->surfaces + node->firstsurface;
 	for (i = 0;i < node->numsurfaces;i++, surf++)
 	{
-		if (surf->visframe != r_framecount)
+		if (surfacepvsframes[surf->number] != ent->model->pvsframecount)
 			continue;
 		dist = ndist;
 		if (surf->flags & SURF_PLANEBACK)
@@ -329,8 +316,8 @@ static void R_VisMarkLights (entity_render_t *ent, rdlight_t *rd, int bit, int b
 	mleaf_t *pvsleaf;
 	vec3_t lightorigin;
 	model_t *model;
-	int i, k, m, c, leafnum;
-	msurface_t *surf, **mark;
+	int i, k, m, c, leafnum, *surfacepvsframes, *mark;
+	msurface_t *surf;
 	mleaf_t *leaf;
 	qbyte *in;
 	int row;
@@ -363,6 +350,7 @@ static void R_VisMarkLights (entity_render_t *ent, rdlight_t *rd, int bit, int b
 	maxdist = rd->cullradius2;
 
 	row = (model->numleafs+7)>>3;
+	surfacepvsframes = model->surfacepvsframes;
 
 	k = 0;
 	while (k < row)
@@ -388,12 +376,12 @@ static void R_VisMarkLights (entity_render_t *ent, rdlight_t *rd, int bit, int b
 						mark = leaf->firstmarksurface;
 						do
 						{
-							surf = *mark++;
+							surf = model->surfaces + *mark++;
 							// if not visible in current frame, or already marked because it was in another leaf we passed, skip
 							if (surf->lightframe == lightframe)
 								continue;
 							surf->lightframe = lightframe;
-							if (surf->visframe != r_framecount)
+							if (surfacepvsframes[surf->number] != model->pvsframecount)
 								continue;
 							dist = PlaneDiff(lightorigin, surf->plane);
 							if (surf->flags & SURF_PLANEBACK)
@@ -632,7 +620,7 @@ void R_CompleteLightPoint (vec3_t color, const vec3_t p, int dynamic, const mlea
 			{
 				VectorSubtract (p, sl->origin, v);
 				f = ((1.0f / (DotProduct(v, v) * sl->falloff + sl->distbias)) - sl->subtract);
-				if (f > 0 && CL_TraceLine(p, sl->origin, NULL, NULL, 0, false) == 1)
+				if (f > 0 && CL_TraceLine(p, sl->origin, NULL, NULL, 0, false, NULL) == 1)
 				{
 					f *= d_lightstylevalue[sl->style] * (1.0f / 65536.0f);
 					VectorMA(color, f, sl->light, color);
@@ -650,7 +638,7 @@ void R_CompleteLightPoint (vec3_t color, const vec3_t p, int dynamic, const mlea
 			rd = r_dlight + i;
 			VectorSubtract (p, rd->origin, v);
 			f = DotProduct(v, v);
-			if (f < rd->cullradius2 && CL_TraceLine(p, rd->origin, NULL, NULL, 0, false) == 1)
+			if (f < rd->cullradius2 && CL_TraceLine(p, rd->origin, NULL, NULL, 0, false, NULL) == 1)
 			{
 				f = (1.0f / (f + LIGHTOFFSET)) - rd->subtract;
 				VectorMA(color, f, rd->light, color);
@@ -674,7 +662,7 @@ void R_ModelLightPoint (const entity_render_t *ent, vec3_t color, const vec3_t p
 		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 colorr, float colorg, float colorb, int worldcoords)
+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;
 	float color[3], basecolor[3], v[3], t, *av, *avn, *avc, a, f, dist2, mscale, dot, stylescale, intensity, ambientcolor[3];
@@ -763,7 +751,7 @@ void R_LightModel(const entity_render_t *ent, int numverts, float colorr, float
 			VectorSubtract (v, rd->origin, v);
 			if (DotProduct(v, v) < rd->cullradius2)
 			{
-				if (CL_TraceLine(ent->origin, rd->origin, NULL, NULL, 0, false) != 1)
+				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);
@@ -832,11 +820,11 @@ void R_LightModel(const entity_render_t *ent, int numverts, float colorr, float
 	basecolor[0] *= colorr;
 	basecolor[1] *= colorg;
 	basecolor[2] *= colorb;
-	avc = aliasvertcolor;
+	avc = colors;
 	if (nearlights)
 	{
-		av = aliasvert;
-		avn = aliasvertnorm;
+		av = vertices;
+		avn = normals;
 		for (i = 0;i < numverts;i++)
 		{
 			VectorCopy(basecolor, color);
@@ -878,7 +866,7 @@ void R_LightModel(const entity_render_t *ent, int numverts, float colorr, float
 			avc[3] = a;
 			avc += 4;
 			av += 4;
-			avn += 3;
+			avn += 4;
 		}
 	}
 	else
@@ -905,7 +893,7 @@ void R_UpdateEntLights(entity_render_t *ent)
 		ent->numentlights = 0;
 		if (cl.worldmodel)
 			for (i = 0, sl = cl.worldmodel->lights;i < cl.worldmodel->numlights && ent->numentlights < MAXENTLIGHTS;i++, sl++)
-				if (CL_TraceLine(ent->origin, sl->origin, NULL, NULL, 0, false) == 1)
+				if (CL_TraceLine(ent->origin, sl->origin, NULL, NULL, 0, false, NULL) == 1)
 					ent->entlights[ent->numentlights++] = i;
 	}
 	ent->entlightsframe = r_framecount;