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

Fixed collision manager to load OBJ files

Browse source
This commit is contained in:
Robert Beckebans 2021-02-17 17:56:10 +01:00
parent e85415f0ce
commit dd9234cb1b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
neo/cm/CollisionModel_load.cpp
View file

@ -3855,8 +3855,8 @@ cm_model_t* idCollisionModelManagerLocal::LoadRenderModel( const char* fileName
// only load ASE and LWO models
idStr( fileName ).ExtractFileExtension( extension );
// RB: DAE support
if( ( extension.Icmp( "ase" ) != 0 ) && ( extension.Icmp( "lwo" ) != 0 ) && ( extension.Icmp( "ma" ) != 0 ) && ( extension.Icmp( "dae" ) != 0 ) )
// RB: DAE and OBJ support
if( ( extension.Icmp( "ase" ) != 0 ) && ( extension.Icmp( "lwo" ) != 0 ) && ( extension.Icmp( "ma" ) != 0 ) && ( extension.Icmp( "dae" ) != 0 ) && ( extension.Icmp( "obj" ) != 0 ) )
{
return NULL;
}

4
neo/tools/compilers/dmap/tritjunction.cpp
View file

@ -680,8 +680,8 @@ void FixGlobalTjunctions( uEntity_t* e )
continue;
}
// RB: DAE support
if( !strstr( modelName, ".lwo" ) && !strstr( modelName, ".ase" ) && !strstr( modelName, ".ma" ) && !strstr( modelName, ".dae" ) )
// RB: DAE and OBJ support
if( !strstr( modelName, ".lwo" ) && !strstr( modelName, ".ase" ) && !strstr( modelName, ".ma" ) && !strstr( modelName, ".dae" ) && !strstr( modelName, ".obj" ) )
{
continue;
}