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

fixed the transition from MinMax binning to exact evaluation

metadata
Wenzel Jakob 2010-10-10 18:18:14 +02:00
parent a1ca92bda2
commit bb83ad08cf
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,7 +288,7 @@ public:
m_clip = true; m_clip = true;
m_stopPrims = 1; m_stopPrims = 1;
m_maxBadRefines = 2; m_maxBadRefines = 2;
m_exactPrimThreshold = 1024; m_exactPrimThreshold = 4096;
m_maxDepth = 0; m_maxDepth = 0;
m_retract = true; m_retract = true;
} }
@ -748,15 +748,22 @@ protected:
* This is necessary when passing from Min-Max binning to the more * This is necessary when passing from Min-Max binning to the more
* accurate SAH-based optimizier. * accurate SAH-based optimizier.
*/ */
boost::tuple<EdgeEvent *, EdgeEvent *> createEventList( boost::tuple<EdgeEvent *, EdgeEvent *, size_type> createEventList(
OrderedChunkAllocator &alloc, const AABB &nodeAABB, index_type *prims, size_type primCount) { OrderedChunkAllocator &alloc, const AABB &nodeAABB, index_type *prims, size_type primCount) {
size_type initialSize = primCount * 6; size_type initialSize = primCount * 6, actualPrimCount = 0;
EdgeEvent *eventStart = alloc.allocate<EdgeEvent>(initialSize); EdgeEvent *eventStart = alloc.allocate<EdgeEvent>(initialSize);
EdgeEvent *eventEnd = eventStart; EdgeEvent *eventEnd = eventStart;
for (size_type i=0; i<primCount; ++i) { for (size_type i=0; i<primCount; ++i) {
index_type index = prims[i]; index_type index = prims[i];
AABB aabb = downCast()->getClippedAABB(index, nodeAABB); AABB aabb;
if (m_clip) {
aabb = downCast()->getClippedAABB(index, nodeAABB);
if (!aabb.isValid() || aabb.getSurfaceArea() == 0)
continue;
} else {
aabb = downCast()->getAABB(index);
}
for (int axis=0; axis<3; ++axis) { for (int axis=0; axis<3; ++axis) {
float min = (float) aabb.min[axis], max = (float) aabb.max[axis]; float min = (float) aabb.min[axis], max = (float) aabb.max[axis];
@ -768,13 +775,14 @@ protected:
*eventEnd++ = EdgeEvent(EdgeEvent::EEdgeEnd, axis, max, index); *eventEnd++ = EdgeEvent(EdgeEvent::EEdgeEnd, axis, max, index);
} }
} }
++actualPrimCount;
} }
size_type newSize = eventEnd - eventStart; size_type newSize = eventEnd - eventStart;
if (newSize != initialSize) if (newSize != initialSize)
alloc.shrinkAllocation<EdgeEvent>(eventStart, newSize); alloc.shrinkAllocation<EdgeEvent>(eventStart, newSize);
return boost::make_tuple(eventStart, eventEnd); return boost::make_tuple(eventStart, eventEnd, actualPrimCount);
} }
/** /**
@ -839,13 +847,13 @@ protected:
if (primCount <= m_exactPrimThreshold) { if (primCount <= m_exactPrimThreshold) {
OrderedChunkAllocator &alloc = isLeftChild ? ctx.leftAlloc : ctx.rightAlloc; OrderedChunkAllocator &alloc = isLeftChild ? ctx.leftAlloc : ctx.rightAlloc;
boost::tuple<EdgeEvent *, EdgeEvent *> events boost::tuple<EdgeEvent *, EdgeEvent *, size_type> events
= createEventList(alloc, nodeAABB, indices, primCount); = createEventList(alloc, nodeAABB, indices, primCount);
std::sort(boost::get<0>(events), boost::get<1>(events), EdgeEventOrdering()); std::sort(boost::get<0>(events), boost::get<1>(events), EdgeEventOrdering());
Float sahCost = buildTreeSAH(ctx, depth, node, nodeAABB, Float sahCost = buildTreeSAH(ctx, depth, node, nodeAABB,
boost::get<0>(events), boost::get<1>(events), primCount, boost::get<0>(events), boost::get<1>(events), boost::get<2>(events),
isLeftChild, badRefines); isLeftChild, badRefines);
alloc.release(boost::get<0>(events)); alloc.release(boost::get<0>(events));