resolve merge conflicts and attempt to fix local paths

1 files changed, 19 insertions, 13 deletions

diff --git a/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt b/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt
index d55e7dc..997b05f 100644
--- a/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt
+++ b/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt
@@ -1,9 +1,16 @@
 # Generated by CMake. Changes will be overwritten.
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.h
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/meshloader.cpp
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/meshloader.h
 /Users/sotech117/Documents/final/adv/ocean-simulation/src/arap.h
-/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.h
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/arap.cpp
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/main.cpp
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/halftone.cpp
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.h
 /Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.cpp
-/Users/sotech117/Documents/final/adv/ocean-simulation/util/tiny_obj_loader.h
-/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.h
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.h
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.cpp
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/skybox.cpp
 /Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h
  mmc:Q_OBJECT
  mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h
@@ -1072,6 +1079,7 @@
  mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.h
  mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.h
  mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean_alt.h
+ mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/skybox.h
  mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/util/unsupportedeigenthing/OpenGLSupport
  mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/Headers/QtConcurrent
  mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/Headers/QtConcurrentDepends
@@ -1388,12 +1396,9 @@
  mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h
  mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h
  mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h
-/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.cpp
-/Users/sotech117/Documents/final/adv/ocean-simulation/src/arap.cpp
-/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/meshloader.cpp
-/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.h
-/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.h
-/Users/sotech117/Documents/final/adv/ocean-simulation/src/main.cpp
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.h
+/Users/sotech117/Documents/final/adv/ocean-simulation/util/tiny_obj_loader.h
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/skybox.h
 /Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.h
  mmc:Q_OBJECT
  mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.h
@@ -2463,6 +2468,7 @@
  mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.h
  mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.h
  mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean_alt.h
+ mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/skybox.h
  mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/util/unsupportedeigenthing/OpenGLSupport
  mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/Headers/QtConcurrent
  mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/Headers/QtConcurrentDepends
@@ -2782,12 +2788,12 @@
  mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h
  mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h
  mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h
-/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/meshloader.h
-/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/graphicsdebug.h
 /Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/graphicsdebug.cpp
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/graphicsdebug.h
 /Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.cpp
 /Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.cpp
-/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.cpp
-/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.cpp
 /Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean_alt.cpp
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/halftone.h
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.cpp
+/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.cpp
 /Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean_alt.h