From 1058cfe7a721bef213445cbc16771c1a828a27b1 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Sun, 10 Oct 2010 13:06:42 +0200 Subject: [PATCH] cleanups --- include/mitsuba/render/gkdtree.h | 46 -------------------------------- 1 file changed, 46 deletions(-) diff --git a/include/mitsuba/render/gkdtree.h b/include/mitsuba/render/gkdtree.h index 09419c8e..39d6fd78 100644 --- a/include/mitsuba/render/gkdtree.h +++ b/include/mitsuba/render/gkdtree.h @@ -865,13 +865,6 @@ protected: ++badRefines; } -#if 0 - cout << "Depth " << depth << endl; - cout << "AABB: " << nodeAABB.toString() << endl; - cout << "SAH cost: " << leafCost << " -> " << bestSplit.toString() << endl; - cout << endl; -#endif - /* ==================================================================== */ /* Partitioning */ /* ==================================================================== */ @@ -983,33 +976,6 @@ protected: return leafCost; } -#if 0 - EdgeEventOrdering ord; - int primCounts[3]; - primCounts[0] = 0; - primCounts[1] = 0; - primCounts[2] = 0; - for (EdgeEvent *event = eventStart; event < eventEnd; ++event) { - Assert(event->axis >= 0 && event->axis < 3); - Assert(event->type >= 0 && event->type < 3); - if (event->type == EdgeEvent::EEdgePlanar - || event->type == EdgeEvent::EEdgeStart) - primCounts[event->axis]++; - EdgeEvent *next = event+1; - if (next < eventEnd) { - if (!ord(*event, *next)) { - cout << event->toString() << endl; - cout << next->toString() << endl; - Assert(false); - } - } - } - - Assert(primCounts[0] == primCount); - Assert(primCounts[1] == primCount); - Assert(primCounts[2] == primCount); -#endif - SplitCandidate bestSplit; Float invSA = 1.0f / nodeAABB.getSurfaceArea(); @@ -1122,13 +1088,6 @@ protected: Assert(bestSplit.sahCost != std::numeric_limits::infinity()); -#if 0 - cout << "Depth " << depth << endl; - cout << "AABB: " << nodeAABB.toString() << endl; - cout << "SAH cost: " << leafCost << " -> " << bestSplit.toString() << endl; - cout << endl; -#endif - /* "Bad refines" heuristic from PBRT */ if (bestSplit.sahCost >= leafCost) { if ((bestSplit.sahCost > 4 * leafCost && primCount < 16) @@ -1231,11 +1190,6 @@ protected: *newEventsRightEnd = newEventsRightStart; for (EdgeEvent *event = eventStart; eventindex); if (classification == ELeftSide) { /* Left-only primitive. Move to the left list and advance */