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

rbdmap.exe can compile a map

Browse source
This commit is contained in:
Robert Beckebans 2024-06-17 22:10:50 +02:00
parent b0abbe4d35
commit 68bd54af9c
4 changed files with 49 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
neo/framework/DeclManager.cpp
View file

@ -29,10 +29,13 @@ If you have questions concerning this license or the applicable additional terms
#include "precompiled.h"
#pragma hdrstop
#include "../renderer/Image.h"
#include "../renderer/DXT/DXTCodec.h"
#include "../renderer/Color/ColorSpace.h"
#include "../renderer/CmdlineProgressbar.h"
#if !defined( DMAP )
#include "../renderer/Image.h"
#include "../renderer/DXT/DXTCodec.h"
#include "../renderer/Color/ColorSpace.h"
#include "../renderer/CmdlineProgressbar.h"
#endif
/*
@ -218,12 +221,15 @@ public:
virtual void WritePrecacheCommands( idFile* f );
virtual const idMaterial* FindMaterial( const char* name, bool makeDefault = true );
virtual const idDeclSkin* FindSkin( const char* name, bool makeDefault = true );
virtual const idSoundShader* FindSound( const char* name, bool makeDefault = true );
virtual const idMaterial* MaterialByIndex( int index, bool forceParse = true );
#if !defined( DMAP )
virtual const idDeclSkin* FindSkin( const char* name, bool makeDefault = true );
virtual const idDeclSkin* SkinByIndex( int index, bool forceParse = true );
virtual const idSoundShader* FindSound( const char* name, bool makeDefault = true );
virtual const idSoundShader* SoundByIndex( int index, bool forceParse = true );
#endif
virtual void Touch( const idDecl* decl );
@ -895,7 +901,6 @@ idDeclManagerLocal::Init
*/
void idDeclManagerLocal::Init()
{
common->Printf( "----- Initializing Decls -----\n" );
checksum = 0;
@ -911,6 +916,8 @@ void idDeclManagerLocal::Init()
// decls used throughout the engine
RegisterDeclType( "table", DECL_TABLE, idDeclAllocator<idDeclTable> );
RegisterDeclType( "material", DECL_MATERIAL, idDeclAllocator<idMaterial> );
#if !defined( DMAP )
RegisterDeclType( "skin", DECL_SKIN, idDeclAllocator<idDeclSkin> );
RegisterDeclType( "sound", DECL_SOUND, idDeclAllocator<idSoundShader> );
@ -923,9 +930,11 @@ void idDeclManagerLocal::Init()
RegisterDeclType( "email", DECL_EMAIL, idDeclAllocator<idDeclEmail> );
RegisterDeclType( "video", DECL_VIDEO, idDeclAllocator<idDeclVideo> );
RegisterDeclType( "audio", DECL_AUDIO, idDeclAllocator<idDeclAudio> );
#endif
RegisterDeclFolder( "materials", ".mtr", DECL_MATERIAL );
#if !defined( DMAP )
// add console commands
cmdSystem->AddCommand( "listDecls", ListDecls_f, CMD_FL_SYSTEM, "lists all decls" );
@ -974,6 +983,7 @@ void idDeclManagerLocal::Init()
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" );
#endif
// RB end
common->Printf( "------------------------------\n" );
@ -1781,6 +1791,8 @@ const idMaterial* idDeclManagerLocal::MaterialByIndex( int index, bool forcePars
return static_cast<const idMaterial*>( DeclByIndex( DECL_MATERIAL, index, forceParse ) );
}
#if !defined( DMAP )
/********************************************************************/
const idDeclSkin* idDeclManagerLocal::FindSkin( const char* name, bool makeDefault )
@ -1805,6 +1817,8 @@ const idSoundShader* idDeclManagerLocal::SoundByIndex( int index, bool forcePars
return static_cast<const idSoundShader*>( DeclByIndex( DECL_SOUND, index, forceParse ) );
}
#endif
/*
===================
idDeclManagerLocal::Touch
@ -1978,6 +1992,8 @@ void idDeclManagerLocal::TouchDecl_f( const idCmdArgs& args )
}
// RB begin
#if !defined( DMAP )
void idDeclManagerLocal::ExportEntityDefsToBlender_f( const idCmdArgs& args )
{
idStr jsonStringsFileName = "_bl/entities.json";
@ -4084,6 +4100,9 @@ void idDeclManagerLocal::MakeZooMapForModels_f( const idCmdArgs& args )
}
// RB end
#endif // #if !defined( DMAP )
/*
===================
idDeclManagerLocal::FindTypeWithoutParsing

23
neo/framework/DeclManager.h
View file

@ -394,12 +394,25 @@ public:
// Convenience functions for specific types.
virtual const idMaterial* FindMaterial( const char* name, bool makeDefault = true ) = 0;
virtual const idDeclSkin* FindSkin( const char* name, bool makeDefault = true ) = 0;
virtual const idSoundShader* FindSound( const char* name, bool makeDefault = true ) = 0;
virtual const idMaterial* MaterialByIndex( int index, bool forceParse = true ) = 0;
virtual const idDeclSkin* SkinByIndex( int index, bool forceParse = true ) = 0;
virtual const idSoundShader* SoundByIndex( int index, bool forceParse = true ) = 0;
virtual const idDeclSkin* FindSkin( const char* name, bool makeDefault = true )
{
return NULL;
}
virtual const idSoundShader* FindSound( const char* name, bool makeDefault = true )
{
return NULL;
};
virtual const idDeclSkin* SkinByIndex( int index, bool forceParse = true )
{
return NULL;
};
virtual const idSoundShader* SoundByIndex( int index, bool forceParse = true )
{
return NULL;
};
virtual void Touch( const idDecl* decl ) = 0;
};

2
neo/tools/compilers/CMakeLists.txt
View file

@ -27,6 +27,7 @@ set(BSPT_FRAMEWORK_INCLUDES
../../framework/File_Resource.h
../../framework/FileSystem.h
../../framework/Licensee.h
../../framework/DeclManager.h
../../framework/DeclTable.h
../../idlib/precompiled.h
)
@ -37,6 +38,7 @@ set(BSPT_FRAMEWORK_SOURCES
../../framework/File_Manifest.cpp
../../framework/File_Resource.cpp
../../framework/FileSystem.cpp
../../framework/DeclManager.cpp
../../framework/DeclTable.cpp
)

3
neo/tools/compilers/main.cpp
View file

@ -35,7 +35,7 @@ If you have questions concerning this license or the applicable additional terms
#include <io.h>
idEventLoop* eventLoop;
idDeclManager* declManager;
//idDeclManager* declManager;
idSys* sys = NULL;
#define STDIO_PRINT( pre, post ) \
@ -540,6 +540,7 @@ int main( int argc, char** argv )
cvarSystem->Init();
idCVar::RegisterStaticVars();
fileSystem->Init();
declManager->Init();
idCmdArgs args;
for( int i = 0; i < argc; i++ )