[#88] : Added kd tree implementation based on PBR

ange-yaghi · Sep 3, 2019 · b8ecfbe · b8ecfbe
1 parent 7d9e407
commit b8ecfbe
Show file tree

Hide file tree

Showing 24 changed files with 1,229 additions and 23 deletions.
diff --git a/demos/box_city_demo.cpp b/demos/box_city_demo.cpp
@@ -69,7 +69,11 @@ void manta_demo::boxCityDemo(int samplesPerPixel, int resolutionX, int resolutio
 	octree.initialize(100.0, math::loadVector(0, 0, 0));
 	octree.analyze(&boxCity, 25);
 
-	octree.writeToObjFile("../../workspace/test_results/box_city_octree.obj", nullptr);
+	KDTree kdtree;
+	kdtree.initialize(100.0, math::constants::Zero);
+	kdtree.analyze(&boxCity, 4);
+
+	kdtree.writeToObjFile("../../workspace/test_results/box_city_kdtree.obj");
 
 	std::cout << "Scene vertices/faces: " << boxCity.getVertexCount() << "/" << boxCity.getFaceCount() << std::endl;
 	std::cout << "Octree faces: " << octree.countFaces() << std::endl;
@@ -78,7 +82,7 @@ void manta_demo::boxCityDemo(int samplesPerPixel, int resolutionX, int resolutio
 	constexpr bool useOctree = true;
 
 	SceneObject *boxCityObject = scene.createSceneObject();
-	if (useOctree) boxCityObject->setGeometry(&octree);
+	if (useOctree) boxCityObject->setGeometry(&kdtree);
 	else boxCityObject->setGeometry(&boxCity);
 	boxCityObject->setDefaultMaterial(&wallMaterial);
 
@@ -101,7 +105,7 @@ void manta_demo::boxCityDemo(int samplesPerPixel, int resolutionX, int resolutio
 	math::Vector cameraPos = math::loadVector(15.4473, 4.59977, 13.2961);
 	math::Vector target = math::loadVector(2.63987, 3.55547, 2.42282);
 
-	constexpr bool regularCamera = false;
+	constexpr bool regularCamera = true;
 
 	CameraRayEmitterGroup *group;
 
@@ -192,6 +196,7 @@ void manta_demo::boxCityDemo(int samplesPerPixel, int resolutionX, int resolutio
 	boxCity.destroy();
 	boxCityObj.destroy();
 	octree.destroy();
+	kdtree.destroy();
 
 	std::cout << "Standard allocator memory leaks:     " << StandardAllocator::Global()->getLedger() << ", " << StandardAllocator::Global()->getCurrentUsage() << std::endl;
 }
diff --git a/demos/complex_room_demo.cpp b/demos/complex_room_demo.cpp
@@ -117,13 +117,16 @@ void manta_demo::complexRoomDemo(int samplesPerPixel, int resolutionX, int resol
 	sampleRay.setDirection(dir);
 	sampleRay.setSource(cameraPos);
 
-	Octree stressSpidersOctree;
-	stressSpidersOctree.initialize(32, math::constants::Zero);
-	stressSpidersOctree.analyze(&stressSpiders, 10); //25
-	stressSpidersOctree.writeToObjFile("../../workspace/test_results/complex_room_octree.obj", &sampleRay);
+	//Octree stressSpidersOctree;
+	//stressSpidersOctree.initialize(32, math::constants::Zero);
+	//stressSpidersOctree.analyze(&stressSpiders, 10); //25
 
-	std::cout << "Octree faces: " << stressSpidersOctree.countFaces() << std::endl;
-	std::cout << "Leaf count: " << stressSpidersOctree.countLeaves() << std::endl;
+	KDTree kdtree;
+	kdtree.initialize(100.0, math::constants::Zero);
+	kdtree.analyze(&stressSpiders, 4);
+
+	//std::cout << "Octree faces: " << stressSpidersOctree.countFaces() << std::endl;
+	//std::cout << "Leaf count: " << stressSpidersOctree.countLeaves() << std::endl;
 
 	SpherePrimitive outdoorTopLightGeometry;
 	outdoorTopLightGeometry.setRadius((math::real)10.0);
@@ -139,7 +142,7 @@ void manta_demo::complexRoomDemo(int samplesPerPixel, int resolutionX, int resol
 	// Create scene objects
 	SceneObject *stressSpidersObject = scene.createSceneObject();
 	if (useOctree) {
-		stressSpidersObject->setGeometry(&stressSpidersOctree);
+		stressSpidersObject->setGeometry(&kdtree);
 	}
 	else {
 		stressSpidersObject->setGeometry(&stressSpiders);
@@ -179,6 +182,8 @@ void manta_demo::complexRoomDemo(int samplesPerPixel, int resolutionX, int resol
 	GridSampler sampler;
 	sampler.setGridWidth(3);
 
+	RandomSampler randomSampler;
+
 	if (regularCamera) {
 		StandardCameraRayEmitterGroup *camera = new StandardCameraRayEmitterGroup;
 		//camera->setSamplingWidth(3);
@@ -190,7 +195,7 @@ void manta_demo::complexRoomDemo(int samplesPerPixel, int resolutionX, int resol
 		camera->setResolutionX(resolutionX);
 		camera->setResolutionY(resolutionY);
 		camera->setSampleCount(samplesPerPixel);
-		camera->setSampler(&sampler);
+		camera->setSampler(&randomSampler);
 
 		group = camera;
 	}
@@ -257,8 +262,9 @@ void manta_demo::complexRoomDemo(int samplesPerPixel, int resolutionX, int resol
 	sceneBuffer.destroy();
 	rayTracer.destroy();
 
-	stressSpidersOctree.destroy();
+	//stressSpidersOctree.destroy();
 	stressSpiders.destroy();
+	kdtree.destroy();
 
 	std::cout << "Standard allocator memory leaks:     " << StandardAllocator::Global()->getLedger() << ", " << StandardAllocator::Global()->getCurrentUsage() << std::endl;
 }
diff --git a/demos/demos.h b/demos/demos.h
@@ -34,6 +34,7 @@
 #include <random_sampler.h>
 #include <simple_sampler.h>
 #include <standard_camera_ray_emitter_group.h>
+#include <kd_tree.h>
 
 namespace manta_demo {
 

diff --git a/demos/main.cpp b/demos/main.cpp
@@ -3,13 +3,13 @@
 using namespace manta_demo;
 
 int main() {
-	//complexRoomDemo(1, 1024 * 2, 768 * 2);
+	//complexRoomDemo(1000, 1024 * 2, 768 * 2);
 	//penDemo(500, 1024 * 2, 768 * 2);
-	//stressSpidersDemo(1, 1024 * 2, 768 * 2); // 871 samples
+	stressSpidersDemo(1, 1024 * 2, 768 * 2); // 871 samples
 	//simpleRoomDemo(1, 1024*2, 768*2); //1024, 768
-	//boxCityDemo(1, 1024*2, 768*2);
+	//boxCityDemo(100, 1024*2, 768*2);
 	//teapotDemo(1, 500, 500);
-	teapotLampDemo(100, 1024*2, 768*2); // 10 for issue replication 1024, 768
+	//teapotLampDemo(2000, 1024*2, 768*2); // 10 for issue replication 1024, 768
 	//cubeTestDemo(1, 1024, 768);
 	//blocksDemo(40, 1024 * 2, 768 * 2); // 10 for issue replication 1024, 768
 

diff --git a/demos/pen_demo.cpp b/demos/pen_demo.cpp
@@ -79,6 +79,10 @@ void manta_demo::penDemo(int samplesPerPixel, int resolutionX, int resolutionY)
 	penOctree.analyze(&pen, 25);
 	penOctree.writeToObjFile("../../workspace/test_results/pen_octree.obj", nullptr);
 
+	KDTree kdtree;
+	kdtree.initialize(150, math::constants::Zero);
+	kdtree.analyze(&pen, 4);
+
 	math::real lightRadius = 10.0;
 
 	SpherePrimitive light1Geometry;
@@ -102,7 +106,7 @@ void manta_demo::penDemo(int samplesPerPixel, int resolutionX, int resolutionY)
 	// Create scene objects
 	SceneObject *penObject = scene.createSceneObject();
 	if (useOctree) {
-		penObject->setGeometry(&penOctree);
+		penObject->setGeometry(&kdtree);
 	}
 	else {
 		penObject->setGeometry(&pen);
@@ -237,6 +241,7 @@ void manta_demo::penDemo(int samplesPerPixel, int resolutionX, int resolutionY)
 	pen.destroy();
 
 	penOctree.destroy();
+	kdtree.destroy();
 
 	std::cout << "Standard allocator memory leaks:     " << StandardAllocator::Global()->getLedger() << ", " << StandardAllocator::Global()->getCurrentUsage() << std::endl;
 }
diff --git a/demos/stress_spiders.cpp b/demos/stress_spiders.cpp
@@ -49,6 +49,10 @@ void manta_demo::stressSpidersDemo(int samplesPerPixel, int resolutionX, int res
 	stressSpidersOctree.analyze(&stressSpiders, 25);
 	//stressSpidersOctree.writeToObjFile("../../workspace/test_results/stress_spiders_octree.obj", nullptr);
 
+	KDTree kdtree;
+	kdtree.initialize(32.0, math::constants::Zero);
+	kdtree.analyze(&stressSpiders, 4);
+
 	SpherePrimitive outdoorTopLightGeometry;
 	outdoorTopLightGeometry.setRadius((math::real)10.0);
 	//outdoorTopLightGeometry.setRadius((math::real)20.0);
@@ -63,7 +67,7 @@ void manta_demo::stressSpidersDemo(int samplesPerPixel, int resolutionX, int res
 	// Create scene objects
 	SceneObject *stressSpidersObject = scene.createSceneObject();
 	if (useOctree) {
-		stressSpidersObject->setGeometry(&stressSpidersOctree);
+		stressSpidersObject->setGeometry(&kdtree);
 	}
 	else {
 		stressSpidersObject->setGeometry(&stressSpiders);
@@ -90,7 +94,7 @@ void manta_demo::stressSpidersDemo(int samplesPerPixel, int resolutionX, int res
 	up = math::normalize(up);
 
 	// Create the camera
-	constexpr bool regularCamera = false;
+	constexpr bool regularCamera = true;
 	CameraRayEmitterGroup *group;
 	manta::SimpleLens lens;
 	lens.initialize();
@@ -184,6 +188,7 @@ void manta_demo::stressSpidersDemo(int samplesPerPixel, int resolutionX, int res
 
 	stressSpidersOctree.destroy();
 	stressSpiders.destroy();
+	kdtree.destroy();
 
 	std::cout << "Standard allocator memory leaks:     " << StandardAllocator::Global()->getLedger() << ", " << StandardAllocator::Global()->getCurrentUsage() << std::endl;
 }
diff --git a/demos/teapot_lamp_demo.cpp b/demos/teapot_lamp_demo.cpp
@@ -76,6 +76,10 @@ void manta_demo::teapotLampDemo(int samplesPerPixel, int resolutionX, int resolu
 	teapotOctree.analyze(&teapot, 25);
 	//teapotOctree.writeToObjFile("../../workspace/test_results/teapot_lamp_octree.obj", nullptr);
 
+	KDTree kdtree;
+	kdtree.initialize(4.0, math::constants::Zero);
+	kdtree.analyze(&teapot, 4);
+
 	SpherePrimitive bulb;
 	bulb.setRadius(0.25);
 	bulb.setPosition(math::loadVector(0.10669, 3.42135, -2.47464));
@@ -108,7 +112,7 @@ void manta_demo::teapotLampDemo(int samplesPerPixel, int resolutionX, int resolu
 
 	SceneObject *teapotObject = scene.createSceneObject();
 	if (useOctree) {
-		teapotObject->setGeometry(&teapotOctree);
+		teapotObject->setGeometry(&kdtree);
 	}
 	else {
 		teapotObject->setGeometry(&teapot);
@@ -164,7 +168,7 @@ void manta_demo::teapotLampDemo(int samplesPerPixel, int resolutionX, int resolu
 	// Leaks
 	//rayTracer.tracePixel(1281, 900, &scene, &camera);
 	//rayTracer.tracePixel(1456, 1230, &scene, &camera);
-	//rayTracer.tracePixel(616, 1459, &scene, &camera);
+	//rayTracer.tracePixel(1160, 1017, &scene, &camera);
 
 	rayTracer.traceAll(&scene, &camera);
 
@@ -197,6 +201,7 @@ void manta_demo::teapotLampDemo(int samplesPerPixel, int resolutionX, int resolu
 	teapot.destroy();
 	teapotObj.destroy();
 	teapotOctree.destroy();
+	kdtree.destroy();
 
 	std::cout << "Standard allocator memory leaks:     " << StandardAllocator::Global()->getLedger() << ", " << StandardAllocator::Global()->getCurrentUsage() << std::endl;
 }