fix build issue

HummaWhite · Oct 7, 2022 · f567d0c · f567d0c
1 parent a57b32a
commit f567d0c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ This is our third project of CIS 565 Fall 2022. In this project, we implemented
 
 ![](./img/photo_realistic.jpg)
 
-<p align="center">"Photoly" realistic!</p>
+<p align="center">A virtual camera is capturing another virtual camera</p>
 
 | Scene Specs             | [[./scenes/pbr_texture.txt]](./scenes/pbr_texture.txt) |
 | ----------------------- | ------------------------------------------------------ |
@@ -27,13 +27,22 @@ This is our third project of CIS 565 Fall 2022. In this project, we implemented
 | Render Time             | < 7 minutes (> 7.5 frames per second)                  |
 | Million Rays Per Second | > 32.4                                                 |
 | Triangle Count          | 25637                                                  |
-| Lighting                | HDR Environment Map                                    |
 
+![](./img/sponza_pano.jpg)
 
+<p align="center">Twisted Sponza rendered with panorama camera</p>
+
+| Scene Specs             |             |
+| ----------------------- | ----------- |
+| Resolution              | 2400 x 1200 |
+| Samples Per Pixel       | 8000        |
+| Render Time             | 38 minutes  |
+| Million Rays Per Second | 10          |
+| Triangle Count          | 262193      |
 
 ![](./img/aperture_custom.jpg)
 
-<p align="center">Star-shaped bokehs</p>
+<p align="center">Lens effect: star-shaped bokehs</p>
 
 
 
@@ -112,7 +121,7 @@ Implementing gamma correction is very trivial. But it is necessary if we want ou
 
 #### Fast Intersection: Stackless SAH-Based Bounding Volume Hierarchy
 
-Ray-scene intersection is probably the best time consuming part of 
+Ray-scene intersection is probably the best time consuming part of of ray tracing process. In a naive method we try to intersect every ray with every object in the scene, which is 
 
 I did two levels of optimization.
 
@@ -144,7 +153,7 @@ In general, it's a tradeoff between thread concurrency and time spent accessing
 
 There is a paper stressing this point, from which I also got the idea to additionally implement a single kernel tracer
 
-- [[Progressive Light Transport Simulation on the GPU: Survey and Improvements]](https://cgg.mff.cuni.cz/~jaroslav/papers/2014-gpult/2014-gpult-paper.pdf)
+- [*Progressive Light Transport Simulation on the GPU: Survey and Improvements*](https://cgg.mff.cuni.cz/~jaroslav/papers/2014-gpult/2014-gpult-paper.pdf)
 
 
 

diff --git a/img/sponza_pano.jpg b/img/sponza_pano.jpg
diff --git a/src/common.h b/src/common.h
@@ -33,4 +33,4 @@ struct Settings {
 
 struct State {
     static bool camChanged;
-};
+};
diff --git a/src/pathtrace.cu b/src/pathtrace.cu
@@ -597,8 +597,6 @@ struct RemoveInvalidPaths {
 	}
 };
 
-static 
-
 void pathTrace(uchar4* pbo, int frame, int iter) {
 	const Camera& cam = hstScene->camera;
 	const int pixelCount = cam.resolution.x * cam.resolution.y;

diff --git a/src/preview.cpp b/src/preview.cpp
@@ -267,7 +267,7 @@ void RenderImGui() {
 			State::camChanged = true;
 		}
 
-		if (ImGui::DragFloat("Apature", &cam.lensRadius, .01f, 0.f, 3.f)) {
+		if (ImGui::DragFloat("Aperture", &cam.lensRadius, .01f, 0.f, 3.f)) {
 			State::camChanged = true;
 		}
 		if (ImGui::DragFloat("Focal", &cam.focalDist, .1f, 0.f, FLT_MAX, "%.1f m")) {