id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-13 22:22:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small improvements in makeMaterials cmd

Browse source
This commit is contained in:
Robert Beckebans 2024-12-17 16:49:11 +01:00
parent 5418c99b4f
commit 647a1d283e
2 changed files with 65 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
neo/renderer/Material.cpp
View file

@ -3956,11 +3956,25 @@ CONSOLE_COMMAND_SHIP( makeMaterials, "Make .mtr file from a models or textures f
{
if( args.Argc() < 2 )
{
common->Warning( "Usage: makeMaterials <folder>\n" );
common->Printf( "Usage: makeMaterials <folder>\n" );
return;
}
idStr folderName = args.Argv( 1 );
bool stripFolderFromMaterial = false;
idStr option;
for( int i = 1; i < args.Argc(); i++ )
{
option = args.Argv( i );
option.StripLeading( '-' );
if( option.IcmpPrefix( "Unreal" ) == 0 )
{
stripFolderFromMaterial = true;
}
}
idStr folderName = args.Argv( args.Argc() - 1 );
idFileList* files = fileSystem->ListFilesTree( folderName, ".png|.tga|.jpg|.exr" );
idStr mtrBuffer;
@ -3988,6 +4002,24 @@ CONSOLE_COMMAND_SHIP( makeMaterials, "Make .mtr file from a models or textures f
imageName = imageName.StripFileExtension();
idStr baseName = imageName;
idStr resName;
if( baseName.IStripTrailingOnce( "_1k" ) )
{
resName = "_1k";
}
else if( baseName.IStripTrailingOnce( "_2k" ) )
{
resName = "_2k";
}
else if( baseName.IStripTrailingOnce( "_4k" ) )
{
resName = "_4k";
}
else if( baseName.IStripTrailingOnce( "_8k" ) )
{
resName = "_8k";
}
baseName.IStripTrailingOnce( "_diffuse" );
baseName.IStripTrailingOnce( "_diff" );
baseName.IStripTrailingOnce( "_albedo" );
@ -3996,8 +4028,30 @@ CONSOLE_COMMAND_SHIP( makeMaterials, "Make .mtr file from a models or textures f
baseName.IStripTrailingOnce( "_color" );
baseName.IStripTrailingOnce( "_col" );
if( idStr::FindText( imageName, "FloorTiles2", false ) != -1 )
{
mtrBuffer += "\n// FoorTiles found \n";
}
idStr materialName = baseName;
if( idStr::FindText( baseName, "_inst_inst_inst_", false ) != -1 ||
idStr::FindText( baseName, "_inst_inst_", false ) != -1 ||
idStr::FindText( baseName, "_inst_", false ) != -1 )
{
materialName.CopyRange( baseName.c_str(), 0, baseName.Length() - 2 );
}
if( stripFolderFromMaterial )
{
idStr matName;
materialName.ExtractFileName( matName );
materialName = matName;
}
//mtrBuffer += va( "%s/%s\n", folderName, imageName.c_str() );
mtrBuffer += baseName.c_str();
mtrBuffer += materialName.c_str();
mtrBuffer += "\n{\n";
// TODO qer_editorImage
@ -4011,7 +4065,7 @@ CONSOLE_COMMAND_SHIP( makeMaterials, "Make .mtr file from a models or textures f
for( auto& name : alphaNames )
{
ID_TIME_T testStamp;
idStr testName = baseName + name;
idStr testName = baseName + name + resName;
R_LoadImage( testName, NULL, NULL, NULL, &testStamp, true, NULL );
@ -4078,12 +4132,12 @@ CONSOLE_COMMAND_SHIP( makeMaterials, "Make .mtr file from a models or textures f
// ===============================
// test normal map
idStrList normalNames = { "_normal", "_nor", "_nrm", "_nrml", "_norm", "_normal_directx", "_normal_opengl" };
idStrList normalNames = { "_normal", "_nor", "_nrm", "_nrml", "_norm", "_nor_dx", "_nor_gl", "_normal_directx", "_normal_opengl" };
for( auto& name : normalNames )
{
ID_TIME_T testStamp;
idStr testName = baseName + name;
idStr testName = baseName + name + resName;
R_LoadImage( testName, NULL, NULL, NULL, &testStamp, true, NULL );
@ -4111,7 +4165,7 @@ CONSOLE_COMMAND_SHIP( makeMaterials, "Make .mtr file from a models or textures f
for( auto& name : roughNames )
{
ID_TIME_T testStamp;
idStr testName = baseName + name;
idStr testName = baseName + name + resName;
R_LoadImage( testName, &roughPic, &roughWidth, &roughHeight, &testStamp, true, NULL );
if( testStamp != FILE_NOT_FOUND_TIMESTAMP )
@ -4130,7 +4184,7 @@ CONSOLE_COMMAND_SHIP( makeMaterials, "Make .mtr file from a models or textures f
for( auto& name : metalNames )
{
ID_TIME_T testStamp;
idStr testName = baseName + name;
idStr testName = baseName + name + resName;
R_LoadImage( testName, &metalPic, &metalWidth, &metalHeight, &testStamp, true, NULL );
if( testStamp != FILE_NOT_FOUND_TIMESTAMP )
@ -4149,7 +4203,7 @@ CONSOLE_COMMAND_SHIP( makeMaterials, "Make .mtr file from a models or textures f
for( auto& name : aoNames )
{
ID_TIME_T testStamp;
idStr testName = baseName + name;
idStr testName = baseName + name + resName;
R_LoadImage( testName, &aoPic, &aoWidth, &aoHeight, &testStamp, true, NULL );
if( testStamp != FILE_NOT_FOUND_TIMESTAMP )
@ -4196,6 +4250,7 @@ CONSOLE_COMMAND_SHIP( makeMaterials, "Make .mtr file from a models or textures f
idStr mergedName = baseName + "_rmao.png";
R_WritePNG( mergedName, static_cast<byte*>( roughPic ), 4, roughWidth, roughHeight, "fs_basepath" );
mergedName.StripFileExtension();
mtrBuffer += va( "\trmaomap %s\n", mergedName.c_str() );
}
}

2
neo/renderer/RenderLog.cpp
View file

@ -32,7 +32,7 @@ If you have questions concerning this license or the applicable additional terms
#include <sys/DeviceManager.h>
extern DeviceManager* deviceManager;
idCVar r_logLevel( "r_logLevel", "0", CVAR_INTEGER, "1 = blocks only, 2 = everything", 0, 2 );
idCVar r_logLevel( "r_logLevel", "0", CVAR_BOOL, "1 = Named render events in RenderDoc but is slower if enabled" );
static const int LOG_LEVEL_BLOCKS_ONLY = 1;
static const int LOG_LEVEL_EVERYTHING = 2;