Merge branch 'rend2-unified-wip' into rend2-builds

SomaZ · Jun 12, 2024 · 412f733 · 412f733
2 parents 718f0ba + 664bab7
commit 412f733
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/code/rd-rend2/G2_API.cpp b/code/rd-rend2/G2_API.cpp
@@ -2201,23 +2201,12 @@ qboolean G2API_SetNewOrigin(CGhoul2Info* ghlInfo, const int boltIndex)
 {
 	if (G2_SetupModelPointers(ghlInfo))
 	{
-		if (boltIndex < 0)
+		// check for valid boltIndex before applying new origin
+		if (boltIndex >= 0 && boltIndex < (int)ghlInfo->mBltlist.size())
 		{
-            char modelName[MAX_QPATH];
-			if (ghlInfo->currentModel && ghlInfo->currentModel->name[0])
-			{
-				strcpy(modelName, ghlInfo->currentModel->name);
-			}
-			else
-			{
-				strcpy(modelName, "[Unknown - unexpected]");
-			}
-
-			Com_Error(ERR_DROP, "Bad boltindex (%i) trying to SetNewOrigin (naughty naughty!)\nModel %s\n", boltIndex, modelName);
+			ghlInfo->mNewOrigin = boltIndex;
+			ghlInfo->mFlags |= GHOUL2_NEWORIGIN;
 		}
-
-		ghlInfo->mNewOrigin = boltIndex;
-		ghlInfo->mFlags |= GHOUL2_NEWORIGIN;
 		return qtrue;
 	}
 	return qfalse;

diff --git a/shared/rd-rend2/tr_bsp.cpp b/shared/rd-rend2/tr_bsp.cpp
@@ -3823,7 +3823,8 @@ static int R_CreateSurfaceSpritesVertexData(
 	const srfVert_t *verts = bspSurf->verts;
 	const glIndex_t *indexes = bspSurf->indexes;
 
-	vec4_t color = { 1.0, 1.0, 1.0, 1.0 };
+#if 0
+	vec4_t color = { 1.0f, 1.0f, 1.0f, 1.0f };
 	if (stage->rgbGen == CGEN_CONST)
 	{
 		color[0] = stage->constantColor[0];
@@ -3835,6 +3836,13 @@ static int R_CreateSurfaceSpritesVertexData(
 		stage->rgbGen == CGEN_EXACT_VERTEX ||
 		stage->rgbGen == CGEN_VERTEX_LIT ||
 		stage->rgbGen == CGEN_EXACT_VERTEX_LIT);
+#else
+	// Vanilla behaviour is always: color by vertex color of the emitting surface
+	// even just the blue component used for all three color channels to be exact
+	// in pseudo code: outVert.rgb = inVert.bbb;
+	bool vertexLit = true;
+	vec4_t color = { 1.0f, 1.0f, 1.0f, 1.0f };
+#endif
 
 	int numSprites = 0;
 	for ( int i = 0, numIndexes = bspSurf->numIndexes; i < numIndexes; i += 3 )
@@ -4017,7 +4025,7 @@ static void R_GenerateSurfaceSprites( const world_t *world, int worldIndex )
 	for (int i = 0; i < tr.numShaders; i++)
 	{
 		const shader_t *shader = tr.shaders[i];
-		if (shader->spriteUbo != -1)
+		if (shader->spriteUbo != 0)
 			continue;
 
 		numSpriteStages += shader->numSurfaceSpriteStages;

diff --git a/shared/rd-rend2/tr_shade.cpp b/shared/rd-rend2/tr_shade.cpp
@@ -1256,6 +1256,9 @@ static shaderProgram_t *SelectShaderProgram( int stageIndex, shaderStage_t *stag
 			{
 				index |= LIGHTDEF_USE_ALPHA_TEST;
 			}*/
+
+			if (stage->bundle[0].tcGen != TCGEN_TEXTURE || (stage->bundle[0].numTexMods))
+				index |= LIGHTDEF_USE_TCGEN_AND_TCMOD;
 
 			// TODO: remove light vertex def and fix parallax usage on unlit stages like glow stages
 			if (stage->glslShaderIndex & LIGHTDEF_USE_PARALLAXMAP &&

diff --git a/shared/rd-rend2/tr_shader.cpp b/shared/rd-rend2/tr_shader.cpp
@@ -3372,6 +3372,14 @@ static qboolean CollapseStagesToGLSL(void)
 			if (pStage->bundle[0].tcGen >= TCGEN_LIGHTMAP && pStage->bundle[0].tcGen <= TCGEN_LIGHTMAP3)
 				continue;
 
+			if (i > 0)
+			{
+				int blendBits = pStage->stateBits & (GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
+				if (blendBits == (GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO) ||
+					blendBits == (GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR))
+					continue;
+			}
+
 			diffuse  = pStage;
 			parallax = qfalse;
 			lightmap = NULL;
@@ -3810,7 +3818,7 @@ static shader_t *GeneratePermanentShader( void ) {
 	}
 
 	RB_AddShaderToShaderInstanceUBO(newShader);
-	newShader->spriteUbo = -1;
+	newShader->spriteUbo = 0;
 
 	SortNewShader();