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

fix formatting.

pull/3167/head
Kim Kulling 2020-04-26 19:14:30 +02:00
parent bafb8e3189
commit 6c1e21d754
3 changed files with 77 additions and 1330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/Common/SceneCombiner.cpp
View File

@ -994,8 +994,7 @@ void SceneCombiner::CopySceneFlat(aiScene** _dest,const aiScene* src) {
} else { } else {
*_dest = new aiScene(); *_dest = new aiScene();
} }
CopyScene(_dest, src, false);
::memcpy(*_dest,src,sizeof(aiScene));
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------

23
code/Common/SpatialSort.cpp
View File

@ -51,13 +51,9 @@ using namespace Assimp;
#define CHAR_BIT 8 #define CHAR_BIT 8
#endif #endif
#ifdef _WIN32 const aiVector3D PlaneInit(0.8523f, 0.34321f, 0.5736f);
//# pragma warning(disable : 4127)
#endif // _WIN32
const aiVector3D PlaneInit( 0.8523f, 0.34321f, 0.5736f ); // ------------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------------
// Constructs a spatially sorted representation from the given position array. // Constructs a spatially sorted representation from the given position array.
// define the reference plane. We choose some arbitrary vector away from all basic axises // define the reference plane. We choose some arbitrary vector away from all basic axises
// in the hope that no model spreads all its vertices along this plane. // in the hope that no model spreads all its vertices along this plane.
@ -214,17 +210,20 @@ BinFloat ToBinary(const ai_real &pValue) {
// See http://en.wikipedia.org/wiki/Signed_number_representations. // See http://en.wikipedia.org/wiki/Signed_number_representations.
// Two's complement? // Two's complement?
/*if ((-42 == (~42 + 1)) && (binValue & 0x80000000)) bool DefaultValue = ((-42 == (~42 + 1)) && (binValue & 0x80000000));
bool OneComplement = ((-42 == ~42) && (binValue & 0x80000000));
bool SignedMagnitude = ((-42 == (42 | (-0))) && (binValue & 0x80000000));
if (DefaultValue)
return BinFloat(1 << (CHAR_BIT * sizeof(BinFloat) - 1)) - binValue; return BinFloat(1 << (CHAR_BIT * sizeof(BinFloat) - 1)) - binValue;
// One's complement? // One's complement?
else if ((-42 == ~42) && (binValue & 0x80000000)) else if (OneComplement)
return BinFloat(-0) - binValue; return BinFloat(-0) - binValue;
// Sign-magnitude? // Sign-magnitude?
else if ((-42 == (42 | (-0))) && (binValue & 0x80000000)) // -0 = 1000... binary else if (SignedMagnitude) // -0 = 1000... binary
return binValue;
else
return binValue; return binValue;
else*/
return binValue;
} }
} // namespace } // namespace

1381
test/unit/utImporter.cpp
View File

File diff suppressed because it is too large Load Diff