merge with new foam fixes

1 files changed, 55 insertions, 57 deletions

diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log
index bd31acf..4892ed8 100644
--- a/cmake-build-debug/.ninja_log
+++ b/cmake-build-debug/.ninja_log
@@ -1,65 +1,63 @@
 # ninja log v5
-13	38	1715274665230530986	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/timestamp	dc143b4497306125
-1512	4844	1715297344718772169	CMakeFiles/ocean.dir/src/mainwindow.cpp.o	b8eab0029b0c2d42
-78	110	1712645727876186134	CMakeFiles/StaticGLEW.dir/StaticGLEW_autogen/mocs_compilation.cpp.o	cf14dd1335b34a8d
-1521	4165	1715297344049177658	CMakeFiles/ocean.dir/src/graphics/shape.cpp.o	fad1395b11fceaa7
-4734	7910	1715274673090001677	CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o	5414beaf8d128308
-1741	1862	1715297428643492070	ocean	90ea6245b9d0c531
-1515	4798	1715297344682105484	CMakeFiles/ocean.dir/src/main.cpp.o	11d1d3bb5133c4bd
-1520	5532	1715297345415079003	CMakeFiles/ocean.dir/src/glwidget.cpp.o	b59369eca2fe4e32
-439	519	1715274665712161000	libStaticGLEW.a	8b4a852037c57830
-2043	2947	1715274668133653802	CMakeFiles/ocean.dir/src/graphics/graphicsdebug.cpp.o	bf7241321ed3a409
-13	38	1715274665230530986	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/mocs_compilation.cpp	dc143b4497306125
-13	38	1715274665230530986	StaticGLEW_autogen/mocs_compilation.cpp	dc143b4497306125
-1904	5414	1712645733171665244	CMakeFiles/ocean.dir/src/graphics/meshloader.cpp.o	64961778db90f56
-13	38	1715274665230530986	StaticGLEW_autogen/timestamp	dc143b4497306125
-0	312	1715299334699502267	build.ninja	dbd6bd50c232cbc4
-13	50	1715297426833568293	ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
-1848	2039	1715274667230803612	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp	e023bb8377457e1b
-39	439	1715274665627645867	CMakeFiles/StaticGLEW.dir/glew/src/glew.c.o	4784775df883673d
-13	50	1715297426833568293	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp	43dd0284b7c480b9
-1899	4665	1712645732404853458	CMakeFiles/ocean.dir/src/graphics/camera.cpp.o	d624ce2b01ab1415
-13	50	1715297426833568293	ocean_autogen/timestamp	43dd0284b7c480b9
-1511	4736	1715297344619832271	CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o	a0b6000c88b7e2e0
-2046	4734	1715274669919280047	CMakeFiles/ocean.dir/src/graphics/shader.cpp.o	267b6ae673a33204
-13	50	1715297426833568293	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
-54	1741	1715297428517242555	CMakeFiles/ocean.dir/src/arap.cpp.o	46f485071c8cb61b
-1521	3259	1715297343146557713	CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o	ad7112753002ff6a
-1848	2039	1715274667230803612	.rcc/qrc_Resources.cpp	e023bb8377457e1b
-2947	4344	1715274669529296463	CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o	960e422714c6a8ba
-0	202	1715299334699502267	build.ninja	dbd6bd50c232cbc4
-16	41	1715299334767160542	StaticGLEW_autogen/timestamp	dc143b4497306125
-16	41	1715299334767160542	StaticGLEW_autogen/mocs_compilation.cpp	dc143b4497306125
-16	41	1715299334767160542	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/timestamp	dc143b4497306125
-16	41	1715299334767160542	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/mocs_compilation.cpp	dc143b4497306125
-42	1503	1715299336190038000	ocean_autogen/timestamp	43dd0284b7c480b9
-42	1503	1715299336190038000	ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
-42	1503	1715299336190038000	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp	43dd0284b7c480b9
-42	1503	1715299336190038000	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
-1504	2098	1715299336821491711	.rcc/qrc_Resources.cpp	e023bb8377457e1b
-1504	2098	1715299336821491711	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp	e023bb8377457e1b
-2111	3635	1715299338351273532	CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o	960e422714c6a8ba
-2109	4451	1715299339164062954	CMakeFiles/ocean.dir/src/graphics/shader.cpp.o	267b6ae673a33204
 4451	4739	1715299339459105768	CMakeFiles/ocean.dir/src/ocean/halftone.cpp.o	8d9394826e07b034
-2109	4740	1715299339455807689	CMakeFiles/ocean.dir/src/graphics/shape.cpp.o	fad1395b11fceaa7
-2100	5069	1715299339783217955	CMakeFiles/ocean.dir/src/main.cpp.o	11d1d3bb5133c4bd
-2098	5083	1715299339796086686	CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o	a0b6000c88b7e2e0
-2102	5230	1715299339942367011	CMakeFiles/ocean.dir/src/arap.cpp.o	46f485071c8cb61b
-2100	5231	1715299339945623548	CMakeFiles/ocean.dir/src/mainwindow.cpp.o	b8eab0029b0c2d42
+2111	3635	1715299338351273532	CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o	960e422714c6a8ba
+1504	2098	1715299336821491711	.rcc/qrc_Resources.cpp	e023bb8377457e1b
 3635	5248	1715299339962106274	CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o	ad7112753002ff6a
-2108	6174	1715299340885755991	CMakeFiles/ocean.dir/src/glwidget.cpp.o	b59369eca2fe4e32
-4739	6955	1715299341667690334	CMakeFiles/ocean.dir/src/skybox.cpp.o	8709c3292b10899e
-4740	11934	1715299346643530390	CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o	5414beaf8d128308
-11935	12104	1715299346825220163	ocean	c2cf90dc856044f7
-11	46	1715299397167741527	ocean_autogen/timestamp	43dd0284b7c480b9
-11	46	1715299397167741527	ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
-11	46	1715299397167741527	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp	43dd0284b7c480b9
-11	46	1715299397167741527	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
 50	1893	1715299399006050516	CMakeFiles/ocean.dir/src/arap.cpp.o	46f485071c8cb61b
-1893	2017	1715299399135323075	ocean	c2cf90dc856044f7
+13	50	1715299482878485573	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
+2109	4451	1715299339164062954	CMakeFiles/ocean.dir/src/graphics/shader.cpp.o	267b6ae673a33204
+2098	5083	1715299339796086686	CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o	a0b6000c88b7e2e0
 13	50	1715299482878485573	ocean_autogen/timestamp	43dd0284b7c480b9
+1899	4665	1712645732404853458	CMakeFiles/ocean.dir/src/graphics/camera.cpp.o	d624ce2b01ab1415
+1504	2098	1715299336821491711	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp	e023bb8377457e1b
+0	202	1715319063189176377	build.ninja	dbd6bd50c232cbc4
 13	50	1715299482878485573	ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
 13	50	1715299482878485573	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp	43dd0284b7c480b9
-13	50	1715299482878485573	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
-54	2364	1715299485182775081	CMakeFiles/ocean.dir/src/glwidget.cpp.o	b59369eca2fe4e32
+39	439	1715274665627645867	CMakeFiles/StaticGLEW.dir/glew/src/glew.c.o	4784775df883673d
+16	41	1715299334767160542	StaticGLEW_autogen/timestamp	dc143b4497306125
+1904	5414	1712645733171665244	CMakeFiles/ocean.dir/src/graphics/meshloader.cpp.o	64961778db90f56
+16	41	1715299334767160542	StaticGLEW_autogen/mocs_compilation.cpp	dc143b4497306125
+16	41	1715299334767160542	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/mocs_compilation.cpp	dc143b4497306125
+2043	2947	1715274668133653802	CMakeFiles/ocean.dir/src/graphics/graphicsdebug.cpp.o	bf7241321ed3a409
+439	519	1715274665712161000	libStaticGLEW.a	8b4a852037c57830
 2365	2480	1715299485305538441	ocean	c2cf90dc856044f7
+4740	11934	1715299346643530390	CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o	5414beaf8d128308
+54	2364	1715299485182775081	CMakeFiles/ocean.dir/src/glwidget.cpp.o	b59369eca2fe4e32
+2100	5069	1715299339783217955	CMakeFiles/ocean.dir/src/main.cpp.o	11d1d3bb5133c4bd
+2109	4740	1715299339455807689	CMakeFiles/ocean.dir/src/graphics/shape.cpp.o	fad1395b11fceaa7
+78	110	1712645727876186134	CMakeFiles/StaticGLEW.dir/StaticGLEW_autogen/mocs_compilation.cpp.o	cf14dd1335b34a8d
+4739	6955	1715299341667690334	CMakeFiles/ocean.dir/src/skybox.cpp.o	8709c3292b10899e
+2100	5231	1715299339945623548	CMakeFiles/ocean.dir/src/mainwindow.cpp.o	b8eab0029b0c2d42
+16	41	1715299334767160542	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/timestamp	dc143b4497306125
+1	195	1715319063189176377	build.ninja	dbd6bd50c232cbc4
+14	38	1715319063246327152	StaticGLEW_autogen/timestamp	dc143b4497306125
+14	38	1715319063246327152	StaticGLEW_autogen/mocs_compilation.cpp	dc143b4497306125
+14	38	1715319063246327152	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/timestamp	dc143b4497306125
+14	38	1715319063246327152	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/mocs_compilation.cpp	dc143b4497306125
+39	1444	1715319064641778000	ocean_autogen/timestamp	43dd0284b7c480b9
+39	1444	1715319064641778000	ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
+39	1444	1715319064641778000	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp	43dd0284b7c480b9
+39	1444	1715319064641778000	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
+1444	1842	1715319065048935174	.rcc/qrc_Resources.cpp	e023bb8377457e1b
+1444	1842	1715319065048935174	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp	e023bb8377457e1b
+1844	3456	1715319066653540928	CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o	ad7112753002ff6a
+3457	3729	1715319066933526801	CMakeFiles/ocean.dir/src/ocean/halftone.cpp.o	8d9394826e07b034
+1843	3902	1715319067102221754	CMakeFiles/ocean.dir/src/graphics/shader.cpp.o	267b6ae673a33204
+1844	4269	1715319067463004166	CMakeFiles/ocean.dir/src/graphics/shape.cpp.o	fad1395b11fceaa7
+1842	4631	1715319067821603995	CMakeFiles/ocean.dir/src/mainwindow.cpp.o	b8eab0029b0c2d42
+1842	4647	1715319067840407818	CMakeFiles/ocean.dir/src/main.cpp.o	11d1d3bb5133c4bd
+1842	4648	1715319067843660902	CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o	a0b6000c88b7e2e0
+1843	4809	1715319068008006118	CMakeFiles/ocean.dir/src/arap.cpp.o	46f485071c8cb61b
+1843	5317	1715319068514704971	CMakeFiles/ocean.dir/src/glwidget.cpp.o	b59369eca2fe4e32
+3730	5443	1715319068639410125	CMakeFiles/ocean.dir/src/skybox.cpp.o	8709c3292b10899e
+3902	10445	1715319073630041669	CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o	5414beaf8d128308
+10445	10579	1715319073784385910	ocean	c2cf90dc856044f7
+13	54	1715319210303070417	ocean_autogen/timestamp	43dd0284b7c480b9
+13	54	1715319210303070417	ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
+13	54	1715319210303070417	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp	43dd0284b7c480b9
+13	54	1715319210303070417	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp	43dd0284b7c480b9
+59	480	1715319210726649643	.rcc/qrc_Resources.cpp	e023bb8377457e1b
+59	480	1715319210726649643	/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp	e023bb8377457e1b
+480	1756	1715319211998723321	CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o	ad7112753002ff6a
+480	7301	1715319217532844427	CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o	5414beaf8d128308
+7301	7424	1715319217670141294	ocean	c2cf90dc856044f7