AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix dlist input

This commit is contained in:
Phillip Stephens 2015-08-08 18:12:52 -07:00
parent 2d18e95a91
commit db46dbdfdb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DataSpec/DNAMP1/CMDL.cpp
View File

@ -270,6 +270,7 @@ bool CMDL::ReadToBlender(HECL::BlenderConnection& conn,
} }
/* GX Display List (surface) */ /* GX Display List (surface) */
atUint64 start = reader.position();
SurfaceHeader sHead; SurfaceHeader sHead;
sHead.read(reader); sHead.read(reader);
unsigned matUVCount = matUVCounts[0][sHead.matIdx]; unsigned matUVCount = matUVCounts[0][sHead.matIdx];
@ -282,14 +283,18 @@ bool CMDL::ReadToBlender(HECL::BlenderConnection& conn,
createdUVLayers = matUVCount; createdUVLayers = matUVCount;
} }
std::unique_ptr<atUint8[]> dlBuf = reader.readUBytes(sHead.dlSize); atUint32 realDlSize = head.secSizes[s] - (reader.position() - secStart);
std::unique_ptr<atUint8[]> dlBuf = reader.readUBytes(realDlSize);
atUint8* origDl = dlBuf.get(); atUint8* origDl = dlBuf.get();
atUint8* dl = origDl; atUint8* dl = origDl;
while (*dl && (dl-origDl) < sHead.dlSize) while (*dl && (dl-origDl) < realDlSize)
{ {
GX::Primitive ptype = GX::Primitive(*dl & 0xf8); GX::Primitive ptype = GX::Primitive(*dl & 0xf8);
if (ptype == 0)
break;
atUint16 vert_count = HECL::SBig(*(atUint16*)(dl + 1)); atUint16 vert_count = HECL::SBig(*(atUint16*)(dl + 1));
os.format("# VAT Type: %u\n", *dl&7); os.format("# VAT Type: %u\n", *dl&7);

4
DataSpec/DNAMP1/MAPA.hpp
View File

@ -41,8 +41,8 @@ struct MAPA : BigDNA
struct SurfaceHeader : BigDNA struct SurfaceHeader : BigDNA
{ {
DECL_DNA DECL_DNA
Value<atVec3f> unkFloats1; Value<atVec3f> normal;
Value<atVec3f> unkFloats2; Value<atVec3f> center;
Value<atUint32> start; Value<atUint32> start;
Value<atUint32> end; Value<atUint32> end;
}; };