mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanups

metadata
Wenzel Jakob 2010-10-10 13:06:42 +02:00
parent 83958d8f91
commit 1058cfe7a7
1 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/mitsuba/render/gkdtree.h
View File

@ -865,13 +865,6 @@ protected:
++badRefines; ++badRefines;
} }
#if 0
cout << "Depth " << depth << endl;
cout << "AABB: " << nodeAABB.toString() << endl;
cout << "SAH cost: " << leafCost << " -> " << bestSplit.toString() << endl;
cout << endl;
#endif
/* ==================================================================== */ /* ==================================================================== */
/* Partitioning */ /* Partitioning */
/* ==================================================================== */ /* ==================================================================== */
@ -983,33 +976,6 @@ protected:
return leafCost; 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; SplitCandidate bestSplit;
Float invSA = 1.0f / nodeAABB.getSurfaceArea(); Float invSA = 1.0f / nodeAABB.getSurfaceArea();
@ -1122,13 +1088,6 @@ protected:
Assert(bestSplit.sahCost != std::numeric_limits<Float>::infinity()); Assert(bestSplit.sahCost != std::numeric_limits<Float>::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 */ /* "Bad refines" heuristic from PBRT */
if (bestSplit.sahCost >= leafCost) { if (bestSplit.sahCost >= leafCost) {
if ((bestSplit.sahCost > 4 * leafCost && primCount < 16) if ((bestSplit.sahCost > 4 * leafCost && primCount < 16)
@ -1231,11 +1190,6 @@ protected:
*newEventsRightEnd = newEventsRightStart; *newEventsRightEnd = newEventsRightStart;
for (EdgeEvent *event = eventStart; event<eventEnd; ++event) { for (EdgeEvent *event = eventStart; event<eventEnd; ++event) {
Assert(leftEventsTempEnd - leftEventsTempStart <= primsLeft * 6);//XXX XXX XXX
Assert(rightEventsTempEnd - rightEventsTempStart <= primsRight * 6);
Assert(newEventsLeftEnd - newEventsLeftStart <= primsBoth * 6);
Assert(newEventsRightEnd - newEventsRightStart <= primsBoth * 6);
uint8_t classification = storage.get(event->index); uint8_t classification = storage.get(event->index);
if (classification == ELeftSide) { if (classification == ELeftSide) {
/* Left-only primitive. Move to the left list and advance */ /* Left-only primitive. Move to the left list and advance */