Merge pull request #1008 from qw-ctf/dclm-mdl

dsvensson · web-flow · commit cf7f53e7454c · 2025-01-25T15:42:47.000+01:00
LIGHTMAPS: Fix aliasmodel lighting when using DECOUPLED_LM.
diff --git a/src/r_rlight.c b/src/r_rlight.c
@@ -401,8 +401,8 @@ static int RecursiveLightPoint(vec3_t color, mnode_t *node, const vec3_t start,
 				continue;	// no lightmaps
 			}
 
-			ds = (int)((float)DotProduct(mid, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]);
-			dt = (int)((float)DotProduct(mid, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]);
+			ds = (int)((float)DotProduct(mid, surf->lmvecs[0]) + surf->lmvecs[0][3]);
+			dt = (int)((float)DotProduct(mid, surf->lmvecs[1]) + surf->lmvecs[1][3]);
 			if (ds < surf->texturemins[0] || dt < surf->texturemins[1]) {
 				continue;
 			}

Original file line number	Diff line number	Diff line change
`@@ -401,8 +401,8 @@ static int RecursiveLightPoint(vec3_t color, mnode_t *node, const vec3_t start,`
`401`	`401`	`continue; // no lightmaps`
`402`	`402`	`}`
`403`	`403`
`404`		`- ds = (int)((float)DotProduct(mid, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]);`
`405`		`- dt = (int)((float)DotProduct(mid, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]);`
	`404`	`+ ds = (int)((float)DotProduct(mid, surf->lmvecs[0]) + surf->lmvecs[0][3]);`
	`405`	`+ dt = (int)((float)DotProduct(mid, surf->lmvecs[1]) + surf->lmvecs[1][3]);`
`406`	`406`	`if (ds < surf->texturemins[0] \|\| dt < surf->texturemins[1]) {`
`407`	`407`	`continue;`
`408`	`408`	`}`