zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-12 23:54:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Discarded "UMSH" packed format, now loads _d.3d + _a.3d pairs

Browse source
This commit is contained in:
Marisa Kirisame 2018-05-15 10:28:25 +02:00 committed by Christoph Oelckers
parent f285e550d6
commit ffc12eec29
2 changed files with 61 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/r_data/models/models.cpp
View file

@ -1,4 +1,4 @@
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// Copyright(C) 2005-2016 Christoph Oelckers // Copyright(C) 2005-2016 Christoph Oelckers
@ -415,21 +415,41 @@ static unsigned FindModel(const char * path, const char * modelfile)
FMemLump lumpd = Wads.ReadLump(lump); FMemLump lumpd = Wads.ReadLump(lump);
char * buffer = (char*)lumpd.GetMem(); char * buffer = (char*)lumpd.GetMem();
if (!memcmp(buffer, "DMDM", 4)) bool isunreal3d = false;
if ( fullname.IndexOf("_d.3d") == fullname.Len()-5 )
{ {
model = new FDMDModel; FString anivfile = fullname.GetChars();
anivfile.Substitute("_d.3d","_a.3d");
if ( Wads.CheckNumForFullName(anivfile) > 0 )
{
model = new FUE1Model;
isunreal3d = true;
}
} }
else if (!memcmp(buffer, "IDP2", 4)) else if ( fullname.IndexOf("_a.3d") == fullname.Len()-5 )
{ {
model = new FMD2Model; FString datafile = fullname.GetChars();
datafile.Substitute("_a.3d","_d.3d");
if ( Wads.CheckNumForFullName(datafile) > 0 )
{
model = new FUE1Model;
isunreal3d = true;
}
} }
else if (!memcmp(buffer, "IDP3", 4)) if ( !isunreal3d )
{ {
model = new FMD3Model; if (!memcmp(buffer, "DMDM", 4))
} {
else if (!memcmp(buffer, "UMSH", 4)) model = new FDMDModel;
{ }
model = new FUE1Model; else if (!memcmp(buffer, "IDP2", 4))
{
model = new FMD2Model;
}
else if (!memcmp(buffer, "IDP3", 4))
{
model = new FMD3Model;
}
} }
if (model != nullptr) if (model != nullptr)
@ -541,7 +561,7 @@ void gl_InitModels()
smf.xscale=smf.yscale=smf.zscale=1.f; smf.xscale=smf.yscale=smf.zscale=1.f;
smf.type = PClass::FindClass(sc.String); smf.type = PClass::FindClass(sc.String);
if (!smf.type || smf.type->Defaults == nullptr) if (!smf.type || smf.type->Defaults == nullptr)
{ {
sc.ScriptError("MODELDEF: Unknown actor type '%s'\n", sc.String); sc.ScriptError("MODELDEF: Unknown actor type '%s'\n", sc.String);
} }
@ -581,7 +601,7 @@ void gl_InitModels()
sc.MustGetFloat(); sc.MustGetFloat();
smf.zscale = sc.Float; smf.zscale = sc.Float;
} }
// [BB] Added zoffset reading. // [BB] Added zoffset reading.
// Now it must be considered deprecated. // Now it must be considered deprecated.
else if (sc.Compare("zoffset")) else if (sc.Compare("zoffset"))
{ {

40
src/r_data/models/models_ue1.cpp
View file

@ -42,18 +42,34 @@ double unpackuvert( uint32_t n, int c )
bool FUE1Model::Load( const char *filename, int lumpnum, const char *buffer, int length ) bool FUE1Model::Load( const char *filename, int lumpnum, const char *buffer, int length )
{ {
mLumpNum = lumpnum; mLumpNum = lumpnum;
// read signature int lumpnum2;
if ( memcmp(buffer,"UMSH",4) ) FMemLump lump2;
return false; const char *buffer2;
// map structures FString realfilename = Wads.GetLumpFullName(lumpnum);
int ofs = 4; if ( realfilename.IndexOf("_d.3d") == realfilename.Len()-5 )
dhead = (d3dhead*)(buffer+ofs); {
ofs += sizeof(d3dhead); realfilename.Substitute("_d.3d","_a.3d");
dpolys = (d3dpoly*)(buffer+ofs); lumpnum2 = Wads.CheckNumForFullName(realfilename);
ofs += sizeof(d3dpoly)*dhead->numpolys; lump2 = Wads.ReadLump(lumpnum2);
ahead = (a3dhead*)(buffer+ofs); buffer2 = (char*)lump2.GetMem();
ofs += sizeof(a3dhead); // map structures
averts = (uint32_t*)(buffer+ofs); dhead = (d3dhead*)(buffer);
dpolys = (d3dpoly*)(buffer+sizeof(d3dhead));
ahead = (a3dhead*)(buffer2);
averts = (uint32_t*)(buffer2+sizeof(a3dhead));
}
else
{
realfilename.Substitute("_a.3d","_d.3d");
lumpnum2 = Wads.CheckNumForFullName(realfilename);
lump2 = Wads.ReadLump(lumpnum2);
buffer2 = (char*)lump2.GetMem();
// map structures
dhead = (d3dhead*)(buffer2);
dpolys = (d3dpoly*)(buffer2+sizeof(d3dhead));
ahead = (a3dhead*)(buffer);
averts = (uint32_t*)(buffer+sizeof(a3dhead));
}
// set counters // set counters
numVerts = dhead->numverts; numVerts = dhead->numverts;
numFrames = ahead->numframes; numFrames = ahead->numframes;