diff --git a/Utils/Libs/GinLib/gintex.cpp b/Utils/Libs/GinLib/gintex.cpp index 54ad4fe80..18cdec837 100644 --- a/Utils/Libs/GinLib/gintex.cpp +++ b/Utils/Libs/GinLib/gintex.cpp @@ -109,17 +109,17 @@ void CMesh::Load(Gifstream & In) void CMod4::Load(Gifstream & In) { Mod4Chunk ThisChunk; - In.read((char*)&ThisChunk.nCurObj , sizeof(long)); - In.read(ThisChunk.Name, 32); - In.read((char*)&ThisChunk.Radius, sizeof(float)); - In.read((char*)&ThisChunk.Centre.x, sizeof(float)); - In.read((char*)&ThisChunk.Centre.y, sizeof(float)); - In.read((char*)&ThisChunk.Centre.z, sizeof(float)); - In.read((char*)&ThisChunk.Ap.x, sizeof(float)); - In.read((char*)&ThisChunk.Ap.y, sizeof(float)); - In.read((char*)&ThisChunk.Ap.z, sizeof(float)); - Chunk.push_back(ThisChunk); + In.read((char*)&ThisChunk.nCurObj , sizeof(long)); + In.read(ThisChunk.Name, 32); + In.read((char*)&ThisChunk.Radius, sizeof(float)); + In.read((char*)&ThisChunk.Centre.x, sizeof(float)); + In.read((char*)&ThisChunk.Centre.y, sizeof(float)); + In.read((char*)&ThisChunk.Centre.z, sizeof(float)); + In.read((char*)&ThisChunk.Ap.x, sizeof(float)); + In.read((char*)&ThisChunk.Ap.y, sizeof(float)); + In.read((char*)&ThisChunk.Ap.z, sizeof(float)); + Chunk.push_back(ThisChunk); } /*****************************************************************************/ @@ -170,24 +170,6 @@ CNode ThisNode; In.Align(4); In.read(ThisNode.Name, 32); -/* In.read((char*)&ThisNode.XPos, 4); - In.read((char*)&ThisNode.YPos, 4); - In.read((char*)&ThisNode.ZPos, 4); - - In.read((char*)&ThisNode.XAng, 4); - In.read((char*)&ThisNode.YAng, 4); - In.read((char*)&ThisNode.ZAng, 4); - In.read((char*)&ThisNode.WAng, 4); - - In.read((char*)&ThisNode.Xapk, 4); - In.read((char*)&ThisNode.Yapk, 4); - In.read((char*)&ThisNode.Zapk, 4); - - In.read((char*)&ThisNode.Xapu, 4); - In.read((char*)&ThisNode.Yapu, 4); - In.read((char*)&ThisNode.Zapu, 4); - In.read((char*)&ThisNode.Wapu, 4); -*/ In.read((char*)&ThisNode.Pos.x, 4); In.read((char*)&ThisNode.Pos.y, 4); In.read((char*)&ThisNode.Pos.z, 4); @@ -277,24 +259,6 @@ CNode ThisNode; ThisNode.Anim.resize(FrameCount); for (int Frame=0;Frameconst &KeyAnimTree=KATC->GetTree(); std::vectorconst &AnimTree=NATC->GetTree(); - NodeCount=KeyAnimTree.size(); - for (Node=0;NodeGetCam()); + for (int Cam=0;CamGetCam()); + } } - } //----------------------------------------------------------------------------- @@ -936,14 +886,6 @@ Matrix4x4 ParentMtx, ThisMtx, PosMtx, RotMtx, StrMtx, SclMtx, IStrMtx; if (ParentIdx!=-1) ParentMtx=GetWorldMatrix(Tree,ParentIdx); - -// ThisMtx.Identity(); -// PosMtx.Identity(); -// RotMtx.Identity(); -// StrMtx.Identity(); -// SclMtx.Identity(); -// IStrMtx.Identity(); - // Pos PosMtx.Identity(); PosMtx.SetTranslation(ThisNode.Pos); @@ -968,10 +910,8 @@ Matrix4x4 ParentMtx, ThisMtx, PosMtx, RotMtx, StrMtx, SclMtx, IStrMtx; Vector3 GetWorldPos(std::vector const &Tree,int Idx) { CNode ThisNode=Tree[Idx]; -//Vector3 ThisPos(ThisNode.XPos,ThisNode.YPos,ThisNode.ZPos); Matrix4x4 WorldMtx=GetWorldMatrix(Tree,ThisNode.ParentIdx); -// if (WorldMtx!=ThisNode.WorldMtx) printf("!!!"); return(WorldMtx*ThisNode.Pos); }