From 5a704220dd508100812aafbcaf322d14159b8a69 Mon Sep 17 00:00:00 2001 From: sotech117 Date: Tue, 23 Apr 2024 20:29:23 -0400 Subject: small negative sign fix and wind fix --- .../CMakeFiles/ocean_autogen.dir/AutogenInfo.json | 11 +++++++++++ .../CMakeFiles/ocean_autogen.dir/ParseCache.txt | 16 +++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) (limited to 'cmake-build-debug/CMakeFiles') diff --git a/cmake-build-debug/CMakeFiles/ocean_autogen.dir/AutogenInfo.json b/cmake-build-debug/CMakeFiles/ocean_autogen.dir/AutogenInfo.json index c98e642..9ed102a 100644 --- a/cmake-build-debug/CMakeFiles/ocean_autogen.dir/AutogenInfo.json +++ b/cmake-build-debug/CMakeFiles/ocean_autogen.dir/AutogenInfo.json @@ -486,6 +486,12 @@ "3ZFFPL4P5V/moc_ocean.cpp", null ], + [ + "/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean_alt.h", + "MU", + "3ZFFPL4P5V/moc_ocean_alt.cpp", + null + ], [ "/Users/sotech117/Documents/final/adv/ocean-simulation/util/tiny_obj_loader.h", "MU", @@ -627,6 +633,11 @@ "/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.cpp", "MU", null + ], + [ + "/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean_alt.cpp", + "MU", + null ] ], "UIC_OPTIONS" : [], diff --git a/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt b/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt index 08b679f..d55e7dc 100644 --- a/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt +++ b/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt @@ -2,7 +2,8 @@ /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/graphics/camera.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.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/glwidget.h mmc:Q_OBJECT mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h @@ -1070,6 +1071,7 @@ mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.h 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/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 @@ -1348,6 +1350,7 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qxmlstream.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qxpfunctional.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qxptype_traits.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/QImage mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/QSurfaceFormat mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qaction.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qbitmap.h @@ -1385,8 +1388,7 @@ 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/util/tiny_obj_loader.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.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 @@ -2460,6 +2462,7 @@ mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.h 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/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 @@ -2738,6 +2741,7 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qxmlstream.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qxpfunctional.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qxptype_traits.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/QImage mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/QSurfaceFormat mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qaction.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qbitmap.h @@ -2781,7 +2785,9 @@ /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/shader.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.cpp /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/ocean_alt.h -- cgit v1.2.3-70-g09d2