Merge branch 'main' into shaders

1 files changed, 10 insertions, 2 deletions

diff --git a/cmake-build-debug/build.ninja b/cmake-build-debug/build.ninja
index 5b1b169..38ae480 100644
--- a/cmake-build-debug/build.ninja
+++ b/cmake-build-debug/build.ninja
@@ -137,6 +137,14 @@ build CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o: CXX_COMPILER__ocean_unscanned_
   OBJECT_DIR = CMakeFiles/ocean.dir
   OBJECT_FILE_DIR = CMakeFiles/ocean.dir/src/ocean
 
+build CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o: CXX_COMPILER__ocean_unscanned_Debug /Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean_alt.cpp || cmake_object_order_depends_target_ocean
+  DEFINES = -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGLWIDGETS_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB
+  DEP_FILE = CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o.d
+  FLAGS = -Wno-deprecated-volatile -g -std=gnu++20 -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk -fcolor-diagnostics
+  INCLUDES = -I/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug -I/Users/sotech117/Documents/final/adv/ocean-simulation -I/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/include -I/Users/sotech117/Documents/final/adv/ocean-simulation/src -I/Users/sotech117/Documents/final/adv/ocean-simulation/libs -I/Users/sotech117/Documents/final/adv/ocean-simulation/ocean -I/Users/sotech117/Documents/final/adv/ocean-simulation/PRIVATE -I/Users/sotech117/Documents/final/adv/ocean-simulation/glew/include -I/Users/sotech117/Documents/final/adv/ocean-simulation/Eigen -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Headers -iframework /Users/sotech117/Qt/6.5.2/macos/lib -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/mkspecs/macx-clang -isystem /Users/sotech117/Qt/6.5.2/macos/include -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Headers
+  OBJECT_DIR = CMakeFiles/ocean.dir
+  OBJECT_FILE_DIR = CMakeFiles/ocean.dir/src/ocean
+
 build CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o: CXX_COMPILER__ocean_unscanned_Debug /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp || cmake_object_order_depends_target_ocean
   DEFINES = -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGLWIDGETS_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB
   DEP_FILE = CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o.d
@@ -153,7 +161,7 @@ build CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o: CXX_COMPI
 #############################################
 # Link the executable ocean
 
-build ocean: CXX_EXECUTABLE_LINKER__ocean_Debug CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o CMakeFiles/ocean.dir/src/main.cpp.o CMakeFiles/ocean.dir/src/mainwindow.cpp.o CMakeFiles/ocean.dir/src/arap.cpp.o CMakeFiles/ocean.dir/src/glwidget.cpp.o CMakeFiles/ocean.dir/src/graphics/camera.cpp.o CMakeFiles/ocean.dir/src/graphics/graphicsdebug.cpp.o CMakeFiles/ocean.dir/src/graphics/meshloader.cpp.o CMakeFiles/ocean.dir/src/graphics/shader.cpp.o CMakeFiles/ocean.dir/src/graphics/shape.cpp.o CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o | libStaticGLEW.a /Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/QtConcurrent /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/QtOpenGLWidgets /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Versions/A/QtOpenGL /Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/QtWidgets /Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/QtGui /Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Versions/A/QtXml /Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/QtCore || libStaticGLEW.a ocean_autogen ocean_autogen_timestamp_deps
+build ocean: CXX_EXECUTABLE_LINKER__ocean_Debug CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o CMakeFiles/ocean.dir/src/main.cpp.o CMakeFiles/ocean.dir/src/mainwindow.cpp.o CMakeFiles/ocean.dir/src/arap.cpp.o CMakeFiles/ocean.dir/src/glwidget.cpp.o CMakeFiles/ocean.dir/src/graphics/camera.cpp.o CMakeFiles/ocean.dir/src/graphics/graphicsdebug.cpp.o CMakeFiles/ocean.dir/src/graphics/meshloader.cpp.o CMakeFiles/ocean.dir/src/graphics/shader.cpp.o CMakeFiles/ocean.dir/src/graphics/shape.cpp.o CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o | libStaticGLEW.a /Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/QtConcurrent /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/QtOpenGLWidgets /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Versions/A/QtOpenGL /Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/QtWidgets /Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/QtGui /Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Versions/A/QtXml /Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/QtCore || libStaticGLEW.a ocean_autogen ocean_autogen_timestamp_deps
   FLAGS = -Wno-deprecated-volatile -g -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk
   LINK_LIBRARIES = -Wl,-rpath,/Users/sotech117/Qt/6.5.2/macos/lib  libStaticGLEW.a  /Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/QtConcurrent  /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/QtOpenGLWidgets  /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Versions/A/QtOpenGL  /Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/QtWidgets  /Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/QtGui  -Xlinker -framework -Xlinker OpenGL  -Xlinker -framework -Xlinker AGL  -framework AppKit  -framework ImageIO  -framework Metal  /Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Versions/A/QtXml  /Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/QtCore  -framework IOKit  -framework DiskArbitration
   LINK_PATH = -F/Users/sotech117/Qt/6.5.2/macos/lib
@@ -260,7 +268,7 @@ build StaticGLEW_autogen: phony CMakeFiles/StaticGLEW_autogen StaticGLEW_autogen
 #############################################
 # Custom command for .rcc/qrc_Resources.cpp
 
-build .rcc/qrc_Resources.cpp | ${cmake_ninja_workdir}.rcc/qrc_Resources.cpp: CUSTOM_COMMAND /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/shader.frag /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/shader.vert /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/anchorPoint.vert /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/anchorPoint.geom /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/anchorPoint.frag .rcc/Resources.qrc /Users/sotech117/Qt/6.5.2/macos/./libexec/rcc || StaticGLEW_autogen StaticGLEW_autogen_timestamp_deps libStaticGLEW.a ocean_autogen ocean_autogen_timestamp_deps
+build .rcc/qrc_Resources.cpp | ${cmake_ninja_workdir}.rcc/qrc_Resources.cpp: CUSTOM_COMMAND /Users/sotech117/Documents/final/adv/ocean-simulation/resources/images/uv1.png /Users/sotech117/Documents/final/adv/ocean-simulation/resources/images/kitten.png /Users/sotech117/Documents/final/adv/ocean-simulation/resources/images/hello.png /Users/sotech117/Documents/final/adv/ocean-simulation/resources/images/sand_text.jpg /Users/sotech117/Documents/final/adv/ocean-simulation/resources/images/caustic_sample.jpg /Users/sotech117/Documents/final/adv/ocean-simulation/resources/images/anamorphic.jpg /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/shader.frag /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/shader.vert /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/anchorPoint.vert /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/anchorPoint.geom /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/anchorPoint.frag /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/texture.vert /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/texture.frag .rcc/Resources.qrc /Users/sotech117/Qt/6.5.2/macos/./libexec/rcc || StaticGLEW_autogen StaticGLEW_autogen_timestamp_deps libStaticGLEW.a ocean_autogen ocean_autogen_timestamp_deps
   COMMAND = cd /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug && /Users/sotech117/Qt/6.5.2/macos/./libexec/rcc --output /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp --name Resources /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/Resources.qrc --no-zstd
   DESC = Running rcc for resource Resources
   restat = 1