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/779/head
Kim Kulling 2016-01-31 00:42:02 +01:00
parent a37ea18f09 bcd38707c5
commit 16fffb2ab1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/3DSConverter.cpp
View File

@ -70,8 +70,9 @@ void Discreet3DSImporter::ReplaceDefaultMaterial()
for (unsigned int i = 0; i < mScene->mMaterials.size();++i) for (unsigned int i = 0; i < mScene->mMaterials.size();++i)
{ {
std::string s = mScene->mMaterials[i].mName; std::string s = mScene->mMaterials[i].mName;
for (std::string::iterator it = s.begin(); it != s.end(); ++it) for ( std::string::iterator it = s.begin(); it != s.end(); ++it ) {
*it = ::tolower(*it); *it = static_cast< char >( ::tolower( *it ) );
}
if (std::string::npos == s.find("default"))continue; if (std::string::npos == s.find("default"))continue;
@ -663,14 +664,14 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene* pcSOut,aiNode* pcOut,
nda->mRotationKeys = new aiQuatKey[nda->mNumRotationKeys]; nda->mRotationKeys = new aiQuatKey[nda->mNumRotationKeys];
// Rotations are quaternion offsets // Rotations are quaternion offsets
aiQuaternion abs; aiQuaternion abs1;
for (unsigned int n = 0; n < nda->mNumRotationKeys;++n) for (unsigned int n = 0; n < nda->mNumRotationKeys;++n)
{ {
const aiQuatKey& q = pcIn->aRotationKeys[n]; const aiQuatKey& q = pcIn->aRotationKeys[n];
abs = (n ? abs * q.mValue : q.mValue); abs1 = (n ? abs1 * q.mValue : q.mValue);
nda->mRotationKeys[n].mTime = q.mTime; nda->mRotationKeys[n].mTime = q.mTime;
nda->mRotationKeys[n].mValue = abs.Normalize(); nda->mRotationKeys[n].mValue = abs1.Normalize();
} }
} }