should be building

8 files changed, 177 insertions, 278 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 bc650f0..74116a0 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 8059b4f..bf79c86 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,145 +1,78 @@
 # ninja log v5
-<<<<<<< HEAD
-50	168	1702330327746048757	/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
-50	168	1702330327746048757	/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
-170	11454	1702328734963840489	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	efa4d0ee111c147a
-273	23555	1702328640872929576	CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o	81fffec8aaaec0bd
-235	24528	1702328641851489095	CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o	4731cafbc4b4e737
-244	23316	1702328640619167945	CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o	35a3ae2d0b82dd65
-3988	4746	1702330332298578413	projects_ray	a842e040bf3d79e9
-24000	35687	1702328653004732831	CMakeFiles/projects_ray.dir/src/main.cpp.o	987044590434d8d1
-229	26157	1702328643476485578	CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o	aaa2fe512335b7de
-274	33545	1702328650843645090	CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o	28d12937d9255fcc
-170	7882	1702328731379536635	CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o	6c6dd3bd167ac5ff
-23761	25785	1702328643118330102	CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o	9cafd52c1d615711
-23317	33999	1702328651319255202	CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o	2ac5d1ff96197a9
-23557	32777	1702328650103459698	CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o	936dea6b1a330a9e
-237	23771	1702328641077992188	CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o	98378b8788da3ce3
-249	25432	1702328642752610083	CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o	bc288befd0c32eb0
-242	23378	1702328640662335383	CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o	d622514f4a212179
-241	24000	1702328641315893515	CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o	d3d7e9f0c176bf47
-246	23302	1702328640587973814	CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o	d10c1da10eac29ed
-50	168	1702330327746048757	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-239	23760	1702328641077141162	CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o	e72528d54abad0c9
-50	168	1702330327746048757	projects_ray_autogen/timestamp	596afd61accb21ff
-23303	33831	1702328651156023481	CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o	a0b7647ef5416d35
-23378	30178	1702328647503205592	CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o	176379e1dc38d565
-25785	30853	1702328648182866319	CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o	5f7d45d0b689d9f7
-211	5417	1702329539033555652	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
-25433	29326	1702328646657624247	CMakeFiles/projects_ray.dir/src/settings.cpp.o	73db81265aa9dd0e
-231	33291	1702328650609653524	CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o	4d14ff80692ac6b3
-8	1462	1702328617237786890	build.ninja	d13bedc3f8269e08
-178	3988	1702330331537890573	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	2ea2e8e07c7b357b
-23771	33760	1702328651085203109	CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o	21ccedb02e7f6f6a
-24	137	1702330424476303233	projects_ray_autogen/timestamp	596afd61accb21ff
-24	137	1702330424476303233	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-24	137	1702330424476303233	/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
-24	137	1702330424476303233	/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
-148	3687	1702330428007506810	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	2ea2e8e07c7b357b
-3687	4402	1702330428710014064	projects_ray	a842e040bf3d79e9
-24	148	1702330582317833506	projects_ray_autogen/timestamp	596afd61accb21ff
-24	148	1702330582317833506	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-24	148	1702330582317833506	/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
-24	148	1702330582317833506	/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
-159	4293	1702330586445660170	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
-4293	5025	1702330587167022247	projects_ray	a842e040bf3d79e9
-24	138	1702333386848286975	projects_ray_autogen/timestamp	596afd61accb21ff
-24	138	1702333386848286975	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-24	138	1702333386848286975	/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
-24	138	1702333386848286975	/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
-149	4425	1702333391112332609	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	2ea2e8e07c7b357b
-149	5553	1702333392244472544	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
-148	5695	1702333392381336814	CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o	6c6dd3bd167ac5ff
-5696	6335	1702333393014493384	projects_ray	a842e040bf3d79e9
-24	144	1702333903604883498	projects_ray_autogen/timestamp	596afd61accb21ff
-24	144	1702333903604883498	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-24	144	1702333903604883498	/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
-24	144	1702333903604883498	/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
-157	3594	1702333907034771934	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	2ea2e8e07c7b357b
-156	4708	1702333908150670653	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
-4708	5289	1702333908723820605	projects_ray	a842e040bf3d79e9
-37	207	1702333991779993436	projects_ray_autogen/timestamp	596afd61accb21ff
-37	207	1702333991779993436	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-37	207	1702333991779993436	/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
-37	207	1702333991779993436	/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
-225	5598	1702333997154758763	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
-5598	6279	1702333997826511501	projects_ray	a842e040bf3d79e9
-25	146	1702334330701712265	projects_ray_autogen/timestamp	596afd61accb21ff
-25	146	1702334330701712265	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-25	146	1702334330701712265	/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	146	1702334330701712265	/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
-157	5410	1702334335944239212	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
-5410	6217	1702334336731923317	projects_ray	a842e040bf3d79e9
-=======
-12499	19715	1702070530335653994	CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o	81fffec8aaaec0bd
-2014	16129	1702247256683403980	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	efa4d0ee111c147a
-1949	12552	1702070523172011570	CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o	35a3ae2d0b82dd65
-1941	13001	1702070523624492613	CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o	4731cafbc4b4e737
-2013	15010	1702247255558209399	CMakeFiles/projects_ray.dir/src/main.cpp.o	987044590434d8d1
-1938	14619	1702070525228350664	CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o	aaa2fe512335b7de
-12552	23387	1702070534013897550	CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o	28d12937d9255fcc
-2013	13576	1702247254125569428	CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o	6c6dd3bd167ac5ff
-12696	20607	1702070531227914702	CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o	2ac5d1ff96197a9
-191	2112	1702069278793333995	CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o	9cafd52c1d615711
-1947	12499	1702070523121512734	CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o	d622514f4a212179
-1946	12725	1702070523341525396	CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o	d3d7e9f0c176bf47
-7844	17014	1702070527638800667	CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o	d10c1da10eac29ed
-31	2011	1702247242555969000	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
-1944	12700	1702070523312945240	CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o	e72528d54abad0c9
-16129	16802	1702247257357860171	projects_ray	a842e040bf3d79e9
-31	2011	1702247242555969000	projects_ray_autogen/timestamp	596afd61accb21ff
-12615	20456	1702070531078485263	CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o	a0b7647ef5416d35
-1929	12353	1702070522974418120	CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o	936dea6b1a330a9e
-1943	12696	1702070523308816788	CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o	98378b8788da3ce3
-12354	20232	1702070530851642353	CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o	bc288befd0c32eb0
-2014	10778	1702247251325163693	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	2ea2e8e07c7b357b
-2	397	1702256894321554471	build.ninja	d13bedc3f8269e08
-1946	16434	1702069114953926356	CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o	4d14ff80692ac6b3
-2012	11891	1702247252438812632	CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o	21ccedb02e7f6f6a
-1953	12354	1702069370966741736	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
-1384	4596	1702065010366160912	CMakeFiles/projects_ray.dir/src/settings.cpp.o	73db81265aa9dd0e
-201	2406	1702070849164713826	CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o	5f7d45d0b689d9f7
-2015	7261	1702247247809011677	CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o	176379e1dc38d565
-5	571	1702256898604025591	projects_ray_autogen/timestamp	90a86c673d4d5360
-5	571	1702256898604025591	projects_ray_autogen/mocs_compilation.cpp	90a86c673d4d5360
-5	571	1702256898604025591	/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp	90a86c673d4d5360
-5	571	1702256898604025591	/Users/lafayette_bussey/Desktop/cs1230/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	90a86c673d4d5360
-572	1069	1702256899105174401	CMakeFiles/projects_ray.dir/src/settings.cpp.o	c1f79a20c0ecbe57
-572	1223	1702256899257632523	CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o	94ae54642a1d948f
-572	1752	1702256899785820170	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	aea38d6800d3e2d7
-574	1786	1702256899819989922	CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o	c5109dc5ea714408
-573	1800	1702256899835075331	CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o	3f60bdf8eba19b08
-573	1815	1702256899847957753	CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o	c5c01b155b8ee7bd
-573	1842	1702256899876435373	CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o	e75c5f32d37c0f7
-571	1888	1702256899921064937	CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o	b6caa8722c5ed85
-572	2067	1702256900097779246	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	f97c011acc078586
-1070	2109	1702256900140845277	CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o	3b9d0580f53ea69c
-572	2147	1702256900177405307	CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o	e6850a1ba68767f
-572	2292	1702256900324319504	CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o	e9399ac69b3cfe3a
-2148	2299	1702256900337480508	CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o	202455a136d96772
-1224	2313	1702256900346526745	CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o	494cb10eb691f3da
-571	2370	1702256900402916405	CMakeFiles/projects_ray.dir/src/main.cpp.o	5dc8b318e78f1fc9
-2067	2556	1702256900590882395	CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o	91511fc09b29247f
-572	2611	1702256900642989789	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	70260dd9342207e1
-1753	2670	1702256900703349134	CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o	6509507adff024b9
-1801	2689	1702256900723704594	CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o	61d667b82582b0f6
-1787	2744	1702256900779787339	CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o	992faa973485d8a9
-1889	2780	1702256900815793538	CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o	972643ee76ef36e3
-572	2826	1702256900861458138	CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o	ad7df583a7d505ab
-1815	2836	1702256900869485215	CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o	57e5e91a0ccd956b
-2109	2854	1702256900889672343	CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o	7ae83c7dbbb3069c
-1846	3326	1702256901360458086	CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o	edd9793557117a52
-3326	3465	1702256901503327682	projects_ray	86189a8842e154ef
-7	37	1702333804316350533	projects_ray_autogen/timestamp	90a86c673d4d5360
-7	37	1702333804316350533	projects_ray_autogen/mocs_compilation.cpp	90a86c673d4d5360
-7	37	1702333804316350533	/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp	90a86c673d4d5360
-7	37	1702333804316350533	/Users/lafayette_bussey/Desktop/cs1230/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	90a86c673d4d5360
-40	646	1702333804921083630	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	aea38d6800d3e2d7
-646	779	1702333805055335915	projects_ray	86189a8842e154ef
-6	34	1702334794290663489	projects_ray_autogen/timestamp	90a86c673d4d5360
-6	34	1702334794290663489	projects_ray_autogen/mocs_compilation.cpp	90a86c673d4d5360
-6	34	1702334794290663489	/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp	90a86c673d4d5360
-6	34	1702334794290663489	/Users/lafayette_bussey/Desktop/cs1230/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	90a86c673d4d5360
-35	630	1702334794882621284	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	aea38d6800d3e2d7
-630	760	1702334795013830551	projects_ray	86189a8842e154ef
->>>>>>> bbe08c295ccfa32de1a9ca7321f36b2c130ad233
+2652	18072	1702361008426158265	CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o	21ccedb02e7f6f6a
+155	4315	1702406310366679302	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	2ea2e8e07c7b357b
+3	711	1702335613186328022	build.ninja	d13bedc3f8269e08
+184	19470	1702335632681606340	CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o	4d14ff80692ac6b3
+155	4287	1702406365778416533	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
+20127	25995	1702339175593947290	CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o	176379e1dc38d565
+3786	12125	1702339161665769438	CMakeFiles/projects_ray.dir/src/settings.cpp.o	73db81265aa9dd0e
+3787	13935	1702339163527032459	CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o	5f7d45d0b689d9f7
+24	141	1702406418951641743	projects_ray_autogen/timestamp	596afd61accb21ff
+16942	24118	1702361014482901531	CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o	a0b7647ef5416d35
+2665	17022	1702361007373483378	CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o	e72528d54abad0c9
+24	141	1702406418951641743	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+2667	17050	1702361007391564331	CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o	d3d7e9f0c176bf47
+2668	16894	1702361007115551050	CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o	d622514f4a212179
+16767	24017	1702361014384125045	CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o	bc288befd0c32eb0
+2664	17045	1702361007317717847	CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o	98378b8788da3ce3
+17045	23571	1702361013932769874	CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o	936dea6b1a330a9e
+2655	19757	1702361010108674662	CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o	6c6dd3bd167ac5ff
+216	7145	1702406179679989287	CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o	2ac5d1ff96197a9
+12920	14633	1702335627859700380	CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o	9cafd52c1d615711
+16894	26535	1702361016901796181	CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o	28d12937d9255fcc
+2658	18978	1702361009317301416	CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o	aaa2fe512335b7de
+2653	21471	1702361011813806218	CMakeFiles/projects_ray.dir/src/main.cpp.o	987044590434d8d1
+2662	17401	1702361007727358310	CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o	4731cafbc4b4e737
+7315	8328	1702406427089343299	projects_ray	a842e040bf3d79e9
+2670	16766	1702361007103662549	CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o	35a3ae2d0b82dd65
+16865	23552	1702361013915014297	CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o	81fffec8aaaec0bd
+24	141	1702406418951641743	/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
+24	141	1702406418951641743	/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
+2671	16864	1702361007146771593	CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o	d10c1da10eac29ed
+153	7314	1702406426048856369	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	efa4d0ee111c147a
+24	143	1702406494626731621	projects_ray_autogen/timestamp	596afd61accb21ff
+24	143	1702406494626731621	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+24	143	1702406494626731621	/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
+24	143	1702406494626731621	/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
+154	3151	1702406497622612430	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	2ea2e8e07c7b357b
+3151	3800	1702406498262799233	projects_ray	a842e040bf3d79e9
+22	124	1702406526353742409	projects_ray_autogen/timestamp	596afd61accb21ff
+22	124	1702406526353742409	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+22	124	1702406526353742409	/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
+22	124	1702406526353742409	/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
+135	2582	1702406528802356026	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	2ea2e8e07c7b357b
+2582	2954	1702406529167556480	projects_ray	a842e040bf3d79e9
+24	145	1702406741654001183	projects_ray_autogen/timestamp	596afd61accb21ff
+24	145	1702406741654001183	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+24	145	1702406741654001183	/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
+24	145	1702406741654001183	/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
+158	8295	1702406749771910395	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
+157	13279	1702406754759252581	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	efa4d0ee111c147a
+13280	14108	1702406755588706185	projects_ray	a842e040bf3d79e9
+24	130	1702406825887364287	projects_ray_autogen/timestamp	596afd61accb21ff
+24	130	1702406825887364287	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+24	130	1702406825887364287	/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
+24	130	1702406825887364287	/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
+141	4208	1702406829946286249	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
+141	4636	1702406830366768829	CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o	6c6dd3bd167ac5ff
+4636	5196	1702406830928183100	projects_ray	a842e040bf3d79e9
+23	139	1702406964443792270	projects_ray_autogen/timestamp	596afd61accb21ff
+23	139	1702406964443792270	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+23	139	1702406964443792270	/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
+23	139	1702406964443792270	/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
+149	4064	1702406968355219372	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
+4064	4660	1702406968934983843	projects_ray	a842e040bf3d79e9
+24	196	1702407115748165876	projects_ray_autogen/timestamp	596afd61accb21ff
+24	196	1702407115748165876	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+24	196	1702407115748165876	/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
+24	196	1702407115748165876	/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
+219	6071	1702407121603598994	CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o	2ac5d1ff96197a9
+217	6689	1702407122222877092	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	ed3cc2e1b7dc62bd
+214	9854	1702407125384646273	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	efa4d0ee111c147a
+9854	10640	1702407126167401957	projects_ray	a842e040bf3d79e9
+24	140	1702407546335089866	projects_ray_autogen/timestamp	596afd61accb21ff
+24	140	1702407546335089866	projects_ray_autogen/mocs_compilation.cpp	596afd61accb21ff
+24	140	1702407546335089866	/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
+24	140	1702407546335089866	/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
+151	3037	1702407549220033913	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	2ea2e8e07c7b357b
+3037	3502	1702407549678145187	projects_ray	a842e040bf3d79e9
diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx
index 5ece5e4..98f7214 100644
--- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx
+++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx
diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.h.23DBF4EEAB76EA9F.idx b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.h.23DBF4EEAB76EA9F.idx
index ed4d534..eb0eedf 100644
--- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.h.23DBF4EEAB76EA9F.idx
+++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.h.23DBF4EEAB76EA9F.idx
diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/settings.h.1343DBB067FD6052.idx b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/settings.h.1343DBB067FD6052.idx
index be4448a..0afed1f 100644
--- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/settings.h.1343DBB067FD6052.idx
+++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/settings.h.1343DBB067FD6052.idx
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 8bbc9fa..35434ac 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,39 +1,40 @@
 # Generated by CMake. Changes will be overwritten.
-<<<<<<< HEAD
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/settings.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/texture/texture.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/illuminate/shadow.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/mainwindow.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/settings.h
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/camera/camera.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/aliasing/filter.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/bvh.cpp
+<<<<<<< HEAD
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/mainwindow.h
-=======
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/illuminate/shadow.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/bvh.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/rgba.h
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/illuminate/shadow.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/texture/texture.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/vec4ops/vec4ops.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/sceneparser.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/texture/texture.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/settings.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/mainwindow.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/intersect/normals.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/texture/texture.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/intersect/normals.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/aliasing/filter.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracer.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/mainwindow.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/main.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/myqtconcurrent.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/bvh.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/accelerate/myqthreads.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/rgba.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracer.h
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracescene.h
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/vec4ops/vec4ops.h
+=======
 >>>>>>> bbe08c295ccfa32de1a9ca7321f36b2c130ad233
  mmc:Q_OBJECT
  mdp:/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/mainwindow.h
@@ -986,36 +987,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
-<<<<<<< HEAD
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.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/accelerate/kdtree.h
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/settings.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/sceneparser.h
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/illuminate/reflect.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/rgba.h
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/myqtconcurrent.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/camera/camera.h
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.h
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp
-=======
-/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/illuminate/shadow.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/bvh.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/sceneparser.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/camera/camera.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracescene.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/mainwindow.h
->>>>>>> bbe08c295ccfa32de1a9ca7321f36b2c130ad233
- mmc:Q_OBJECT
  mdp:/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp
  mdp:/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/moc_predefs.h
  mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.3.sdk/usr/include/Availability.h
@@ -1784,27 +1755,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/intersect/normals.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/aliasing/filter.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/bvh.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracescene.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/vec4ops/vec4ops.h
-<<<<<<< HEAD
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/settings.h
-/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/vec4ops/rotations4d.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracer.h
-=======
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/intersect/intersect.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/scenefilereader.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/scenedata.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/camera/camera.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/settings.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/aliasing/filter.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp
->>>>>>> bbe08c295ccfa32de1a9ca7321f36b2c130ad233
- mmc:Q_OBJECT
  mdp:/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracer.h
  mdp:/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/moc_predefs.h
  mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.3.sdk/usr/include/Availability.h
@@ -2731,15 +2681,28 @@
  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/main.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/intersect/intersect.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/intersect/normals.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/camera/camera.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/bvh.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/illuminate/shadow.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/rgba.h
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.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/accelerate/kdtree.h
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/sceneparser.h
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/illuminate/reflect.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/rgba.h
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/myqtconcurrent.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/camera/camera.h
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.h
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h
+/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/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/mainwindow.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracer.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/settings.h
+/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/illuminate/illuminate.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
  mmc:Q_OBJECT
@@ -3693,6 +3656,7 @@
  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/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/main.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h
  mmc:Q_OBJECT
@@ -4622,20 +4586,18 @@
  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/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/scenefilereader.h
 /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/scenedata.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/vec4ops/vec4ops.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/sceneparser.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/camera/camera.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/myqtconcurrent.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/scenefilereader.h
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/main.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/intersect/normals.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/intersect/intersect.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/settings.cpp
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/scenedata.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/mainwindow.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/camera/camera.h
+/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/camera/camera.cpp
+/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.h
 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp
  mmc:Q_OBJECT
  mdp:/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp
@@ -5406,9 +5368,3 @@
  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/utils/raytracerutils.cpp
-/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.h
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracer.cpp
-/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/texture/texture.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 71a540b..1a190aa 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/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp
index 4e81622..2d667ca 100644
--- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp
+++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp
@@ -65,12 +65,13 @@ static constexpr auto qt_meta_stringdata_CLASSMainWindowENDCLASS = QtMocHelpers:
     "updateYzSlider",
     "updateYwSlider",
     "updateZwSlider",
+    "updateRotationSlider",
     "onValChangeWSlider",
     "onValChangeWBox"
 );
 #else  // !QT_MOC_HAS_STRING_DATA
 struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t {
-    uint offsetsAndSizes[56];
+    uint offsetsAndSizes[58];
     char stringdata0[11];
     char stringdata1[13];
     char stringdata2[1];
@@ -97,8 +98,9 @@ struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t {
     char stringdata23[15];
     char stringdata24[15];
     char stringdata25[15];
-    char stringdata26[19];
-    char stringdata27[16];
+    char stringdata26[21];
+    char stringdata27[19];
+    char stringdata28[16];
 };
 #define QT_MOC_LITERAL(ofs, len) \
     uint(sizeof(qt_meta_stringdata_CLASSMainWindowENDCLASS_t::offsetsAndSizes) + ofs), len 
@@ -130,8 +132,9 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st
         QT_MOC_LITERAL(379, 14),  // "updateYzSlider"
         QT_MOC_LITERAL(394, 14),  // "updateYwSlider"
         QT_MOC_LITERAL(409, 14),  // "updateZwSlider"
-        QT_MOC_LITERAL(424, 18),  // "onValChangeWSlider"
-        QT_MOC_LITERAL(443, 15)   // "onValChangeWBox"
+        QT_MOC_LITERAL(424, 20),  // "updateRotationSlider"
+        QT_MOC_LITERAL(445, 18),  // "onValChangeWSlider"
+        QT_MOC_LITERAL(464, 15)   // "onValChangeWBox"
     },
     "MainWindow",
     "onUploadFile",
@@ -159,6 +162,7 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st
     "updateYzSlider",
     "updateYwSlider",
     "updateZwSlider",
+    "updateRotationSlider",
     "onValChangeWSlider",
     "onValChangeWBox"
 };
@@ -172,7 +176,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = {
       11,       // revision
        0,       // classname
        0,    0, // classinfo
-      25,   14, // methods
+      26,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -180,31 +184,32 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = {
        0,       // signalCount
 
  // slots: name, argc, parameters, tag, flags, initial metatype offsets
-       1,    0,  164,    2, 0x08,    1 /* Private */,
-       3,    0,  165,    2, 0x08,    2 /* Private */,
-       4,    1,  166,    2, 0x08,    3 /* Private */,
-       6,    1,  169,    2, 0x08,    5 /* Private */,
-       7,    1,  172,    2, 0x08,    7 /* Private */,
-       8,    1,  175,    2, 0x08,    9 /* Private */,
-       9,    1,  178,    2, 0x08,   11 /* Private */,
-      10,    1,  181,    2, 0x08,   13 /* Private */,
-      11,    1,  184,    2, 0x08,   15 /* Private */,
-      12,    1,  187,    2, 0x08,   17 /* Private */,
-      13,    1,  190,    2, 0x08,   19 /* Private */,
-      14,    1,  193,    2, 0x08,   21 /* Private */,
-      15,    1,  196,    2, 0x08,   23 /* Private */,
-      16,    1,  199,    2, 0x08,   25 /* Private */,
-      17,    1,  202,    2, 0x08,   27 /* Private */,
-      18,    1,  205,    2, 0x08,   29 /* Private */,
-      19,    0,  208,    2, 0x08,   31 /* Private */,
-      20,    1,  209,    2, 0x08,   32 /* Private */,
-      21,    1,  212,    2, 0x08,   34 /* Private */,
-      22,    1,  215,    2, 0x08,   36 /* Private */,
-      23,    1,  218,    2, 0x08,   38 /* Private */,
-      24,    1,  221,    2, 0x08,   40 /* Private */,
-      25,    1,  224,    2, 0x08,   42 /* Private */,
-      26,    1,  227,    2, 0x08,   44 /* Private */,
-      27,    1,  230,    2, 0x08,   46 /* Private */,
+       1,    0,  170,    2, 0x08,    1 /* Private */,
+       3,    0,  171,    2, 0x08,    2 /* Private */,
+       4,    1,  172,    2, 0x08,    3 /* Private */,
+       6,    1,  175,    2, 0x08,    5 /* Private */,
+       7,    1,  178,    2, 0x08,    7 /* Private */,
+       8,    1,  181,    2, 0x08,    9 /* Private */,
+       9,    1,  184,    2, 0x08,   11 /* Private */,
+      10,    1,  187,    2, 0x08,   13 /* Private */,
+      11,    1,  190,    2, 0x08,   15 /* Private */,
+      12,    1,  193,    2, 0x08,   17 /* Private */,
+      13,    1,  196,    2, 0x08,   19 /* Private */,
+      14,    1,  199,    2, 0x08,   21 /* Private */,
+      15,    1,  202,    2, 0x08,   23 /* Private */,
+      16,    1,  205,    2, 0x08,   25 /* Private */,
+      17,    1,  208,    2, 0x08,   27 /* Private */,
+      18,    1,  211,    2, 0x08,   29 /* Private */,
+      19,    0,  214,    2, 0x08,   31 /* Private */,
+      20,    1,  215,    2, 0x08,   32 /* Private */,
+      21,    1,  218,    2, 0x08,   34 /* Private */,
+      22,    1,  221,    2, 0x08,   36 /* Private */,
+      23,    1,  224,    2, 0x08,   38 /* Private */,
+      24,    1,  227,    2, 0x08,   40 /* Private */,
+      25,    1,  230,    2, 0x08,   42 /* Private */,
+      26,    1,  233,    2, 0x08,   44 /* Private */,
+      27,    1,  236,    2, 0x08,   46 /* Private */,
+      28,    1,  239,    2, 0x08,   48 /* Private */,
 
  // slots: parameters
     QMetaType::Void,
@@ -230,6 +235,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = {
     QMetaType::Void, QMetaType::Double,    5,
     QMetaType::Void, QMetaType::Double,    5,
     QMetaType::Void, QMetaType::Double,    5,
+    QMetaType::Void, QMetaType::Float,    5,
     QMetaType::Void, QMetaType::Int,    5,
     QMetaType::Void, QMetaType::Double,    5,
 
@@ -311,6 +317,9 @@ Q_CONSTINIT const QMetaObject MainWindow::staticMetaObject = { {
         // method 'updateZwSlider'
         QtPrivate::TypeAndForceComplete<void, std::false_type>,
         QtPrivate::TypeAndForceComplete<double, std::false_type>,
+        // method 'updateRotationSlider'
+        QtPrivate::TypeAndForceComplete<void, std::false_type>,
+        QtPrivate::TypeAndForceComplete<float, std::false_type>,
         // method 'onValChangeWSlider'
         QtPrivate::TypeAndForceComplete<void, std::false_type>,
         QtPrivate::TypeAndForceComplete<int, std::false_type>,
@@ -350,8 +359,9 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
         case 20: _t->updateYzSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break;
         case 21: _t->updateYwSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break;
         case 22: _t->updateZwSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break;
-        case 23: _t->onValChangeWSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break;
-        case 24: _t->onValChangeWBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break;
+        case 23: _t->updateRotationSlider((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break;
+        case 24: _t->onValChangeWSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break;
+        case 25: _t->onValChangeWBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break;
         default: ;
         }
     }
@@ -376,13 +386,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 25)
+        if (_id < 26)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 25;
+        _id -= 26;
     } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
-        if (_id < 25)
+        if (_id < 26)
             *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType();
-        _id -= 25;
+        _id -= 26;
     }
     return _id;
 }