Skip to content

Commit 1a54300

Browse files
committed
tr_shader: parse builtin image names
1 parent 01d7e72 commit 1a54300

File tree

1 file changed

+24
-6
lines changed

1 file changed

+24
-6
lines changed

src/engine/renderer/tr_shader.cpp

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,20 +1434,38 @@ static bool LoadMap( shaderStage_t *stage, const char *buffer, stageType_t type,
14341434
return true;
14351435
}
14361436

1437-
if ( !Q_stricmp( token, "$whiteimage" ) || !Q_stricmp( token, "$white" ) || !Q_stricmp( token, "_white" ) ||
1438-
!Q_stricmp( token, "*white" ) )
1437+
if ( !Q_stricmp( token, "$whiteimage" ) || !Q_stricmp( token, "$white" )
1438+
|| !Q_stricmp( token, "_white" ) || !Q_stricmp( token, "*white" ) )
14391439
{
14401440
stage->bundle[ bundleIndex ].image[ 0 ] = tr.whiteImage;
14411441
return true;
14421442
}
1443-
else if ( !Q_stricmp( token, "$blackimage" ) || !Q_stricmp( token, "$black" ) || !Q_stricmp( token, "_black" ) ||
1444-
!Q_stricmp( token, "*black" ) )
1443+
else if ( !Q_stricmp( token, "$blackimage" ) || !Q_stricmp( token, "$black" )
1444+
|| !Q_stricmp( token, "_black" ) || !Q_stricmp( token, "*black" ) )
14451445
{
14461446
stage->bundle[ bundleIndex ].image[ 0 ] = tr.blackImage;
14471447
return true;
14481448
}
1449-
else if ( !Q_stricmp( token, "$flatimage" ) || !Q_stricmp( token, "$flat" ) || !Q_stricmp( token, "_flat" ) ||
1450-
!Q_stricmp( token, "*flat" ) )
1449+
else if ( !Q_stricmp( token, "$redimage" ) || !Q_stricmp( token, "$red" )
1450+
|| !Q_stricmp( token, "_red" ) || !Q_stricmp( token, "*red" ) )
1451+
{
1452+
stage->bundle[ bundleIndex ].image[ 0 ] = tr.redImage;
1453+
return true;
1454+
}
1455+
else if ( !Q_stricmp( token, "$greenimage" ) || !Q_stricmp( token, "$green" )
1456+
|| !Q_stricmp( token, "_green" ) || !Q_stricmp( token, "*green" ) )
1457+
{
1458+
stage->bundle[ bundleIndex ].image[ 0 ] = tr.greenImage;
1459+
return true;
1460+
}
1461+
else if ( !Q_stricmp( token, "$blueimage" ) || !Q_stricmp( token, "$blue" )
1462+
|| !Q_stricmp( token, "_blue" ) || !Q_stricmp( token, "*blue" ) )
1463+
{
1464+
stage->bundle[ bundleIndex ].image[ 0 ] = tr.blueImage;
1465+
return true;
1466+
}
1467+
else if ( !Q_stricmp( token, "$flatimage" ) || !Q_stricmp( token, "$flat" )
1468+
|| !Q_stricmp( token, "_flat" ) || !Q_stricmp( token, "*flat" ) )
14511469
{
14521470
stage->bundle[ bundleIndex ].image[ 0 ] = tr.flatImage;
14531471
return true;

0 commit comments

Comments
 (0)