isHit

10 files changed, 80 insertions, 88 deletions

diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps
index 21634dc..a6a1e24 100644
--- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps
+++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps
diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log
index 3faae9c..bd56bf5 100644
--- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log
+++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log
@@ -1,70 +1,40 @@
 # ninja log v5
-570	2822	1702407711632035553	CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o	b6caa8722c5ed85
-573	4016	1702407712821644379	CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o	ad7df583a7d505ab
-3	705	1702426907449972675	build.ninja	d13bedc3f8269e08
-572	2547	1702407711344081088	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	aea38d6800d3e2d7
-573	3074	1702407711885801922	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	f97c011acc078586
-571	1470	1702407710278443335	CMakeFiles/projects_ray.dir/src/settings.cpp.o	c1f79a20c0ecbe57
-571	1608	1702407710420095782	CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o	94ae54642a1d948f
-10	1893	1702426905565538000	projects_ray_autogen/timestamp	596afd61accb21ff
-2822	3986	1702407712802951559	CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o	972643ee76ef36e3
-575	2498	1702407711303771399	CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o	3f60bdf8eba19b08
-10	1893	1702426905565538000	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-578	2618	1702407711432574124	CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o	c5109dc5ea714408
-1471	3282	1702407712076609204	CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o	3b9d0580f53ea69c
-2547	3943	1702407712749457526	CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o	992faa973485d8a9
-576	2569	1702407711374821349	CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o	e75c5f32d37c0f7
-3119	3963	1702407712781659395	CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o	7ae83c7dbbb3069c
-571	3139	1702407711916330811	CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o	e9399ac69b3cfe3a
-2615	4010	1702407712827626100	CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o	57e5e91a0ccd956b
-3139	3280	1702407712091261113	CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o	202455a136d96772
-2618	4592	1702407713408700093	CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o	edd9793557117a52
-572	3119	1702407711928283544	CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o	e6850a1ba68767f
-10	1893	1702426905565538000	/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp	596afd61accb21ff
-3074	3697	1702407712511905881	CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o	91511fc09b29247f
-570	3463	1702407712265176470	CMakeFiles/projects_ray.dir/src/main.cpp.o	5dc8b318e78f1fc9
-10	1893	1702426905565538000	/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-2498	3792	1702407712610244467	CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o	6509507adff024b9
-1608	3334	1702407712130018946	CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o	494cb10eb691f3da
-574	2615	1702407711422075540	CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o	c5c01b155b8ee7bd
-4592	4767	1702407713585611623	projects_ray	86189a8842e154ef
-2570	3792	1702407712609266645	CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o	61d667b82582b0f6
-571	3787	1702407712592074307	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	70260dd9342207e1
+1484	12750	1702437994891327411	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	efa4d0ee111c147a
+203	6979	1702438028312746215	CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o	81fffec8aaaec0bd
+18792	19258	1702436923000043494	projects_ray	a842e040bf3d79e9
+1486	9931	1702437992051961911	CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o	4731cafbc4b4e737
+1489	9355	1702437991439556087	CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o	35a3ae2d0b82dd65
+5788	11862	1702437994004175205	CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o	d10c1da10eac29ed
+26	145	1702438056908973024	/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+1484	12104	1702437994243514916	CMakeFiles/projects_ray.dir/src/main.cpp.o	987044590434d8d1
+1485	10986	1702437993119235750	CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o	aaa2fe512335b7de
+10142	18791	1702436922530914999	CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o	28d12937d9255fcc
+1484	11377	1702437993516976462	CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o	6c6dd3bd167ac5ff
+214	1827	1702438023164593077	CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o	9cafd52c1d615711
+10169	16165	1702436919904219783	CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o	2ac5d1ff96197a9
+212	6966	1702438028296819717	CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o	936dea6b1a330a9e
+202	7093	1702438028423383766	CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o	98378b8788da3ce3
+9355	13467	1702437995616277549	CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o	bc288befd0c32eb0
+1488	9511	1702437991607738144	CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o	d622514f4a212179
+1487	9795	1702437991917600812	CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o	d3d7e9f0c176bf47
+1487	9753	1702437991878125090	CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o	e72528d54abad0c9
+26	145	1702438056908973024	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+157	3269	1702438060015416297	CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o	a0b7647ef5416d35
+26	145	1702438056908973024	projects_ray_autogen/timestamp	596afd61accb21ff
+210	4992	1702438026322474909	CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o	176379e1dc38d565
+26	145	1702438056908973024	/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp	596afd61accb21ff
+1484	5788	1702437987924913770	CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o	5f7d45d0b689d9f7
 30	4810	1702436908526689249	CMakeFiles/projects_ray.dir/src/settings.cpp.o	73db81265aa9dd0e
-30	5817	1702436909550443532	CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o	5f7d45d0b689d9f7
-33	9810	1702436913540041865	CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o	d622514f4a212179
-31	10058	1702436913766491952	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	2ea2e8e07c7b357b
-32	10141	1702436913835633843	CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o	98378b8788da3ce3
-33	10146	1702436913841042373	CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o	d3d7e9f0c176bf47
-32	10169	1702436913883468799	CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o	e72528d54abad0c9
-29	10842	1702436914552288493	CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o	21ccedb02e7f6f6a
-30	11592	1702436915318935849	CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o	aaa2fe512335b7de
-31	11806	1702436915537205127	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
-29	12183	1702436915903069699	CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o	6c6dd3bd167ac5ff
-4811	12810	1702436916546151977	CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o	35a3ae2d0b82dd65
-12184	13074	1702436916819222993	CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o	9cafd52c1d615711
-5820	13487	1702436917214048084	CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o	d10c1da10eac29ed
-29	13767	1702436917491853223	CMakeFiles/projects_ray.dir/src/main.cpp.o	987044590434d8d1
-10843	14580	1702436918318275707	CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o	176379e1dc38d565
-30	15032	1702436918759922064	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	efa4d0ee111c147a
-10058	15603	1702436919341306256	CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o	81fffec8aaaec0bd
+1485	11170	1702437993311057366	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
+1486	9632	1702437991764208611	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	2ea2e8e07c7b357b
+3	705	1702426907449972675	build.ninja	d13bedc3f8269e08
 31	15657	1702436919389749105	CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o	4d14ff80692ac6b3
-9812	15917	1702436919658855047	CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o	bc288befd0c32eb0
-10146	16081	1702436919820616665	CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o	a0b7647ef5416d35
-10169	16165	1702436919904219783	CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o	2ac5d1ff96197a9
-11806	16306	1702436920043666926	CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o	936dea6b1a330a9e
-11593	16354	1702436920097351099	CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o	4731cafbc4b4e737
-10142	18791	1702436922530914999	CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o	28d12937d9255fcc
-18792	19258	1702436923000043494	projects_ray	a842e040bf3d79e9
-26	142	1702436985663138165	projects_ray_autogen/timestamp	596afd61accb21ff
-26	142	1702436985663138165	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-26	142	1702436985663138165	/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp	596afd61accb21ff
-26	142	1702436985663138165	/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-25	152	1702437151194183164	projects_ray_autogen/timestamp	596afd61accb21ff
-25	152	1702437151194183164	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-25	152	1702437151194183164	/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp	596afd61accb21ff
-25	152	1702437151194183164	/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-25	136	1702437168004101365	projects_ray_autogen/timestamp	596afd61accb21ff
-25	136	1702437168004101365	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-25	136	1702437168004101365	/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp	596afd61accb21ff
-25	136	1702437168004101365	/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+1483	10361	1702437992483474640	CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o	21ccedb02e7f6f6a
+29	200	1702438135246005667	projects_ray_autogen/timestamp	596afd61accb21ff
+29	200	1702438135246005667	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+29	200	1702438135246005667	/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp	596afd61accb21ff
+29	200	1702438135246005667	/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+226	842	1702438135883410599	CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o	9cafd52c1d615711
+224	3425	1702438138460991663	CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o	2ac5d1ff96197a9
+221	5617	1702438140650444449	CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o	28d12937d9255fcc
+5617	6095	1702438141126305331	projects_ray	a842e040bf3d79e9
diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt
index b4cfa41..cfe391e 100644
--- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt
+++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt
@@ -1,7 +1,10 @@
 # Generated by CMake. Changes will be overwritten.
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/kdtree.h
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/illuminate/reflect.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/settings.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/kdtree.h
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/aliasing/supersample.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/settings.h
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracer.h
@@ -932,7 +935,6 @@
  mdp:/Users/lafayette_bussey/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h
  mdp:/Users/lafayette_bussey/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h
  mdp:/Users/lafayette_bussey/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/mainwindow.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/aliasing/supersample.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/mainwindow.h
@@ -1887,8 +1889,6 @@
  mdp:/Users/daviddoan/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h
  mdp:/Users/daviddoan/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h
  mdp:/Users/daviddoan/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/illuminate/reflect.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h
@@ -10914,6 +10914,6 @@
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/texture/texture.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/settings.h
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/settings.cpp
diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray
index 3c8936a..452a965 100755
--- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray
+++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray
diff --git a/src/accelerate/bvh.cpp b/src/accelerate/bvh.cpp
index 19f9390..2949cbe 100644
--- a/src/accelerate/bvh.cpp
+++ b/src/accelerate/bvh.cpp
@@ -114,8 +114,8 @@ float RayTracer::traverseBVH(
             for (const auto &shape: current.shapes) {
                 glm::vec4 pObject = shape.shape.inverseCTM * p;
                 glm::vec4 dObject = glm::normalize(shape.shape.inverseCTM * d);
-
-                glm::vec4 intersection = findIntersection(pObject, dObject, shape.shape);
+                bool isHit = false;
+                glm::vec4 intersection = findIntersection(pObject, dObject, shape.shape, isHit);
                 if (intersection.w == 0.f) {
                     continue;
                 }
@@ -148,4 +148,4 @@ float RayTracer::traverseBVH(
     }
 
     return minT;
-}
\ No newline at end of file
+}
diff --git a/src/accelerate/kdtree.cpp b/src/accelerate/kdtree.cpp
index 4156c98..f025b0a 100644
--- a/src/accelerate/kdtree.cpp
+++ b/src/accelerate/kdtree.cpp
@@ -218,8 +218,8 @@ float RayTracer::traverse(
         for (const auto &shape: tree->shapesWithinBounds) {
             glm::vec4 pObject = shape.shape.inverseCTM * p;
             glm::vec4 dObject = glm::normalize(shape.shape.inverseCTM * d);
-
-            glm::vec4 intersection = findIntersection(pObject, dObject, shape.shape);
+            bool isHit = false;
+            glm::vec4 intersection = findIntersection(pObject, dObject, shape.shape, isHit);
             if (intersection.w == 0.f) {
                 continue;
             }
@@ -270,4 +270,4 @@ float RayTracer::traverse(
         }
         return traverse(p, d, t, tEnd, testShape, tree->rightChild);
     }
-}
\ No newline at end of file
+}
diff --git a/src/accelerate/myqtconcurrent.cpp b/src/accelerate/myqtconcurrent.cpp
index 1e95436..7bfc879 100644
--- a/src/accelerate/myqtconcurrent.cpp
+++ b/src/accelerate/myqtconcurrent.cpp
@@ -50,7 +50,7 @@ void RayTracer::renderParallel(RGBA *imageData, const RayTraceScene &scene)
                 float camera4dDepth = 1;
 
                 glm::vec4 pWorld = Vec4Ops::transformPoint4(glm::vec4(0.f), camera.getViewMatrix(), camera.getTranslationVector());
-                glm::vec4 dWorld = Vec4Ops::transformVector4(glm::vec4(x, y, z, cameraDepth), camera.getViewMatrix());
+                glm::vec4 dWorld = Vec4Ops::transformDir4(glm::vec4(x, y, z, cameraDepth), camera.getViewMatrix());
 
                 // get the pixel color
                 glm::vec4 pixelColor = getPixelFromRay(pWorld, dWorld, scene, 0);
diff --git a/src/illuminate/shadow.cpp b/src/illuminate/shadow.cpp
index efb52a7..6057637 100644
--- a/src/illuminate/shadow.cpp
+++ b/src/illuminate/shadow.cpp
@@ -26,7 +26,8 @@ bool RayTracer::isShadowed(
         glm::vec4 pObject = s.inverseCTM * intersectionWorld;
 
         // see if there is an intersection
-        glm::vec4 newIntersectionObj = findIntersection(pObject, dObject, s);
+        bool isHit = false;
+        glm::vec4 newIntersectionObj = findIntersection(pObject, dObject, s, isHit);
 
         if (newIntersectionObj.w == 1.f) // hit!
         {
diff --git a/src/intersect/intersect.cpp b/src/intersect/intersect.cpp
index 2addca4..353508e 100644
--- a/src/intersect/intersect.cpp
+++ b/src/intersect/intersect.cpp
@@ -51,8 +51,10 @@ glm::vec4 intersectCircle(
 glm::vec4 intersectCone(
         glm::vec4 p,
         glm::vec4 d,
-        const RenderShapeData& shape)
+        const RenderShapeData& shape, 
+        bool &isHit)
 {
+    isHit = false;
     float t = FINF;
     // updated to 4d
     // x^2 + y^2 - z^2 - w^2= 0, conic top
@@ -110,14 +112,22 @@ glm::vec4 intersectCone(
         t = std::min(t, tyBase);
     }
 
-    return t == FINF ? glm::vec4(0.f) : p + t*d;
+    if (t == FINF)
+    {
+        return glm::vec4(0.f);
+    } else {
+        isHit = true;
+        return p + t*d;
+    }
 }
 
 glm::vec4 intersectCylinder(
         glm::vec4 p,
         glm::vec4 d,
-        const RenderShapeData& shape)
+        const RenderShapeData& shape, 
+        bool &isHit)
 {
+    isHit = false;
     float t = FINF;
 
     // implicit: x^2 + z^2 = r^2, y + w between -.5, .5 rectuangular side
@@ -179,14 +189,22 @@ glm::vec4 intersectCylinder(
         t = std::min(t, tBase);
     }
 
-    return t == FINF ? glm::vec4(0.f) : p + t*d;
+    if (t == FINF)
+    {
+        return glm::vec4(0.f);
+    } else {
+        isHit = true;
+        return p + t*d;
+    }
 }
 
 glm::vec4 intersectCube (
         glm::vec4 p,
         glm::vec4 d,
-        const RenderShapeData& shape)
+        const RenderShapeData& shape, 
+        bool &isHit)
 {
+    isHit = false;
     // float t = FINF;
     float apothem = .5f;
 
@@ -274,9 +292,11 @@ glm::vec4 intersectCube (
         return glm::vec4(0.f);
     } else if (tmin > 0) // tmin in front of camera
     {
+        isHit = true;
         return p + tmin*d;
     } else if (tmin <= 0) // tmax in front of camera
     {
+        isHit = true;
         return p + tmax*d;
     }
 
diff --git a/src/raytracer/raytracer.h b/src/raytracer/raytracer.h
index 0943e0d..9b5bfbe 100644
--- a/src/raytracer/raytracer.h
+++ b/src/raytracer/raytracer.h
@@ -75,7 +75,8 @@ public:
     glm::vec4 findIntersection(
             glm::vec4 p,
             glm::vec4 d,
-            const RenderShapeData& shape);
+            const RenderShapeData& shape, 
+            bool& isHit);
 
     // utils
     static RGBA toRGBA(const glm::vec4 &illumination);
@@ -148,7 +149,7 @@ public:
     bool m_enableReflection    = true;
     bool m_enableRefraction    = false;
     bool m_enableTextureMap    = false;
-    bool m_enableAcceleration  = true;
+    bool m_enableAcceleration  = false;
     bool m_enableParallelism   = true;
     int m_maxRecursiveDepth   = 4;
     bool m_enableAntiAliasing = false;