mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 10:53:51 +00:00
Code Issues Releases Wiki Activity

Merge remote branch 'kromgart/master' into next

Browse source
This commit is contained in:
Marc Zinnschlag 2012-03-24 16:57:06 +01:00
commit 4a2ade2372
2 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/nif/nif_file.cpp
View file

@ -162,6 +162,15 @@ void NIFFile::parse()
r->recName = rec; r->recName = rec;
records[i] = r; records[i] = r;
r->read(this); r->read(this);
// Discard tranformations for the root node, otherwise some meshes
// occasionally get wrong orientation. Only for NiNode-s for now, but
// can be expanded if needed.
// This should be rewritten when the method is cleaned up.
if (0 == i && rec == "NiNode")
{
static_cast<Nif::Node*>(r)->trafo = Nif::Transformation::getIdentity();
}
} }
/* After the data, the nif contains an int N and then a list of N /* After the data, the nif contains an int N and then a list of N

24
components/nif/nif_types.hpp
View file

@ -55,10 +55,26 @@ struct Matrix
struct Transformation struct Transformation
{ {
Vector pos; Vector pos;
Matrix rotation; Matrix rotation;
float scale; float scale;
Vector velocity; Vector velocity;
static const Transformation* getIdentity()
{
static Transformation identity;
static bool iset = false;
if (!iset)
{
identity.scale = 1.0f;
identity.rotation.v[0].array[0] = 1.0f;
identity.rotation.v[1].array[1] = 1.0f;
identity.rotation.v[2].array[2] = 1.0f;
iset = true;
}
return &identity;
}
}; };
#pragma pack(pop) #pragma pack(pop)