bug fix + GBuffer preivew

Author: HummaWhite

src/common.cpp

@@ -4,5 +4,6 @@ int Settings::traceDepth = 0;
 int Settings::toneMapping = ToneMapping::ACES;
 int Settings::tracer = Tracer::Streamed;
 bool Settings::sortMaterial = false;
+int Settings::GBufferPreviewOpt = 0;
 
 bool State::camChanged = true;

src/common.h

@@ -20,7 +20,7 @@ struct ToneMapping {
 
 struct Tracer {
     enum {
-        Streamed = 0, SingleKernel = 1, BVHVisualize = 2
+        Streamed = 0, SingleKernel = 1, BVHVisualize = 2, GBufferPreview = 3
     };
 };
 
@@ -29,6 +29,7 @@ struct Settings {
     static int toneMapping;
     static int tracer;
     static bool sortMaterial;
+    static int GBufferPreviewOpt;
 };
 
 struct State {

src/pathtrace.cu

@@ -70,6 +70,9 @@ static thrust::device_ptr<PathSegment> devTerminatedPathsThr;
 static thrust::device_ptr<Intersection> devIntersectionsThr;
 static thrust::device_ptr<int> devIntersecMatKeysThr;
 static thrust::device_ptr<int> devSegmentMatKeysThr;
+
+static glm::vec3* devGBufferPos = nullptr;
+static glm::vec3* devGBufferNorm = nullptr;
 
 void InitDataContainer(GuiDataContainer* imGuiData) {
 	guiData = imGuiData;
@@ -156,6 +159,35 @@ __global__ void generateRayFromCamera(Camera cam, int iter, int traceDepth, Path
 	}
 }
 
+__global__ void previewGBuffer(
+	int iter, 
+	DevScene* scene, Camera cam, 
+	glm::vec3* image, int width, int height,
+	int kind
+) {
+	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->intersect(ray, intersec);
+
+	if (kind == 0) {
+		image[index] += intersec.pos;
+	}
+	else if (kind == 1) {
+		image[index] += (intersec.norm + 1.f) * .5f;
+	}
+	else if (kind == 2) {
+		image[index] += glm::vec3(intersec.uv, 1.f);
+	}
+}
+
 // computeIntersections handles generating ray intersections ONLY.
 // Generating new rays is handled in your shader(s).
 // Feel free to modify the code below.
@@ -244,10 +276,7 @@ __global__ void pathIntegSampleSurface(
 	PathSegment& segment = segments[idx];
 	thrust::default_random_engine rng = makeSeededRandomEngine(iter, idx, 4 + depth * SamplesConsumedOneIter);
 
-	Material material = scene->devMaterials[intersec.matId];
-	if (material.baseColorMapId > NullTextureId) {
-		material.baseColor = scene->devTextureObjs->linearSample(intersec.uv);
-	}
+	Material material = scene->getMaterialWithTexture(intersec);
 
 	glm::vec3 accRadiance(0.f);
 
@@ -339,24 +368,20 @@ __global__ void singleKernelPT(
 	thrust::default_random_engine rng = makeSeededRandomEngine(iter, index, 0);
 
 	Ray ray = sampleCamera(cam, x, y, sample4D(rng));
-
 	Intersection intersec;
 	scene->intersect(ray, intersec);
 
 	if (intersec.primId == NullPrimitive) {
 		goto WriteRadiance;
 	}
 
-	Material material = scene->devMaterials[intersec.matId];
+	Material material = scene->getMaterialWithTexture(intersec);
+
 	if (material.type == Material::Type::Light) {
 		accRadiance = material.baseColor * material.emittance;
 		goto WriteRadiance;
 	}
 
-	if (material.baseColorMapId > NullTextureId) {
-		material.baseColor = scene->devTextureObjs->linearSample(intersec.uv);
-	}
-
 	glm::vec3 throughput(1.f);
 	intersec.wo = -ray.direction;
 
@@ -400,7 +425,7 @@ __global__ void singleKernelPT(
 		if (intersec.primId == NullPrimitive) {
 			break;
 		}
-		material = scene->devMaterials[intersec.matId];
+		material = scene->getMaterialWithTexture(intersec);
 
 		if (material.type == Material::Type::Light) {
 #if SCENE_LIGHT_SINGLE_SIDED
@@ -547,10 +572,15 @@ void pathTrace(uchar4* pbo, int frame, int iter) {
 			singleKernelPT<<<singlePTBlockNum, singlePTBlockSize>>>(
 				iter, Settings::traceDepth, hstScene->devScene, cam, devImage, cam.resolution.x, cam.resolution.y);
 		}
-		else {
+		else if (Settings::tracer == Tracer::BVHVisualize) {
 			BVHVisualize<<<singlePTBlockNum, singlePTBlockSize>>>(
 				iter, hstScene->devScene, cam, devImage, cam.resolution.x, cam.resolution.y);
 		}
+		else {
+			previewGBuffer<<<singlePTBlockNum, singlePTBlockSize>>>(
+				iter, hstScene->devScene, cam, devImage, cam.resolution.x, cam.resolution.y,
+				Settings::GBufferPreviewOpt);
+		}
 
 		if (guiData != nullptr) {
 			guiData->TracedDepth = Settings::traceDepth;

src/preview.cpp

@@ -211,22 +211,36 @@ void RenderImGui()
 	static float f = 0.0f;
 	static int counter = 0;
 
-	ImGui::Begin("Path Tracer Analytics"); {
+	
+
+	ImGui::Begin("Path Tracer Analytics", nullptr,
+		ImGuiWindowFlags_NoMove |
+		ImGuiWindowFlags_NoDecoration |
+		ImGuiWindowFlags_AlwaysAutoResize |
+		ImGuiWindowFlags_NoSavedSettings |
+		ImGuiWindowFlags_NoFocusOnAppearing |
+		ImGuiWindowFlags_NoNav); {
 		ImGui::Text("Traced Depth %d", imguiData->TracedDepth);
 		ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate);
 
 		ImGui::End();
 	}
 
 	ImGui::Begin("Options"); {
-		const char* Tracers[] = { "Streamed", "Single Kernel", "BVH Visualize" };
+		const char* Tracers[] = { "Streamed", "Single Kernel", "BVH Visualize", "GBuffer Preview" };
 		if (ImGui::Combo("Tracer", &Settings::tracer, Tracers, IM_ARRAYSIZE(Tracers))) {
 			State::camChanged = true;
 		}
 
 		if (Settings::tracer == Tracer::Streamed) {
 			ImGui::Checkbox("Sort Material", &Settings::sortMaterial);
 		}
+		else if (Settings::tracer == Tracer::GBufferPreview) {
+			const char* Modes[] = { "Position", "Normal", "Texcoord" };
+			if (ImGui::Combo("Mode", &Settings::GBufferPreviewOpt, Modes, IM_ARRAYSIZE(Modes))) {
+				State::camChanged = true;
+			}
+		}
 
 		if (ImGui::InputInt("Max Depth", &Settings::traceDepth, 1, 1)) {
 			State::camChanged = true;

src/scene.h

@@ -64,6 +64,14 @@ struct DevScene {
     void create(const Scene& scene);
     void destroy();
 
+    __device__ Material getMaterialWithTexture(const Intersection& intersec) {
+        Material mat = devMaterials[intersec.matId];
+        if (mat.baseColorMapId > NullTextureId) {
+            mat.baseColor = devTextureObjs[mat.baseColorMapId].linearSample(intersec.uv);
+        }
+        return mat;
+    }
+
     __device__ int getMTBVHId(glm::vec3 dir) {
         glm::vec3 absDir = glm::abs(dir);
         if (absDir.x > absDir.y) {