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

snapshot before searching for remaining traversal/building bug

metadata
Wenzel Jakob 2010-10-12 03:06:46 +02:00
parent 76abaf1cb8
commit 82faa961a2
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -830,6 +830,7 @@ public:
Float sa = aabb.getSurfaceArea(); Float sa = aabb.getSurfaceArea();
expTraversalSteps += sa; expTraversalSteps += sa;
sahCost += sa * m_traversalCost; sahCost += sa * m_traversalCost;
const KDNode *left; const KDNode *left;
if (EXPECT_TAKEN(!node->isIndirection())) if (EXPECT_TAKEN(!node->isIndirection()))
left = node->getLeft(); left = node->getLeft();
@ -2460,7 +2461,7 @@ protected:
static const int prevAxisTable[] = { 2, 0, 1 }; static const int prevAxisTable[] = { 2, 0, 1 };
static const int nextAxisTable[] = { 1, 2, 0 }; static const int nextAxisTable[] = { 1, 2, 0 };
KDStackEntry stack[MTS_KD_MAXDEPTH]; KDStackEntry stack[MTS_KD_MAXDEPTH*2];
const KDNode * __restrict farChild, const KDNode * __restrict farChild,
* __restrict currNode = m_nodes; * __restrict currNode = m_nodes;
@ -2469,12 +2470,12 @@ protected:
#endif #endif
/* Set up the entry point */ /* Set up the entry point */
int enPt = 0; uint32_t enPt = 0;
stack[enPt].t = mint; stack[enPt].t = mint;
stack[enPt].p = ray(mint); stack[enPt].p = ray(mint);
/* Set up the exit point */ /* Set up the exit point */
int exPt = 1; uint32_t exPt = 1;
stack[exPt].t = maxt; stack[exPt].t = maxt;
stack[exPt].p = ray(maxt); stack[exPt].p = ray(maxt);
stack[exPt].node = NULL; stack[exPt].node = NULL;

2
src/tests/test_kd.cpp
View File

@ -161,7 +161,7 @@ public:
void test02_buildSimple() { void test02_buildSimple() {
Properties bunnyProps("ply"); Properties bunnyProps("ply");
bunnyProps.setString("filename", "tools/tests/happy.ply"); bunnyProps.setString("filename", "tools/tests/bunny.ply");
ref<TriMesh> mesh = static_cast<TriMesh *> (PluginManager::getInstance()-> ref<TriMesh> mesh = static_cast<TriMesh *> (PluginManager::getInstance()->
createObject(TriMesh::m_theClass, bunnyProps)); createObject(TriMesh::m_theClass, bunnyProps));