v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/assimp/assimp

pull/280/head v3.1
Kim Kulling 2014-05-12 20:00:59 +02:00
parent 52f3cd0afb c5ba04cabf
commit 36c08a0a7d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/XFileParser.cpp
View File

@ -136,6 +136,9 @@ XFileParser::XFileParser( const std::vector<char>& pBuffer)
ThrowException( boost::str( boost::format( "Unknown float size %1% specified in xfile header.") ThrowException( boost::str( boost::format( "Unknown float size %1% specified in xfile header.")
% mBinaryFloatSize)); % mBinaryFloatSize));
// The x format specifies size in bits, but we work in bytes
mBinaryFloatSize /= 8;
P += 16; P += 16;
// If this is a compressed X file, apply the inflate algorithm to it // If this is a compressed X file, apply the inflate algorithm to it

2
code/XFileParser.h
View File

@ -144,7 +144,7 @@ protected:
protected: protected:
unsigned int mMajorVersion, mMinorVersion; ///< version numbers unsigned int mMajorVersion, mMinorVersion; ///< version numbers
bool mIsBinaryFormat; ///< true if the file is in binary, false if it's in text form bool mIsBinaryFormat; ///< true if the file is in binary, false if it's in text form
unsigned int mBinaryFloatSize; ///< float size, either 32 or 64 bits unsigned int mBinaryFloatSize; ///< float size in bytes, either 4 or 8
// counter for number arrays in binary format // counter for number arrays in binary format
unsigned int mBinaryNumCount; unsigned int mBinaryNumCount;