id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-24 02:32:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added cmd makeZooMapForModels

Browse source
This commit is contained in:
Robert Beckebans 2022-02-23 22:52:23 +01:00
parent b2f68faffe
commit cbc9a31b74
3 changed files with 251 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

244
neo/framework/DeclManager.cpp
View file

@ -269,6 +269,8 @@ private:
static void ExportDeclsToTrenchBroom_f( const idCmdArgs& args );
static void ExportModelsToTrenchBroom_f( const idCmdArgs& args );
static void ExportImagesToTrenchBroom_f( const idCmdArgs& args );
static void MakeZooMapForModels_f( const idCmdArgs& args );
// RB end
};
@ -968,6 +970,8 @@ void idDeclManagerLocal::Init()
cmdSystem->AddCommand( "exportFGD", ExportDeclsToTrenchBroom_f, CMD_FL_SYSTEM, "exports all entity and model defs to exported/_tb/Doom3.fgd" );
cmdSystem->AddCommand( "exportModelsToTrenchBroom", ExportModelsToTrenchBroom_f, CMD_FL_SYSTEM, "exports all generated models like blwo, base .. to _tb/*.obj" );
cmdSystem->AddCommand( "exportImagesToTrenchBroom", ExportImagesToTrenchBroom_f, CMD_FL_SYSTEM, "exports all generated bimages to _tb/*.png" );
cmdSystem->AddCommand( "makeZooMapForModels", MakeZooMapForModels_f, CMD_FL_SYSTEM, "make a Source engine style zoo map with all generated models like .blwo, .base, .bmd5mesh et cetera" );
// RB end
common->Printf( "------------------------------\n" );
@ -3134,6 +3138,246 @@ void idDeclManagerLocal::ExportImagesToTrenchBroom_f( const idCmdArgs& args )
common->Printf( "----------------------------\n" );
common->Printf( "Exported and decompressed %d images in %5.1f minutes.\n", totalImagesCount, ( totalEnd - totalStart ) / ( 1000.0f * 60 ) );
}
struct EntityInfo_t
{
idBounds bounds;
idMapEntity* entity;
idVec2i packedPos;
};
struct ModelsGroup_t
{
idStrStatic< MAX_OSPATH > folder;
idList<EntityInfo_t*, TAG_SYSTEM> entityList;
idVec2i totalSize;
};
void RectAllocator( const idList<idVec2i>& inputSizes, idList<idVec2i>& outputPositions, idVec2i& totalSize, const int START_MAX = 16384, const int imageMax = -1 );
float RectPackingFraction( const idList<idVec2i>& inputSizes, const idVec2i totalSize );
// uses BFG Rectangle Atlas packer to pack models in 3D
void idDeclManagerLocal::MakeZooMapForModels_f( const idCmdArgs& args )
{
int totalModelsCount = 0;
int totalEntitiesCount = 0;
idFileList* files = fileSystem->ListFilesTree( "generated", ".blwo|.base|.bmd5mesh", true, true );
idStr mapName( "maps/zoomaps/zoo_models.map" );
idMapFile mapFile;
idMapEntity* worldspawn = new( TAG_SYSTEM ) idMapEntity();
mapFile.AddEntity( worldspawn );
worldspawn->epairs.Set( "classname", "worldspawn" );
// TODO bottom plate or big hall brushes
idHashTable<ModelsGroup_t*> entitiesPerFolder;
for( int f = 0; f < files->GetList().Num() /*&& totalEntitiesCount < 100*/; f++ )
{
totalModelsCount++;
idStr modelName = files->GetList()[ f ];
modelName.StripLeadingOnce( "generated/rendermodels/" );
idStr ext;
modelName.ExtractFileExtension( ext );
bool dynamicModel = false;
if( ext.Icmp( "blwo" ) == 0 )
{
modelName.SetFileExtension( "lwo" );
}
if( ext.Icmp( "base" ) == 0 )
{
modelName.SetFileExtension( "ase" );
}
if( ext.Icmp( "bdae" ) == 0 )
{
modelName.SetFileExtension( "dae" );
}
if( ext.Icmp( "bmd5mesh" ) == 0 )
{
modelName.SetFileExtension( "md5mesh" );
dynamicModel = true;
}
idRenderModel* renderModel = renderModelManager->FindModel( modelName );
#if 1
// discard everything that is not a mapobjects model
if( idStr::Icmpn( modelName, "models/mapobjects", 17 ) != 0 )
{
continue;
}
#endif
if( idStr::Icmpn( modelName, "models/items", 12 ) == 0 )
{
continue;
}
if( idStr::Icmpn( modelName, "models/particles", 16 ) == 0 )
{
continue;
}
if( idStr::Icmpn( modelName, "models/weapons", 14 ) == 0 )
{
continue;
}
idStr directory = modelName;
directory.StripFilename();
// find models group or create it
ModelsGroup_t** groupptrptr = nullptr;
ModelsGroup_t* group = nullptr;
if( !entitiesPerFolder.Get( directory, &groupptrptr ) )
{
group = new( TAG_SYSTEM ) ModelsGroup_t;
group->folder = directory;
entitiesPerFolder.Set( directory, group );
}
else
{
group = *groupptrptr;
}
idBounds bounds = renderModel->Bounds();
// put model as mapobject into the models FGD
if( !renderModel->IsDefaultModel() && bounds.GetVolume() > 0 && bounds.GetRadius() < 1400 )
{
idMapEntity* mapEnt = new( TAG_SYSTEM ) idMapEntity();
mapFile.AddEntity( mapEnt );
// build TB compatible model name
idStrStatic< MAX_OSPATH > exportedModelFileName;
exportedModelFileName = "_tb/";
exportedModelFileName.AppendPath( modelName );
exportedModelFileName.SetFileExtension( ".obj" );
idStrStatic< MAX_OSPATH > entityName;
entityName.Format( "misc_model_%d", mapFile.GetNumEntities() );
mapEnt->epairs.Set( "classname", "misc_model" );
mapEnt->epairs.Set( "name", entityName );
mapEnt->epairs.Set( "model", exportedModelFileName );
mapEnt->epairs.Set( "origmodel", modelName );
EntityInfo_t* entInfo = new( TAG_SYSTEM ) EntityInfo_t;
entInfo->bounds = bounds;
entInfo->entity = mapEnt;
group->entityList.Append( entInfo );
totalEntitiesCount++;
}
}
fileSystem->FreeFileList( files );
// pack models by 2D AABB inside of a folder
for( int g = 0; g < entitiesPerFolder.Num(); g++ )
{
ModelsGroup_t* group = *entitiesPerFolder.GetIndex( g );
idList<idVec2i> inputSizes;
inputSizes.SetNum( group->entityList.Num() );
for( int e = 0; e < group->entityList.Num(); e++ )
{
EntityInfo_t* entInfo = group->entityList[ e ];
idBounds& b = entInfo->bounds;
const int offset = 64;
idVec2i allocSize( ( b[1][0] - b[0][0] ) + offset, ( b[1][1] - b[0][1] ) + offset );
//idLib::Printf( "model size %ix%i in '%s'\n", allocSize.x, allocSize.y, group->folder.c_str() );
inputSizes[ e ] = allocSize;
}
idList<idVec2i> outputPositions;
idVec2i totalSize;
// smart allocator
RectAllocator( inputSizes, outputPositions, totalSize, 1 << 14 );
float frac = RectPackingFraction( inputSizes, totalSize );
idLib::Printf( "%5.2f packing fraction in %ix%i '%s'\n", frac, totalSize.x, totalSize.y, group->folder.c_str() );
group->totalSize = totalSize;
for( int e = 0; e < group->entityList.Num(); e++ )
{
EntityInfo_t* entInfo = group->entityList[ e ];
entInfo->packedPos = outputPositions[ e ];
}
}
// pack folders
idList<idVec2i> inputSizes;
inputSizes.SetNum( entitiesPerFolder.Num() );
for( int g = 0; g < entitiesPerFolder.Num(); g++ )
{
ModelsGroup_t* group = *entitiesPerFolder.GetIndex( g );
// these are in DXT blocks, not pixels
const int offset = 256;
idVec2i allocSize( group->totalSize.x + offset, group->totalSize.y + offset );
idLib::Printf( "folder '%s' size %ix%i\n", group->folder.c_str(), allocSize.x, allocSize.y );
inputSizes[ g ] = allocSize;
}
idList<idVec2i> outputPositions;
idVec2i totalSize;
// smart allocator
RectAllocator( inputSizes, outputPositions, totalSize, 1 << 14 );
float frac = RectPackingFraction( inputSizes, totalSize );
idLib::Printf( "%5.2f packing fraction in %ix%i\n", frac, totalSize.x, totalSize.y );
// place entities inside packed folders
for( int g = 0; g < entitiesPerFolder.Num(); g++ )
{
ModelsGroup_t* group = *entitiesPerFolder.GetIndex( g );
//idLib::Printf( "folder '%s' pos (%i %i)\n", group->folder.c_str(), outputPositions[ g ].x, outputPositions[ g ].y );
for( int e = 0; e < group->entityList.Num(); e++ )
{
EntityInfo_t* entInfo = group->entityList[ e ];
idVec3 origin;
origin.x = outputPositions[ g ].x + entInfo->packedPos.x;
origin.y = outputPositions[ g ].y + entInfo->packedPos.y;
origin.z = 0;
entInfo->entity->epairs.SetVector( "origin", origin );
}
}
mapFile.ConvertToValve220Format();
mapFile.Write( mapName, ".map" );
common->Printf( "\nZoo map written to %s\n", mapName.c_str() );
common->Printf( "----------------------------\n" );
common->Printf( "Found %d Models.\n", totalModelsCount );
common->Printf( "Wrote %d Entities.\n", totalEntitiesCount );
}
// RB end
/*

9
neo/idlib/RectAllocator.cpp
View file

@ -79,7 +79,8 @@ public:
const idList<idVec2i>* inputSizes;
};
void RectAllocator( const idList<idVec2i>& inputSizes, idList<idVec2i>& outputPositions, idVec2i& totalSize )
// RB: added START_MAX and imageMax
void RectAllocator( const idList<idVec2i>& inputSizes, idList<idVec2i>& outputPositions, idVec2i& totalSize, const int START_MAX, const int imageMax )
{
outputPositions.SetNum( inputSizes.Num() );
if( inputSizes.Num() == 0 )
@ -109,7 +110,7 @@ void RectAllocator( const idList<idVec2i>& inputSizes, idList<idVec2i>& outputPo
// Somewhat better allocation could be had by checking all the combinations of x and y edges
// in the allocated rectangles, rather than just the corners of each rectangle, but it
// still does a pretty good job.
static const int START_MAX = 1 << 14;
//static const int START_MAX = 1 << 14;
for( int i = 1; i < inputSizes.Num(); i++ )
{
idVec2i best( 0, 0 );
@ -137,7 +138,9 @@ void RectAllocator( const idList<idVec2i>& inputSizes, idList<idVec2i>& outputPo
// don't let an image get larger than 1024 DXT block, or PS3 crashes
// FIXME: pass maxSize in as a parameter
if( newMax[0] > 1024 || newMax[1] > 1024 )
//if( newMax[0] > 1024 || newMax[1] > 1024 )
if( imageMax > 0 && ( newMax[0] > imageMax || newMax[1] > imageMax ) )
{
continue;
}

2
neo/swf/SWF_Image.cpp
View file

@ -183,7 +183,7 @@ Now that all images have been found, allocate them in an atlas
and write it out.
========================
*/
void RectAllocator( const idList<idVec2i>& inputSizes, idList<idVec2i>& outputPositions, idVec2i& totalSize );
void RectAllocator( const idList<idVec2i>& inputSizes, idList<idVec2i>& outputPositions, idVec2i& totalSize, const int START_MAX = 16384, const int imageMax = 1024 );
float RectPackingFraction( const idList<idVec2i>& inputSizes, const idVec2i totalSize );
void idSWF::WriteSwfImageAtlas( const char* filename )