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

Merge branch 'master' into 635-nvrhi3

Browse source
This commit is contained in:
Robert Beckebans 2022-09-25 14:41:39 +02:00
commit c23a30003b
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
neo/renderer/Model_gltf.cpp
View file

@ -45,11 +45,12 @@ idCVar gltf_ModelSceneName( "gltf_ModelSceneName", "models", CVAR_SYSTEM , "Scen
idCVar gltf_AnimSampleRate( "gltf_AnimSampleRate", "24", CVAR_SYSTEM | CVAR_INTEGER , "The frame rate of the converted md5anim" );
static const byte GLMB_VERSION = 100;
static const byte GLMB_VERSION = 101;
static const unsigned int GLMB_MAGIC = ( 'M' << 24 ) | ( 'L' << 16 ) | ( 'G' << 8 ) | GLMB_VERSION;
static const char* GLTF_SnapshotName = "_GLTF_Snapshot_";
static const idAngles axisTransformAngels = idAngles( 0.0f, 0.0f, 90 );
static const idMat4 axisTransform( axisTransformAngels.ToMat3(), vec3_origin );
static const idAngles blenderToDoomAngels = idAngles( 0.0f, 0.0f, 90 );
//static const idMat4 blenderToDoomTransform( blenderToDoomAngels.ToMat3(), vec3_origin );
static const idMat4 blenderToDoomTransform = mat4_identity;
static idRenderModelGLTF* lastMeshFromFile = nullptr;
bool idRenderModelStatic::ConvertGltfMeshToModelsurfaces( const gltfMesh* mesh )
@ -533,7 +534,7 @@ idList<idJointQuat> GetPose( idList<gltfNode>& bones, idJointMat* poseMat )
if( node->parent == nullptr )
{
node->matrix *= axisTransform;
node->matrix *= blenderToDoomTransform;
}
idJointQuat& pose = ret[i];
@ -743,7 +744,7 @@ idFile_Memory* idRenderModelGLTF::GetAnimBin( idStr animName , const ID_TIME_T
skin->joints.AssureSize( 1, data->GetNodeIndex( root ) );
idMat4 trans = mat4_identity;
data->ResolveNodeMatrix( root, &trans );
trans *= axisTransform.Inverse();
trans *= blenderToDoomTransform.Inverse();
acc = new gltfAccessor();
acc->matView = new idList<idMat4>( 1 );
acc->matView->AssureSize( 1, trans.Inverse().Transpose() );
@ -817,19 +818,19 @@ idFile_Memory* idRenderModelGLTF::GetAnimBin( idStr animName , const ID_TIME_T
{
if( node->parent == nullptr )
{
t = axisTransform * t;
t = blenderToDoomTransform * t;
}
componentFrames[componentFrameIndex++] = t.x;
componentFrames[componentFrameIndex++] = t.y;
componentFrames[componentFrameIndex++] = t.z;
}
if( joint->animBits & ( ANIM_QX | ANIM_QY | ANIM_QZ ) )
{
if( node->parent == nullptr )
{
q = axisTransformAngels.ToQuat() * animBones[i][b].rotation;
q = blenderToDoomAngels.ToQuat() * animBones[i][b].rotation;
if( animBones[i].Num() == 1 )
{
q = -animBones[i][b].rotation;
@ -863,7 +864,7 @@ idFile_Memory* idRenderModelGLTF::GetAnimBin( idStr animName , const ID_TIME_T
{
if( animBones[i][b].parent == nullptr )
{
animBones[i][b].translation = axisTransform * animBones[i][b].translation;
animBones[i][b].translation = blenderToDoomTransform * animBones[i][b].translation;
}
}