id-software/DoomRTX
1
0
Fork 0
mirror of https://github.com/jmarshall23/DoomRTX.git synced 2026-08-15 15:51:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug with spec maps.

Browse Source
This commit is contained in:
Justin Marshall
2026-05-07 12:26:46 -07:00
parent 1a6bc0c447
commit 469be38dbe
6 changed files with 434 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
neo/renderer/draw_common.cpp
+20 -6
View File
@@ -442,10 +442,10 @@ void RB_T_FillDepthBuffer( const drawSurf_t *surf ) {
bool drawSolid = false;
if ( shader->Coverage() == MC_OPAQUE ) {
//if ( shader->Coverage() == MC_OPAQUE ) {
drawSolid = true;
}
//}
#if 0
// we may have multiple alpha tested stages
if ( shader->Coverage() == MC_PERFORATED ) {
// if the only alpha tested stages are condition register omitted,
@@ -497,7 +497,7 @@ void RB_T_FillDepthBuffer( const drawSurf_t *surf ) {
drawSolid = true;
}
}
#endif
// draw the entire surface solid
// draw the entire surface solid
if (drawSolid && !shader->IsSky()) {
@@ -512,10 +512,15 @@ void RB_T_FillDepthBuffer( const drawSurf_t *surf ) {
shader->GetBumpImage()->Bind();
glBindNormalMapTexture(shader->GetBumpImage()->texnum);
GL_SelectTexture(2);
glEnable(GL_TEXTURE_2D);
shader->GetSpecImage()->Bind();
glBindSpecularMapTexture(shader->GetSpecImage()->texnum);
idImage* glowMapImage = shader->GetGlowImage();
if (glowMapImage)
{
GL_SelectTexture(2);
GL_SelectTexture(3);
glEnable(GL_TEXTURE_2D);
glowMapImage->Bind();
glBindGlowMapTexture(glowMapImage->texnum);
@@ -539,11 +544,15 @@ void RB_T_FillDepthBuffer( const drawSurf_t *surf ) {
if (glowMapImage)
{
GL_SelectTexture(2);
GL_SelectTexture(3);
glBindGlowMapTexture(0);
globalImages->BindNull();
}
GL_SelectTexture(2);
glBindSpecularMapTexture(0);
globalImages->BindNull();
GL_SelectTexture(1);
glBindNormalMapTexture(0);
globalImages->BindNull();
@@ -940,6 +949,11 @@ void RB_STD_T_RenderShaderPasses( const drawSurf_t *surf ) {
continue;
}
// check the stage enable condition
if (regs[pStage->conditionRegister] == 0) {
continue;
}
// select the vertex color source
if ( pStage->vertexColor == SVC_IGNORE ) {
glColor4fv( color );