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

Dont load GLTF data when loading bglb/bgltf

Browse source
This commit is contained in:
HarrievG 2022-08-07 15:05:14 +02:00
parent 8e889c1804
commit d0ff0a7f64
1 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
neo/renderer/Model_gltf.cpp
View file

@ -275,13 +275,6 @@ bool idRenderModelGLTF::LoadBinaryModel( idFile* file, const ID_TIME_T sourceTim
hasAnimations = false;
fileExclusive = false; // not written.
root = nullptr;
//we should still load the scene information ?
if( !idRenderModelStatic::LoadBinaryModel( file, sourceTimeStamp ) )
{
return false;
}
unsigned int magic = 0;
file->ReadBig( magic );
@ -296,34 +289,6 @@ bool idRenderModelGLTF::LoadBinaryModel( idFile* file, const ID_TIME_T sourceTim
idStr dataFilename;
file->ReadString( dataFilename );
if( gltfParser->currentFile.Length( ) )
{
if( gltfParser->currentAsset && gltfParser->currentFile != dataFilename )
{
common->FatalError( "multiple GLTF file loading not supported" );
}
}
else
{
gltfParser->Load( dataFilename );
}
data = gltfParser->currentAsset;
if( rootID != -1 )
{
root = data->GetNode( gltf_ModelSceneName.GetString(), rootID );
}
else
{
root = new gltfNode();
root->name = gltf_ModelSceneName.GetString();
gltfScene scene;
data->GetSceneId( root->name, &scene );
root->children.Append( scene.nodes );
}
assert( root );
int animCnt;
file->ReadBig( animCnt );
if( animCnt > 0 )
@ -362,7 +327,7 @@ bool idRenderModelGLTF::LoadBinaryModel( idFile* file, const ID_TIME_T sourceTim
}
else
{
if( root->skin == -1 && hasAnimations && !bones.Num() )
if( hasAnimations && !bones.Num() )
{
bones.Clear( );
bones.Append( rootID );