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

Tweaked exportFGD to display correctly func_animate ents in TrenchBroom

Browse source
This commit is contained in:
Robert Beckebans 2024-05-18 21:23:41 +02:00
parent 133c63f7ec
commit fa8a7a9c7b
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
neo/framework/DeclManager.cpp
View file

@ -2641,16 +2641,7 @@ void idDeclManagerLocal::ExportEntityDefsToTrenchBroom_f( const idCmdArgs& args
// precache model/animations
const idDeclModelDef* modelDef = static_cast<const idDeclModelDef*>( declManager->FindType( DECL_MODELDEF, kv->GetValue(), false ) );
if( modelDef == NULL )
{
// there is no modelDef so use direct path
renderModelManager->FindModel( kv->GetValue() );
exportedModelFileName = "_tb/";
exportedModelFileName.AppendPath( kv->GetValue() );
exportedModelFileName.SetFileExtension( ".obj" );
}
else
if( modelDef != NULL )
{
idRenderModel* renderModel = modelDef->ModelHandle();
if( renderModel )
@ -2660,6 +2651,15 @@ void idDeclManagerLocal::ExportEntityDefsToTrenchBroom_f( const idCmdArgs& args
exportedModelFileName.SetFileExtension( ".obj" );
}
}
else
{
// there is no modelDef so use direct path
renderModelManager->FindModel( kv->GetValue() );
exportedModelFileName = "_tb/";
exportedModelFileName.AppendPath( kv->GetValue() );
exportedModelFileName.SetFileExtension( ".obj" );
}
}
}
}
@ -2669,6 +2669,7 @@ void idDeclManagerLocal::ExportEntityDefsToTrenchBroom_f( const idCmdArgs& args
file->Printf( "model({ \"path\": \"%s\" }) ", exportedModelFileName.c_str() );
}
else if( idStr::Icmp( decl->GetName(), "misc_model" ) == 0 ||
idStr::Icmp( decl->GetName(), "func_animate" ) == 0 ||
idStr::Icmp( decl->GetName(), "func_bobbing_model" ) == 0 ||
idStr::Icmp( decl->GetName(), "func_door_model" ) == 0 ||
idStr::Icmp( decl->GetName(), "func_elevator_model" ) == 0 ||
@ -2871,7 +2872,7 @@ void idDeclManagerLocal::ExportEntityDefsToTrenchBroom_f( const idCmdArgs& args
}
//declManagerLocal.Reload( true );
common->FatalError( "Exporting successful, need to restart manually" );
common->FatalError( "Exporting successful, need to restart engine manually" );
}
void idDeclManagerLocal::ExportImagesToTrenchBroom_f( const idCmdArgs& args )