From 84cff419f8371e2388286f2fbab3b964bea82411 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Mon, 11 Oct 2010 14:20:20 -0400 Subject: [PATCH] build better trees --- include/mitsuba/render/gkdtree.h | 2 +- src/shapes/ply/ply.cpp | 2 +- src/tests/test_kd.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/mitsuba/render/gkdtree.h b/include/mitsuba/render/gkdtree.h index 0e2b782c..1e7dfa47 100644 --- a/include/mitsuba/render/gkdtree.h +++ b/include/mitsuba/render/gkdtree.h @@ -473,7 +473,7 @@ public: m_clip = true; m_stopPrims = 4; m_maxBadRefines = 3; - m_exactPrimThreshold = 16384; + m_exactPrimThreshold = 65536; m_maxDepth = 0; m_retract = true; m_parallel = true; diff --git a/src/shapes/ply/ply.cpp b/src/shapes/ply/ply.cpp index 96f41f88..f97461ab 100644 --- a/src/shapes/ply/ply.cpp +++ b/src/shapes/ply/ply.cpp @@ -367,7 +367,7 @@ void PLYLoader::loadPLY(const fs::path &path) { ply_parser.parse(path.file_string()); Log(EInfo, "\"%s\": Loaded " SIZE_T_FMT " triangles, " SIZE_T_FMT - " vertices (%s, %i ms).", m_name.c_str(), m_triangleCount, m_vertexCount, + " vertices (%s in %i ms).", m_name.c_str(), m_triangleCount, m_vertexCount, memString(sizeof(uint32_t) * m_triangleCount * 3 + sizeof(Vertex) * m_vertexCount).c_str(), timer->getMilliseconds()); } diff --git a/src/tests/test_kd.cpp b/src/tests/test_kd.cpp index c28cc3cb..1eb3457f 100644 --- a/src/tests/test_kd.cpp +++ b/src/tests/test_kd.cpp @@ -112,7 +112,7 @@ public: void test02_buildSimple() { Properties bunnyProps("ply"); - bunnyProps.setString("filename", "tools/tests/xyzrgb_statuette.ply"); + bunnyProps.setString("filename", "tools/tests/lucy.ply"); ref mesh = static_cast (PluginManager::getInstance()-> createObject(TriMesh::m_theClass, bunnyProps));