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

Fixed binaryzation of .glb models that don't have 'models' as main scene

Browse source
This commit is contained in:
Robert Beckebans 2022-06-26 12:23:21 +02:00
parent 833f112f4e
commit 5446ae31e4
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
neo/renderer/Model_gltf.cpp
View file

@ -185,6 +185,8 @@ void idRenderModelGLTF::InitFromFile( const char* fileName )
if( !meshName[0] )
{
rootID = -1;
//this needs to be fixed to correctly support multiple meshes.
// atm this will only correctlty with static models.
// we could do gltfMeshes a la md5
@ -193,8 +195,16 @@ void idRenderModelGLTF::InitFromFile( const char* fileName )
for( auto& nodeID : data->SceneList()[sceneId]->nodes )
{
gltfNode* modelNode = nodeList[nodeID];
assert( modelNode );
ProcessNode( modelNode, mat4_identity, data );
if( modelNode )
{
ProcessNode( modelNode, mat4_identity, data );
if( rootID == -1 )
{
root = modelNode;
rootID = nodeID;
}
}
}
fileExclusive = true;
}
@ -235,7 +245,7 @@ bool idRenderModelGLTF::LoadBinaryModel( idFile* file, const ID_TIME_T sourceTim
root = nullptr;
prevTrans = mat4_identity;
//we should still load the scene information ?
// we should still load the scene information ?
if( !idRenderModelStatic::LoadBinaryModel( file, sourceTimeStamp ) )
{
return false;
@ -252,6 +262,8 @@ bool idRenderModelGLTF::LoadBinaryModel( idFile* file, const ID_TIME_T sourceTim
file->ReadBig( model_state );
file->ReadBig( rootID );
// TODO get rid of loading the original .glb here
#if 1
idStr dataFilename;
file->ReadString( dataFilename );
@ -270,6 +282,7 @@ bool idRenderModelGLTF::LoadBinaryModel( idFile* file, const ID_TIME_T sourceTim
data = gltfParser->currentAsset;
root = data->GetNode( gltf_ModelSceneName.GetString(), rootID );
assert( root );
#endif
int animCnt;
file->ReadBig( animCnt );
@ -285,10 +298,9 @@ bool idRenderModelGLTF::LoadBinaryModel( idFile* file, const ID_TIME_T sourceTim
void idRenderModelGLTF::WriteBinaryModel( idFile* file, ID_TIME_T* _timeStamp /*= NULL */ ) const
{
idRenderModelStatic::WriteBinaryModel( file );
if( file == NULL || root == nullptr )
if( file == NULL )
{
return;
}