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

BLENDER: Normal vectors are now read properly. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@766 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-07-07 15:17:18 +00:00
parent fb2815047d
commit 729b70ae0f
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
code/BlenderDNA.inl
View File

@ -530,23 +530,18 @@ template <typename T> inline void ConvertDispatcher(T& out, const Structure& in,
{ {
if (in.name == "int") { if (in.name == "int") {
out = static_cast_silent<T>()(db.reader->GetU4()); out = static_cast_silent<T>()(db.reader->GetU4());
//db.reader->IncPtr(-4);
} }
else if (in.name == "short") { else if (in.name == "short") {
out = static_cast_silent<T>()(db.reader->GetU2()); out = static_cast_silent<T>()(db.reader->GetU2());
//db.reader->IncPtr(-2);
} }
else if (in.name == "char") { else if (in.name == "char") {
out = static_cast_silent<T>()(db.reader->GetU1()); out = static_cast_silent<T>()(db.reader->GetU1());
//db.reader->IncPtr(-1);
} }
else if (in.name == "float") { else if (in.name == "float") {
out = static_cast<T>(db.reader->GetF4()); out = static_cast<T>(db.reader->GetF4());
//db.reader->IncPtr(-4);
} }
else if (in.name == "double") { else if (in.name == "double") {
out = static_cast<T>(db.reader->GetF8()); out = static_cast<T>(db.reader->GetF8());
//db.reader->IncPtr(-8);
} }
else { else {
throw DeadlyImportError("Unknown source for conversion to primitive data type: "+in.name); throw DeadlyImportError("Unknown source for conversion to primitive data type: "+in.name);
@ -562,6 +557,17 @@ template <> inline void Structure :: Convert<int> (int& dest,const FileDataba
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
template <> inline void Structure :: Convert<short> (short& dest,const FileDatabase& db) const template <> inline void Structure :: Convert<short> (short& dest,const FileDatabase& db) const
{ {
// automatic rescaling from short to float and vice versa (seems to be used by normals)
if (name == "float") {
dest = static_cast<short>(db.reader->GetF4() * 32767.f);
//db.reader->IncPtr(-4);
return;
}
else if (name == "double") {
dest = static_cast<short>(db.reader->GetF8() * 32767.);
//db.reader->IncPtr(-8);
return;
}
ConvertDispatcher(dest,*this,db); ConvertDispatcher(dest,*this,db);
} }
@ -571,12 +577,10 @@ template <> inline void Structure :: Convert<char> (char& dest,const FileDatab
// automatic rescaling from char to float and vice versa (seems useful for RGB colors) // automatic rescaling from char to float and vice versa (seems useful for RGB colors)
if (name == "float") { if (name == "float") {
dest = static_cast<char>(db.reader->GetF4() * 255.f); dest = static_cast<char>(db.reader->GetF4() * 255.f);
//db.reader->IncPtr(-4);
return; return;
} }
else if (name == "double") { else if (name == "double") {
dest = static_cast<char>(db.reader->GetF8() * 255.f); dest = static_cast<char>(db.reader->GetF8() * 255.f);
//db.reader->IncPtr(-8);
return; return;
} }
ConvertDispatcher(dest,*this,db); ConvertDispatcher(dest,*this,db);
@ -588,7 +592,11 @@ template <> inline void Structure :: Convert<float> (float& dest,const FileData
// automatic rescaling from char to float and vice versa (seems useful for RGB colors) // automatic rescaling from char to float and vice versa (seems useful for RGB colors)
if (name == "char") { if (name == "char") {
dest = db.reader->GetI1() / 255.f; dest = db.reader->GetI1() / 255.f;
//db.reader->IncPtr(-1); return;
}
// automatic rescaling from short to float and vice versa (used by normals)
else if (name == "short") {
dest = db.reader->GetI2() / 32767.f;
return; return;
} }
ConvertDispatcher(dest,*this,db); ConvertDispatcher(dest,*this,db);
@ -598,8 +606,11 @@ template <> inline void Structure :: Convert<float> (float& dest,const FileData
template <> inline void Structure :: Convert<double> (double& dest,const FileDatabase& db) const template <> inline void Structure :: Convert<double> (double& dest,const FileDatabase& db) const
{ {
if (name == "char") { if (name == "char") {
dest = db.reader->GetI1() / 255.f; dest = db.reader->GetI1() / 255.;
//db.reader->IncPtr(-1); return;
}
else if (name == "short") {
dest = db.reader->GetI2() / 32767.;
return; return;
} }
ConvertDispatcher(dest,*this,db); ConvertDispatcher(dest,*this,db);

2
code/BlenderModifier.cpp
View File

@ -185,6 +185,8 @@ void BlenderModifier_Mirror :: DoIt(aiNode& out, ConversionData& conv_data, co
const MirrorModifierData& mir = static_cast<const MirrorModifierData&>(orig_modifier); const MirrorModifierData& mir = static_cast<const MirrorModifierData&>(orig_modifier);
ai_assert(mir.modifier.type == ModifierData::eModifierType_Mirror); ai_assert(mir.modifier.type == ModifierData::eModifierType_Mirror);
// XXX not entirely correct, mirroring on two axes results in 4 distinct objects in blender ...
// take all input meshes and clone them // take all input meshes and clone them
for (unsigned int i = 0; i < out.mNumMeshes; ++i) { for (unsigned int i = 0; i < out.mNumMeshes; ++i) {
aiMesh* mesh; aiMesh* mesh;