Made octree check optional

This commit is contained in:
Siana Gearz
2012-11-12 04:48:00 +01:00
parent 562acd6e2c
commit 59d4d833f1

View File

@@ -40,6 +40,7 @@
#if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG #if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
#define OCT_ERRS LL_ERRS("OctreeErrors") #define OCT_ERRS LL_ERRS("OctreeErrors")
#define OCTREE_GUARD_CHECK
#else #else
#define OCT_ERRS LL_WARNS("OctreeErrors") #define OCT_ERRS LL_WARNS("OctreeErrors")
#endif #endif
@@ -81,6 +82,7 @@ public:
virtual void traverse(const LLOctreeNode<T>* node); virtual void traverse(const LLOctreeNode<T>* node);
}; };
#ifdef OCTREE_GUARD_CHECK
struct OctreeGuard struct OctreeGuard
{ {
template <typename T> template <typename T>
@@ -108,6 +110,18 @@ struct OctreeGuard
} }
void* mNode; void* mNode;
}; };
#else
struct OctreeGuard
{
template <typename T>
OctreeGuard(const LLOctreeNode<T>* node) {}
~OctreeGuard() {}
template <typename T>
static bool checkGuarded(const LLOctreeNode<T>* node) {return false;}
};
#endif
template <class T> template <class T>
class LLOctreeNode : public LLTreeNode<T> class LLOctreeNode : public LLTreeNode<T>
{ {