v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3743 from Garux/Q1MDLgroup 

Fix Q1 MDL group frame loading, e.g. Q1 progs/flame2.mdl
kimkulling-issues-3726
Kim Kulling 2021-10-01 14:03:08 +02:00 committed by GitHub
parent 96e2f1cd5b 1f76b2e6b9
commit 2f5a31110c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/AssetLib/MDL/MDLFileData.h
View File

@ -696,14 +696,16 @@ struct GroupFrame
//! 0 = simple frame, !0 = group frame //! 0 = simple frame, !0 = group frame
int32_t type; int32_t type;
int32_t numframes;
//! Minimum vertex for all single frames //! Minimum vertex for all single frames
Vertex min; Vertex min;
//! Maximum vertex for all single frames //! Maximum vertex for all single frames
Vertex max; Vertex max;
//! Time for all single frames //! List of times for all single frames
float *time; float *times;
//! List of single frames //! List of single frames
SimpleFrame *frames; SimpleFrame *frames;

5
code/AssetLib/MDL/MDLLoader.cpp
View File

@ -439,8 +439,9 @@ void MDLImporter::InternReadFile_Quake1() {
pcFirstFrame = (MDL::SimpleFrame *)&pcFrames->frame; pcFirstFrame = (MDL::SimpleFrame *)&pcFrames->frame;
} else { } else {
// get the first frame in the group // get the first frame in the group
BE_NCONST MDL::GroupFrame *pcFrames2 = (BE_NCONST MDL::GroupFrame *)pcFrames; BE_NCONST MDL::GroupFrame *pcFrames2 = (BE_NCONST MDL::GroupFrame *)szCurrent;
pcFirstFrame = &(pcFrames2->frames[0]); pcFirstFrame = (MDL::SimpleFrame *)( szCurrent + sizeof(MDL::GroupFrame::type) + sizeof(MDL::GroupFrame::numframes)
+ sizeof(MDL::GroupFrame::min) + sizeof(MDL::GroupFrame::max) + sizeof(*MDL::GroupFrame::times) * pcFrames2->numframes );
} }
BE_NCONST MDL::Vertex *pcVertices = (BE_NCONST MDL::Vertex *)((pcFirstFrame->name) + sizeof(pcFirstFrame->name)); BE_NCONST MDL::Vertex *pcVertices = (BE_NCONST MDL::Vertex *)((pcFirstFrame->name) + sizeof(pcFirstFrame->name));
VALIDATE_FILE_SIZE((const unsigned char *)(pcVertices + pcHeader->num_verts)); VALIDATE_FILE_SIZE((const unsigned char *)(pcVertices + pcHeader->num_verts));