q3bsp lightmap no longer bound to light style about darkplaces

[Baker7]

Solution:

gl_rmain.c , R_UpdateVariables

if (r_refdef.scene.worldmodel)
{
	r_refdef.scene.lightmapintensity *= r_refdef.scene.worldmodel->lightmapscale;
	// Baker: Add this ...
	if (cl.worldmodel && cl.worldmodel->type == mod_brushq3) {
		r_refdef.scene.lightmapintensity *= r_refdef.scene.rtlightstylevalue[0];
	}
}

[Baker7]

Hemebond, can you provide the last known working version of DarkPlaces that did not have the issue.

I assume Wrath doesn't have issue? Is this correct?

If you can tell me the most recent one where it worked, I would like to take a look at this.

[hemebond]

Hemebond, can you provide the last known working version of DarkPlaces that did not have the issue.

I tried to compile older versions to find and test the exact commit but couldn't compile (I need to try with 5e9e998). It appears there were significant light style changes in fb21704.

I assume Wrath doesn't have issue? Is this correct?

Correct. Wrath is based on a much older version.

If you can tell me the most recent one where it worked, I would like to take a look at this.

The most recent "release" that works is 2017-08-30.

[Baker7]

This is highly likely part of the solution:

Classic DarkPlaces does this in gl_rmain.c in R_GetCurrentTexture:

And DarkPlaces Beta has no equivalent code in R_GetCurrentTexture

		VectorSet(t->dlightcolor, t->lightmapcolor[0] * t->lightmapcolor[3], t->lightmapcolor[1] * t->lightmapcolor[3], t->lightmapcolor[2] * t->lightmapcolor[3]);
		colorscale = 2;
		// q3bsp has no lightmap updates, so the lightstylevalue that
		// would normally be baked into the lightmap must be
		// applied to the color
		// FIXME: r_glsl 1 rendering doesn't support overbright lightstyles with this (the default light style is not overbright)
		if (model->type == mod_brushq3)
			colorscale *= r_refdef.scene.rtlightstylevalue[0];
		colorscale *= r_refdef.lightmapintensity;
		VectorScale(t->lightmapcolor, r_refdef.scene.ambient, ambientcolor);
		VectorScale(t->lightmapcolor, colorscale, t->lightmapcolor);