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

Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio

pull/261/head
Léo Terziman 2013-11-21 13:05:48 +01:00
parent 29c125e51d
commit 4e7b59be55
19 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssimpPCH.h
View File

@ -74,7 +74,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/* Helper macro to set a pointer to NULL in debug builds /* Helper macro to set a pointer to NULL in debug builds
*/ */
#if (defined _DEBUG) #if (defined ASSIMP_BUILD_DEBUG)
# define AI_DEBUG_INVALIDATE_PTR(x) x = NULL; # define AI_DEBUG_INVALIDATE_PTR(x) x = NULL;
#else #else
# define AI_DEBUG_INVALIDATE_PTR(x) # define AI_DEBUG_INVALIDATE_PTR(x)

2
code/BaseImporter.cpp
View File

@ -533,7 +533,7 @@ void BatchLoader::LoadAll()
for (std::list<LoadRequest>::iterator it = data->requests.begin();it != data->requests.end(); ++it) { for (std::list<LoadRequest>::iterator it = data->requests.begin();it != data->requests.end(); ++it) {
// force validation in debug builds // force validation in debug builds
unsigned int pp = (*it).flags; unsigned int pp = (*it).flags;
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
pp |= aiProcess_ValidateDataStructure; pp |= aiProcess_ValidateDataStructure;
#endif #endif
// setup config properties if necessary // setup config properties if necessary

2
code/BlenderDNA.h
View File

@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "TinyFormatter.h" #include "TinyFormatter.h"
// enable verbose log output. really verbose, so be careful. // enable verbose log output. really verbose, so be careful.
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
# define ASSIMP_BUILD_BLENDER_DEBUG # define ASSIMP_BUILD_BLENDER_DEBUG
#endif #endif

2
code/FBXConverter.cpp
View File

@ -1838,7 +1838,7 @@ private:
ai_assert(curves.size()); ai_assert(curves.size());
// sanity check whether the input is ok // sanity check whether the input is ok
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
{ const Object* target = NULL; { const Object* target = NULL;
BOOST_FOREACH(const AnimationCurveNode* node, curves) { BOOST_FOREACH(const AnimationCurveNode* node, curves) {
if(!target) { if(!target) {

2
code/FBXParser.cpp
View File

@ -565,7 +565,7 @@ void ReadBinaryDataArray(char type, uint32_t count, const char*& data, const cha
// terminate zlib // terminate zlib
inflateEnd(&zstream); inflateEnd(&zstream);
} }
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
else { else {
// runtime check for this happens at tokenization stage // runtime check for this happens at tokenization stage
ai_assert(false); ai_assert(false);

4
code/IFCBoolean.cpp
View File

@ -221,7 +221,7 @@ bool IntersectsBoundaryProfile( const IfcVector3& e0, const IfcVector3& e1, cons
const IfcFloat s = (x*e.y - e.x*y)/det; const IfcFloat s = (x*e.y - e.x*y)/det;
const IfcFloat t = (x*b.y - b.x*y)/det; const IfcFloat t = (x*b.y - b.x*y)/det;
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
const IfcVector3 check = b0 + b*s - (e0 + e*t); const IfcVector3 check = b0 + b*s - (e0 + e*t);
ai_assert((IfcVector2(check.x,check.y)).SquareLength() < 1e-5); ai_assert((IfcVector2(check.x,check.y)).SquareLength() < 1e-5);
#endif #endif
@ -417,7 +417,7 @@ void ProcessPolygonalBoundedBooleanHalfSpaceDifference(const IfcPolygonalBounded
IfcVector3 isectpos; IfcVector3 isectpos;
const Intersect isect = extra_point_flag ? Intersect_No : IntersectSegmentPlane(p,n,e0,e1,isectpos); const Intersect isect = extra_point_flag ? Intersect_No : IntersectSegmentPlane(p,n,e0,e1,isectpos);
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
if (isect == Intersect_Yes) { if (isect == Intersect_Yes) {
const IfcFloat f = fabs((isectpos - p)*n); const IfcFloat f = fabs((isectpos - p)*n);
ai_assert(f < 1e-5); ai_assert(f < 1e-5);

2
code/IFCCurve.cpp
View File

@ -550,7 +550,7 @@ Curve* Curve :: Convert(const IFC::IfcCurve& curve,ConversionData& conv)
return NULL; return NULL;
} }
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
bool Curve :: InRange(IfcFloat u) const bool Curve :: InRange(IfcFloat u) const
{ {

4
code/IFCOpenings.cpp
View File

@ -1063,7 +1063,7 @@ IfcMatrix4 ProjectOntoPlane(std::vector<IfcVector2>& out_contour, const TempMesh
if(!ok) { if(!ok) {
return IfcMatrix4(); return IfcMatrix4();
} }
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
const IfcFloat det = m.Determinant(); const IfcFloat det = m.Determinant();
ai_assert(fabs(det-1) < 1e-5); ai_assert(fabs(det-1) < 1e-5);
#endif #endif
@ -1119,7 +1119,7 @@ IfcMatrix4 ProjectOntoPlane(std::vector<IfcVector2>& out_contour, const TempMesh
m = mult * m; m = mult * m;
// debug code to verify correctness // debug code to verify correctness
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
std::vector<IfcVector2> out_contour2; std::vector<IfcVector2> out_contour2;
BOOST_FOREACH(const IfcVector3& x, in_verts) { BOOST_FOREACH(const IfcVector3& x, in_verts) {
const IfcVector3& vv = m * x; const IfcVector3& vv = m * x;

2
code/IFCUtil.cpp
View File

@ -193,7 +193,7 @@ void TempMesh::ComputePolygonNormals(std::vector<IfcVector3>& normals,
temp[cnt++] = v.x; temp[cnt++] = v.x;
temp[cnt++] = v.y; temp[cnt++] = v.y;
temp[cnt++] = v.z; temp[cnt++] = v.z;
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
temp[cnt] = std::numeric_limits<IfcFloat>::quiet_NaN(); temp[cnt] = std::numeric_limits<IfcFloat>::quiet_NaN();
#endif #endif
++cnt; ++cnt;

2
code/IFCUtil.h
View File

@ -365,7 +365,7 @@ public:
// and append the result to the mesh // and append the result to the mesh
virtual void SampleDiscrete(TempMesh& out,IfcFloat start,IfcFloat end) const; virtual void SampleDiscrete(TempMesh& out,IfcFloat start,IfcFloat end) const;
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
// check if a particular parameter value lies within the well-defined range // check if a particular parameter value lies within the well-defined range
bool InRange(IfcFloat) const; bool InRange(IfcFloat) const;
#endif #endif

8
code/Importer.cpp
View File

@ -232,7 +232,7 @@ aiReturn Importer::RegisterLoader(BaseImporter* pImp)
for(std::set<std::string>::const_iterator it = st.begin(); it != st.end(); ++it) { for(std::set<std::string>::const_iterator it = st.begin(); it != st.end(); ++it) {
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
if (IsExtensionSupported(*it)) { if (IsExtensionSupported(*it)) {
DefaultLogger::get()->warn("The file extension " + *it + " is already in use"); DefaultLogger::get()->warn("The file extension " + *it + " is already in use");
} }
@ -558,7 +558,7 @@ void WriteLogOpening(const std::string& file)
<< "<unknown compiler>" << "<unknown compiler>"
#endif #endif
#ifndef NDEBUG #ifdef ASSIMP_BUILD_DEBUG
<< " debug" << " debug"
#endif #endif
@ -749,7 +749,7 @@ const aiScene* Importer::ApplyPostProcessing(unsigned int pFlags)
} }
} }
#endif // no validation #endif // no validation
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
if (pimpl->bExtraVerbose) if (pimpl->bExtraVerbose)
{ {
#ifndef ASSIMP_BUILD_NO_VALIDATEDS_PROCESS #ifndef ASSIMP_BUILD_NO_VALIDATEDS_PROCESS
@ -783,7 +783,7 @@ const aiScene* Importer::ApplyPostProcessing(unsigned int pFlags)
if( !pimpl->mScene) { if( !pimpl->mScene) {
break; break;
} }
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
#ifndef ASSIMP_BUILD_NO_VALIDATEDS_PROCESS #ifndef ASSIMP_BUILD_NO_VALIDATEDS_PROCESS
continue; continue;

2
code/LWOLoader.cpp
View File

@ -294,7 +294,7 @@ void LWOImporter::InternReadFile( const std::string& pFile,
unsigned int vUVChannelIndices[AI_MAX_NUMBER_OF_TEXTURECOORDS]; unsigned int vUVChannelIndices[AI_MAX_NUMBER_OF_TEXTURECOORDS];
unsigned int vVColorIndices[AI_MAX_NUMBER_OF_COLOR_SETS]; unsigned int vVColorIndices[AI_MAX_NUMBER_OF_COLOR_SETS];
#if _DEBUG #ifdef ASSIMP_BUILD_DEBUG
for (unsigned int mui = 0; mui < AI_MAX_NUMBER_OF_TEXTURECOORDS;++mui ) { for (unsigned int mui = 0; mui < AI_MAX_NUMBER_OF_TEXTURECOORDS;++mui ) {
vUVChannelIndices[mui] = UINT_MAX; vUVChannelIndices[mui] = UINT_MAX;
} }

2
code/SmoothingGroups.h
View File

@ -52,7 +52,7 @@ struct FaceWithSmoothingGroup
{ {
// let the rest uninitialized for performance - in release builds. // let the rest uninitialized for performance - in release builds.
// in debug builds set all indices to a common magic value // in debug builds set all indices to a common magic value
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
this->mIndices[0] = 0xffffffff; this->mIndices[0] = 0xffffffff;
this->mIndices[1] = 0xffffffff; this->mIndices[1] = 0xffffffff;
this->mIndices[2] = 0xffffffff; this->mIndices[2] = 0xffffffff;

2
code/SpatialSort.cpp
View File

@ -329,7 +329,7 @@ unsigned int SpatialSort::GenerateMappingTable(std::vector<unsigned int>& fill,f
++t; ++t;
} }
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
// debug invariant: mPositions[i].mIndex values must range from 0 to mPositions.size()-1 // debug invariant: mPositions[i].mIndex values must range from 0 to mPositions.size()-1
for (size_t i = 0; i < fill.size(); ++i) { for (size_t i = 0; i < fill.size(); ++i) {

6
code/Subdivision.cpp
View File

@ -383,7 +383,7 @@ void CatmullClarkSubdivider::InternSubdivide (
} }
// check the other way round for consistency // check the other way round for consistency
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
for (size_t t = 0; t < ofsadjvec.size()-1; ++t) { for (size_t t = 0; t < ofsadjvec.size()-1; ++t) {
for (unsigned int m = 0; m < cntadjfac[t]; ++m) { for (unsigned int m = 0; m < cntadjfac[t]; ++m) {
@ -530,7 +530,7 @@ void CatmullClarkSubdivider::InternSubdivide (
ai_assert(adj[o]-moffsets[nidx].first < mp->mNumFaces); ai_assert(adj[o]-moffsets[nidx].first < mp->mNumFaces);
const aiFace& f = mp->mFaces[adj[o]-moffsets[nidx].first]; const aiFace& f = mp->mFaces[adj[o]-moffsets[nidx].first];
# ifdef _DEBUG # ifdef ASSIMP_BUILD_DEBUG
bool haveit = false; bool haveit = false;
# endif # endif
@ -553,7 +553,7 @@ void CatmullClarkSubdivider::InternSubdivide (
// fixme: replace with mod face.mNumIndices? // fixme: replace with mod face.mNumIndices?
R += c0.midpoint+c1.midpoint; R += c0.midpoint+c1.midpoint;
# ifdef _DEBUG # ifdef ASSIMP_BUILD_DEBUG
haveit = true; haveit = true;
# endif # endif
break; break;

2
code/ValidateDataStructure.cpp
View File

@ -86,7 +86,7 @@ AI_WONT_RETURN void ValidateDSProcess::ReportError(const char* msg,...)
ai_assert(iLen > 0); ai_assert(iLen > 0);
va_end(args); va_end(args);
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
ai_assert( false ); ai_assert( false );
#endif #endif
throw DeadlyImportError("Validation failed: " + std::string(szBuffer,iLen)); throw DeadlyImportError("Validation failed: " + std::string(szBuffer,iLen));

2
include/assimp/ai_assert.h
View File

@ -3,7 +3,7 @@
#ifndef AI_DEBUG_H_INC #ifndef AI_DEBUG_H_INC
#define AI_DEBUG_H_INC #define AI_DEBUG_H_INC
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
# include <assert.h> # include <assert.h>
# define ai_assert(expression) assert(expression) # define ai_assert(expression) assert(expression)
#else #else

2
include/assimp/defs.h
View File

@ -242,7 +242,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# define AI_C_THREADSAFE # define AI_C_THREADSAFE
#endif // !! ASSIMP_BUILD_SINGLETHREADED #endif // !! ASSIMP_BUILD_SINGLETHREADED
#ifdef _DEBUG #if defined(_DEBUG) || ! defined(NDEBUG)
# define ASSIMP_BUILD_DEBUG # define ASSIMP_BUILD_DEBUG
#endif #endif

4
include/assimp/types.h
View File

@ -255,7 +255,7 @@ struct aiString
{ {
data[0] = '\0'; data[0] = '\0';
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
// Debug build: overwrite the string on its full length with ESC (27) // Debug build: overwrite the string on its full length with ESC (27)
memset(data+1,27,MAXLEN-1); memset(data+1,27,MAXLEN-1);
#endif #endif
@ -342,7 +342,7 @@ struct aiString
length = 0; length = 0;
data[0] = '\0'; data[0] = '\0';
#ifdef _DEBUG #ifdef ASSIMP_BUILD_DEBUG
// Debug build: overwrite the string on its full length with ESC (27) // Debug build: overwrite the string on its full length with ESC (27)
memset(data+1,27,MAXLEN-1); memset(data+1,27,MAXLEN-1);
#endif #endif