From: Peter Schaefer Date: Fri, 29 May 2015 09:03:14 +0000 (+0200) Subject: deactivated meshTree X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=16976e602954c17708d0157ae8e4888cbe01bbdb;p=cgue_weave.git deactivated meshTree --- diff --git a/Weave/Graphix/Model/IMesh.cpp b/Weave/Graphix/Model/IMesh.cpp index 5a033aa..0873f56 100644 --- a/Weave/Graphix/Model/IMesh.cpp +++ b/Weave/Graphix/Model/IMesh.cpp @@ -23,7 +23,7 @@ typedef IMesh::Node Node; // Vergleiche Unterbaum -#define COMPARE_MTREE +//#define COMPARE_MTREE //draw BBox of MTREE deep LVL -1 means all lvl's #define BBOX_MTREE 5 diff --git a/Weave/Graphix/Model/Model.cpp b/Weave/Graphix/Model/Model.cpp index 9f5f514..bee81ca 100644 --- a/Weave/Graphix/Model/Model.cpp +++ b/Weave/Graphix/Model/Model.cpp @@ -741,3 +741,4 @@ Overlap Box::checkCollideByAxis(const Box& _boxA, const Box& _boxB) } return ret; } + diff --git a/Weave/Graphix/Model/Model.h b/Weave/Graphix/Model/Model.h index bc2f72f..0d8db9a 100644 --- a/Weave/Graphix/Model/Model.h +++ b/Weave/Graphix/Model/Model.h @@ -74,7 +74,6 @@ public: const mat4 modelOrig; }; - class Triangle { public: diff --git a/Weave/main.cpp b/Weave/main.cpp index c75cc2a..76434a2 100644 --- a/Weave/main.cpp +++ b/Weave/main.cpp @@ -29,8 +29,6 @@ //using std::endl; //using std::string; - - /* void logSDLerror(ostream &os, const char *msg) {