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

View File

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

View File

@ -51,10 +51,6 @@ using namespace Assimp;
#define CHAR_BIT 8
#endif
#ifdef _WIN32
//# pragma warning(disable : 4127)
#endif // _WIN32
const aiVector3D PlaneInit(0.8523f, 0.34321f, 0.5736f);
// ------------------------------------------------------------------------------------------------
@ -214,16 +210,19 @@ BinFloat ToBinary(const ai_real &pValue) {
// See http://en.wikipedia.org/wiki/Signed_number_representations.
// 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;
// One's complement?
else if ((-42 == ~42) && (binValue & 0x80000000))
else if (OneComplement)
return BinFloat(-0) - binValue;
// Sign-magnitude?
else if ((-42 == (42 | (-0))) && (binValue & 0x80000000)) // -0 = 1000... binary
else if (SignedMagnitude) // -0 = 1000... binary
return binValue;
else*/
else
return binValue;
}

File diff suppressed because it is too large Load Diff