BVH visualizer

Author: HummaWhite

src/common.cpp

@@ -2,8 +2,7 @@
 
 int Settings::traceDepth = 0;
 int Settings::toneMapping = ToneMapping::ACES;
-bool Settings::visualizeBVH = false;
+int Settings::tracer = Tracer::Streamed;
 bool Settings::sortMaterial = false;
-bool Settings::singleKernel = false;
 
 bool State::camChanged = true;

src/common.h

@@ -8,7 +8,6 @@
 
 #define SCENE_LIGHT_SINGLE_SIDED true
 
-#define BVH_DEBUG_VISUALIZATION false
 #define BVH_DISABLE false
 
 #define ENABLE_GBUFFER false
@@ -19,12 +18,17 @@ struct ToneMapping {
     };
 };
 
+struct Tracer {
+    enum {
+        Streamed = 0, SingleKernel = 1, BVHVisualize = 2
+    };
+};
+
 struct Settings {
     static int traceDepth;
     static int toneMapping;
-    static bool visualizeBVH;
+    static int tracer;
     static bool sortMaterial;
-    static bool singleKernel;
 };
 
 struct State {

src/main.cpp

@@ -232,6 +232,8 @@ void runCuda() {
 }
 
 void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods) {
+	Camera& cam = renderState->camera;
+
 	if (action == GLFW_PRESS) {
 		switch (key) {
 		case GLFW_KEY_ESCAPE:
@@ -244,19 +246,29 @@ void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods
 		case GLFW_KEY_T:
 			Settings::toneMapping = (Settings::toneMapping + 1) % 3;
 			break;
+		case GLFW_KEY_LEFT_SHIFT:
+			cam.position += glm::vec3(0.f, -.1f, 0.f);
+			break;
 		case GLFW_KEY_SPACE:
-			State::camChanged = true;
+			cam.position += glm::vec3(0.f, .1f, 0.f);
+			break;
+		case GLFW_KEY_R:
 			renderState = &scene->state;
-			Camera& cam = renderState->camera;
 			cam.lookAt = ogLookAt;
+			State::camChanged = true;
 			break;
 		}
 	}
 }
 
+void mouseScrollCallback(GLFWwindow* window, double offsetX, double offsetY) {
+	zoom -= offsetY;
+	zoom = std::fmax(0.1f, zoom);
+	State::camChanged = true;
+}
+
 void mouseButtonCallback(GLFWwindow* window, int button, int action, int mods) {
-	if (MouseOverImGuiWindow())
-	{
+	if (MouseOverImGuiWindow()) {
 		return;
 	}
 	leftMousePressed = (button == GLFW_MOUSE_BUTTON_LEFT && action == GLFW_PRESS);
@@ -265,7 +277,12 @@ void mouseButtonCallback(GLFWwindow* window, int button, int action, int mods) {
 }
 
 void mousePositionCallback(GLFWwindow* window, double xpos, double ypos) {
-	if (xpos == lastX || ypos == lastY) return; // otherwise, clicking back into window causes re-start
+	Camera& cam = renderState->camera;
+
+	if (xpos == lastX || ypos == lastY) {
+		return; // otherwise, clicking back into window causes re-start
+	}
+
 	if (leftMousePressed) {
 		// compute new camera parameters
 		phi -= (xpos - lastX) / width;
@@ -274,13 +291,13 @@ void mousePositionCallback(GLFWwindow* window, double xpos, double ypos) {
 		State::camChanged = true;
 	}
 	else if (rightMousePressed) {
-		zoom += (ypos - lastY) / height;
-		zoom = std::fmax(0.1f, zoom);
+		float dy = (ypos - lastY) / height;
+		cam.position.y += dy;
+		cam.lookAt.y += dy;
 		State::camChanged = true;
 	}
 	else if (middleMousePressed) {
 		renderState = &scene->state;
-		Camera& cam = renderState->camera;
 		glm::vec3 forward = cam.view;
 		forward.y = 0.0f;
 		forward = glm::normalize(forward);

src/main.h

@@ -33,5 +33,6 @@ extern int height;
 
 void runCuda();
 void keyCallback(GLFWwindow *window, int key, int scancode, int action, int mods);
+void mouseScrollCallback(GLFWwindow* window, double offsetX, double offsetY);
 void mousePositionCallback(GLFWwindow* window, double xpos, double ypos);
 void mouseButtonCallback(GLFWwindow* window, int button, int action, int mods);

src/material.h

@@ -115,12 +115,6 @@ struct Material {
         Light
     };
 
-    std::string toString() const {
-        std::stringstream ss;
-        ss << "[Type = " << type << ", BaseColor = " << vec3ToString(baseColor) << "]";
-        return ss.str();
-    }
-
     __device__ glm::vec3 lambertianBSDF(glm::vec3 n, glm::vec3 wo, glm::vec3 wi) {
         return baseColor * PiInv;
     }
@@ -263,5 +257,6 @@ struct Material {
     float ior;
     float emittance;
 
-    int textureId;
+    int baseColorMapId;
+    int normalMapId;
 };

src/pathtrace.cu

@@ -241,19 +241,6 @@ __global__ void pathIntegSampleSurface(
 		return;
 	}
 
-#if BVH_DEBUG_VISUALIZATION
-	float logDepth = 0.f;
-	int size = scene->BVHSize;
-	while (size) {
-		logDepth += 1.f;
-		size >>= 1;
-	}
-	segment.radiance = glm::vec3(float(intersec.primId) / logDepth * .1f);
-	//segment.radiance = intersec.primitive > 16 ? glm::vec3(1.f) : glm::vec3(0.f);
-	segment.remainingBounces = 0;
-	return;
-#endif
-
 	PathSegment& segment = segments[idx];
 	thrust::default_random_engine rng = makeSeededRandomEngine(iter, idx, 4 + depth * SamplesConsumedOneIter);
 
@@ -430,6 +417,29 @@ WriteRadiance:
 	image[index] += accRadiance;
 }
 
+__global__ void BVHVisualize(int iter, DevScene* scene, Camera cam, glm::vec3* image, int width, int height) {
+	int x = blockDim.x * blockIdx.x + threadIdx.x;
+	int y = blockDim.y * blockIdx.y + threadIdx.y;
+	if (x >= width || y >= height) {
+		return;
+	}
+	int index = y * width + x;
+
+	thrust::default_random_engine rng = makeSeededRandomEngine(iter, index, 0);
+	Ray ray = sampleCamera(cam, x, y, sample4D(rng));
+
+	Intersection intersec;
+	scene->visualizedIntersect(ray, intersec);
+
+	float logDepth = 0.f;
+	int size = scene->BVHSize;
+	while (size) {
+		logDepth += 1.f;
+		size >>= 1;
+	}
+	image[index] += glm::vec3(float(intersec.primId) / logDepth * .1f);
+}
+
 struct CompactTerminatedPaths {
 	__host__ __device__ bool operator() (const PathSegment& segment) {
 		return !(segment.pixelIndex >= 0 && segment.remainingBounces <= 0);
@@ -465,22 +475,7 @@ void pathTrace(uchar4* pbo, int frame, int iter) {
 
 	auto devTerminatedThr = devTerminatedPathsThr;
 
-	if (Settings::singleKernel) {
-		const int BlockSizeSinglePTX = 8;
-		const int BlockSizeSinglePTY = 8;
-		int blockNumSinglePTX = (cam.resolution.x + BlockSizeSinglePTX - 1) / BlockSizeSinglePTX;
-		int blockNumSinglePTY = (cam.resolution.y + BlockSizeSinglePTY - 1) / BlockSizeSinglePTY;
-
-		dim3 singlePTBlockNum(blockNumSinglePTX, blockNumSinglePTY);
-		dim3 singlePTBlockSize(BlockSizeSinglePTX, BlockSizeSinglePTY);
-
-		singleKernelPT<<<singlePTBlockNum, singlePTBlockSize>>>(
-			iter, Settings::traceDepth, hstScene->devScene, cam, devImage, cam.resolution.x, cam.resolution.y);
-		if (guiData != nullptr) {
-			guiData->TracedDepth = Settings::traceDepth;
-		}
-	}
-	else {
+	if (Settings::tracer == Tracer::Streamed) {
 		bool iterationComplete = false;
 		while (!iterationComplete) {
 			// clean shading chunks
@@ -531,6 +526,28 @@ void pathTrace(uchar4* pbo, int frame, int iter) {
 		int numContributing = devTerminatedThr.get() - devTerminatedPaths;
 		finalGather<<<numBlocksPixels, BlockSizeGather>>>(numContributing, devImage, devTerminatedPaths);
 	}
+	else {
+		const int BlockSizeSinglePTX = 8;
+		const int BlockSizeSinglePTY = 8;
+		int blockNumSinglePTX = (cam.resolution.x + BlockSizeSinglePTX - 1) / BlockSizeSinglePTX;
+		int blockNumSinglePTY = (cam.resolution.y + BlockSizeSinglePTY - 1) / BlockSizeSinglePTY;
+
+		dim3 singlePTBlockNum(blockNumSinglePTX, blockNumSinglePTY);
+		dim3 singlePTBlockSize(BlockSizeSinglePTX, BlockSizeSinglePTY);
+
+		if (Settings::tracer == Tracer::SingleKernel) {
+			singleKernelPT<<<singlePTBlockNum, singlePTBlockSize>>>(
+				iter, Settings::traceDepth, hstScene->devScene, cam, devImage, cam.resolution.x, cam.resolution.y);
+		}
+		else {
+			BVHVisualize<<<singlePTBlockNum, singlePTBlockSize>>>(
+				iter, hstScene->devScene, cam, devImage, cam.resolution.x, cam.resolution.y);
+		}
+
+		if (guiData != nullptr) {
+			guiData->TracedDepth = Settings::traceDepth;
+		}
+	}
 
 	// Send results to OpenGL buffer for rendering
 	sendImageToPBO<<<blocksPerGrid2D, blockSize2D>>>(pbo, cam.resolution, iter, devImage, Settings::toneMapping);

src/preview.cpp

@@ -152,6 +152,7 @@ bool init() {
 	}
 	glfwMakeContextCurrent(window);
 	glfwSetKeyCallback(window, keyCallback);
+	glfwSetScrollCallback(window, mouseScrollCallback);
 	glfwSetCursorPosCallback(window, mousePositionCallback);
 	glfwSetMouseButtonCallback(window, mouseButtonCallback);
 
@@ -218,10 +219,12 @@ void RenderImGui()
 	}
 
 	ImGui::Begin("Options"); {
-		if (ImGui::Checkbox("Single Kernel PT", &Settings::singleKernel)) {
+		const char* Tracers[] = { "Streamed", "Single Kernel", "BVH Visualize" };
+		if (ImGui::Combo("Tracer", &Settings::tracer, Tracers, IM_ARRAYSIZE(Tracers))) {
 			State::camChanged = true;
 		}
-		if (!Settings::singleKernel) {
+
+		if (Settings::tracer == Tracer::Streamed) {
 			ImGui::Checkbox("Sort Material", &Settings::sortMaterial);
 		}
 

src/sceneStructs.h

@@ -50,8 +50,6 @@ struct RenderState {
     std::string imageName;
 };
 
-struct Material;
-
 struct Intersection {
     __device__ Intersection() {}