[fixed] .x loader messing up frame hierarchy

[jolindien]

hi guys, i think there's a bug in the .x loader, destroying the frame hierarchy.

in CXFileReader.cpp, bool CXFileReader::parseDataObject()

code is :

Code: Select all

if (objectName == "Frame")
   return parseDataObjectFrame(RootFrame);
else

and should be :

Code: Select all

if (objectName == "Frame")
{
     RootFrame.ChildFrames.push_back(SXFrame());
    return parseDataObjectFrame(RootFrame.ChildFrames[RootFrame.ChildFrames.size()-1]);
}
else

And in CXAnimationPlayer.cpp, void CXAnimationPlayer::addFacesToBuffer(s32 meshbuffernr, CXFileReader::SXMesh& mesh, s32 matnr, const CXFileReader::SXFrame& frame)

code is (no code, only comments):

Code: Select all

	// transform vertices and normals
	/*core::matrix4 mat = frame.LocalMatrix;
	mat.makeInverse();

	s32 vcnt = buf->Vertices.size();
	for (s32 u=0; u<vcnt; ++u)
	{
		mat.transformVect(buf->Vertices[u].Pos);
		mat.inverseRotateVect(buf->Vertices[u].Normal);
	}*/

and should be :

Code: Select all

	core::matrix4 mat = frame.GlobalMatrix;

	s32 vcnt = buf->Vertices.size();
	for (s32 u=0; u<vcnt; ++u)
	{
		mat.transformVect(buf->Vertices[u].Pos);
		mat.rotateVect(buf->Vertices[u].Normal);
	}

[bitplane]

have you got a test mesh? this fix still doesn't work with my nested frame test mesh, but i guess it's something to do with animation