From 6120499fd6d66fa010ab0bfcf3089eeeddb3b45c Mon Sep 17 00:00:00 2001 From: sotech117 Date: Sat, 4 May 2024 16:53:45 -0400 Subject: further testing at higher params --- cmake-build-debug/.ninja_deps | Bin 409632 -> 528124 bytes cmake-build-debug/.ninja_log | 171 ++++++++++----------- cmake-build-debug/.rcc/qrc_Resources.cpp | 4 +- .../CMakeFiles/ocean_autogen.dir/ParseCache.txt | 54 +++---- cmake-build-debug/Testing/Temporary/LastTest.log | 4 +- cmake-build-debug/ocean | Bin 8772568 -> 8772280 bytes resources/shaders/shader.frag | 2 +- src/arap.cpp | 4 +- src/glwidget.cpp | 16 +- src/ocean/ocean_alt.cpp | 29 ++-- src/ocean/ocean_alt.h | 10 +- 11 files changed, 141 insertions(+), 153 deletions(-) diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps index 555f564..81bd2d5 100644 Binary files a/cmake-build-debug/.ninja_deps and b/cmake-build-debug/.ninja_deps differ diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log index 79524e7..051ba0e 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -1,93 +1,88 @@ # ninja log v5 -1333 1437 1713917141401623831 .rcc/qrc_Resources.cpp e023bb8377457e1b -1439 2719 1713917142656258881 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba -52 968 1713917856505702924 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a -12 47 1713917855590195764 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -1330 3635 1713917186769007671 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 -1438 3412 1713917143367889113 CMakeFiles/ocean.dir/src/graphics/shader.cpp.o 267b6ae673a33204 -1331 3706 1713917186839824138 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b -12 47 1713917855590195764 ocean_autogen/timestamp 43dd0284b7c480b9 -1899 4665 1712645732404853458 CMakeFiles/ocean.dir/src/graphics/camera.cpp.o d624ce2b01ab1415 -1333 1437 1713917141401623831 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp e023bb8377457e1b -1 208 1714786291867142933 build.ninja dbd6bd50c232cbc4 -12 47 1713917855590195764 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -12 47 1713917855590195764 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -78 462 1712645728224399674 CMakeFiles/StaticGLEW.dir/glew/src/glew.c.o 4784775df883673d -12 33 1713917139998018391 StaticGLEW_autogen/timestamp dc143b4497306125 -1904 5414 1712645733171665244 CMakeFiles/ocean.dir/src/graphics/meshloader.cpp.o 64961778db90f56 -12 33 1713917139998018391 StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 -12 33 1713917139998018391 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 -1902 2870 1712645730631460765 CMakeFiles/ocean.dir/src/graphics/graphicsdebug.cpp.o bf7241321ed3a409 -463 572 1712645728339241000 libStaticGLEW.a 8b4a852037c57830 -968 1075 1713917856615529278 ocean 90ea6245b9d0c531 -3412 4869 1713917144826092516 CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o 5414beaf8d128308 -1331 4074 1713917187206607334 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 -1331 3598 1713917186729125538 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd -1438 3673 1713917143625324175 CMakeFiles/ocean.dir/src/graphics/shape.cpp.o fad1395b11fceaa7 -78 110 1712645727876186134 CMakeFiles/StaticGLEW.dir/StaticGLEW_autogen/mocs_compilation.cpp.o cf14dd1335b34a8d -1331 3600 1713917186727894781 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 -12 33 1713917139998018391 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/timestamp dc143b4497306125 -12 41 1714798632131430431 StaticGLEW_autogen/timestamp dc143b4497306125 -12 41 1714798632131430431 StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 12 41 1714798632131430431 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/timestamp dc143b4497306125 -12 41 1714798632131430431 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 -42 3358 1714798635444441414 CMakeFiles/StaticGLEW.dir/glew/src/glew.c.o 4784775df883673d +1645 4059 1714849325058746610 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 +78 110 1712645727876186134 CMakeFiles/StaticGLEW.dir/StaticGLEW_autogen/mocs_compilation.cpp.o cf14dd1335b34a8d +5173 6594 1714798638674541274 CMakeFiles/ocean.dir/src/graphics/shape.cpp.o fad1395b11fceaa7 +1647 4944 1714849325940198995 CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o 5414beaf8d128308 +4944 5062 1714849326069646592 ocean 90ea6245b9d0c531 +1645 4083 1714849325084208159 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd +1646 4515 1714849325508570672 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 3358 3439 1714798635528627000 libStaticGLEW.a 8b4a852037c57830 -3439 4792 1714798636872158000 ocean_autogen/timestamp 43dd0284b7c480b9 -3439 4792 1714798636872158000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -3439 4792 1714798636872158000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -3439 4792 1714798636872158000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -4792 5172 1714798637261124932 .rcc/qrc_Resources.cpp e023bb8377457e1b -4792 5172 1714798637261124932 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp e023bb8377457e1b 5173 5621 1714798637703869673 CMakeFiles/ocean.dir/src/graphics/graphicsdebug.cpp.o bf7241321ed3a409 -5622 6431 1714798638512399688 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba +12 41 1714798632131430431 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 +12 41 1714798632131430431 StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 +1904 5414 1712645733171665244 CMakeFiles/ocean.dir/src/graphics/meshloader.cpp.o 64961778db90f56 +12 41 1714798632131430431 StaticGLEW_autogen/timestamp dc143b4497306125 +1 208 1714786291867142933 build.ninja dbd6bd50c232cbc4 +13 1443 1714849322439247000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +1444 1644 1714849322652629849 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp e023bb8377457e1b +42 3358 1714798635444441414 CMakeFiles/StaticGLEW.dir/glew/src/glew.c.o 4784775df883673d +13 1443 1714849322439247000 /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 1443 1714849322439247000 ocean_autogen/timestamp 43dd0284b7c480b9 +13 1443 1714849322439247000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +1644 3711 1714849324706874005 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 5173 6446 1714798638528665913 CMakeFiles/ocean.dir/src/graphics/shader.cpp.o 267b6ae673a33204 -5173 6594 1714798638674541274 CMakeFiles/ocean.dir/src/graphics/shape.cpp.o fad1395b11fceaa7 -5172 6851 1714798638931534716 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 -5173 6859 1714798638940270452 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd -5172 6863 1714798638943556656 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 -5173 6938 1714798639020321413 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b -5173 7260 1714798639339879092 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 -6431 7368 1714798639451247172 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a -6447 9051 1714798641130168275 CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o 5414beaf8d128308 -9051 10745 1714798642832279926 ocean 90ea6245b9d0c531 -12 51 1714801194122244387 ocean_autogen/timestamp 43dd0284b7c480b9 -12 51 1714801194122244387 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -12 51 1714801194122244387 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -12 51 1714801194122244387 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -56 1066 1714801195131066149 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a -56 2187 1714801196248483555 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 -2188 2313 1714801196380715842 ocean 90ea6245b9d0c531 -17 1717 1714812132839010000 ocean_autogen/timestamp 43dd0284b7c480b9 -17 1717 1714812132839010000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -17 1717 1714812132839010000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -17 1717 1714812132839010000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -1724 3907 1714812135011171863 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a -1722 5371 1714812136479044736 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd -1718 5472 1714812136600576885 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 -1717 5474 1714812136600564760 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 -1723 5598 1714812136728730472 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b -1723 6082 1714812137211799059 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 -6083 6248 1714812137386217878 ocean 90ea6245b9d0c531 -11 1611 1714812174386497000 ocean_autogen/timestamp 43dd0284b7c480b9 -11 1611 1714812174386497000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -11 1611 1714812174386497000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -11 1611 1714812174386497000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -1620 3628 1714812176408085106 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a -1618 4917 1714812177706368489 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 -1615 4968 1714812177759491407 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 -1619 4978 1714812177768178033 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd -1620 5107 1714812177901659029 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b -1620 5391 1714812178185025617 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 -5391 5531 1714812178332257566 ocean 90ea6245b9d0c531 -13 1772 1714812279532185000 ocean_autogen/timestamp 43dd0284b7c480b9 -13 1772 1714812279532185000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -13 1772 1714812279532185000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -13 1772 1714812279532185000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -1789 4072 1714812281836208149 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a -1780 5307 1714812283076607493 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 -1773 5472 1714812283245428573 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 -1782 5484 1714812283254808860 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd -1784 5550 1714812283322310684 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b -1788 5908 1714812283679485577 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 -5908 6038 1714812283817538447 ocean 90ea6245b9d0c531 +1646 3824 1714849324823821994 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b +1444 1644 1714849322652629849 .rcc/qrc_Resources.cpp e023bb8377457e1b +5622 6431 1714798638512399688 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba +1647 2974 1714849323972820909 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a +12 1343 1714849489919521000 ocean_autogen/timestamp 43dd0284b7c480b9 +12 1343 1714849489919521000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 1343 1714849489919521000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +12 1343 1714849489919521000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +1343 3058 1714849491634745870 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 +1344 3066 1714849491644097365 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd +1343 3071 1714849491648431194 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 +12 54 1714849512803933609 ocean_autogen/timestamp 43dd0284b7c480b9 +12 54 1714849512803933609 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 54 1714849512803933609 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +12 54 1714849512803933609 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +59 2256 1714849514995444844 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 +2256 2378 1714849515124708731 ocean 90ea6245b9d0c531 +12 48 1714849546910108212 ocean_autogen/timestamp 43dd0284b7c480b9 +12 48 1714849546910108212 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 48 1714849546910108212 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +12 48 1714849546910108212 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 903 1714849585867613000 ocean_autogen/timestamp 43dd0284b7c480b9 +12 903 1714849585867613000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 903 1714849585867613000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +12 903 1714849585867613000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +13 1371 1714849679964127000 ocean_autogen/timestamp 43dd0284b7c480b9 +13 1371 1714849679964127000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +13 1371 1714849679964127000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +13 1371 1714849679964127000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 1419 1714849740909476000 ocean_autogen/timestamp 43dd0284b7c480b9 +12 1419 1714849740909476000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 1419 1714849740909476000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +12 1419 1714849740909476000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +1420 3366 1714849742859070429 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd +1419 3374 1714849742869732936 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 +1419 3406 1714849742902087877 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 +1421 3822 1714849743317925525 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 +3822 3938 1714849743440390980 ocean 90ea6245b9d0c531 +13 50 1714849812101018777 ocean_autogen/timestamp 43dd0284b7c480b9 +13 50 1714849812101018777 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +13 50 1714849812101018777 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +13 50 1714849812101018777 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +55 2158 1714849814198824051 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 +2159 2268 1714849814316943052 ocean 90ea6245b9d0c531 +12 47 1714849854255275738 ocean_autogen/timestamp 43dd0284b7c480b9 +12 47 1714849854255275738 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 47 1714849854255275738 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +12 47 1714849854255275738 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +52 2271 1714849856467743692 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 +2271 2381 1714849856586742326 ocean 90ea6245b9d0c531 +12 1395 1714850004866419000 ocean_autogen/timestamp 43dd0284b7c480b9 +12 1395 1714850004866419000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 1395 1714850004866419000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +12 1395 1714850004866419000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +1395 3342 1714850006815112363 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 +1395 3348 1714850006819452984 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 +1396 3357 1714850006832743054 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd +12 49 1714850057707318528 ocean_autogen/timestamp 43dd0284b7c480b9 +12 49 1714850057707318528 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 49 1714850057707318528 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +12 49 1714850057707318528 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +53 2317 1714850059965615495 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 +2317 2433 1714850060089833714 ocean 90ea6245b9d0c531 diff --git a/cmake-build-debug/.rcc/qrc_Resources.cpp b/cmake-build-debug/.rcc/qrc_Resources.cpp index 6d3c58c..32602c5 100644 --- a/cmake-build-debug/.rcc/qrc_Resources.cpp +++ b/cmake-build-debug/.rcc/qrc_Resources.cpp @@ -383,7 +383,7 @@ static const unsigned char qt_resource_data[] = { // /Users/sotech117/Documents/final/adv/ocean-simulation/resources/shaders/shader.frag 0x0,0x0,0x12,0x6a, 0x23, - 0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x33,0x33,0x30,0x20,0x63,0x6f,0x72,0x65, + 0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x34,0x31,0x30,0x20,0x63,0x6f,0x72,0x65, 0xa,0x6f,0x75,0x74,0x20,0x76,0x65,0x63,0x34,0x20,0x66,0x72,0x61,0x67,0x43,0x6f, 0x6c,0x6f,0x72,0x3b,0xa,0xa,0x69,0x6e,0x20,0x76,0x65,0x63,0x33,0x20,0x6e,0x6f, 0x72,0x6d,0x61,0x6c,0x5f,0x63,0x61,0x6d,0x65,0x72,0x61,0x53,0x70,0x61,0x63,0x65, @@ -292539,7 +292539,7 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x1,0x8f,0x41,0x3a,0x4b,0x8f, // :/resources/shaders/shader.frag 0x0,0x0,0x1,0x8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x16,0x18, -0x0,0x0,0x1,0x8f,0x41,0x3a,0x4b,0x8f, +0x0,0x0,0x1,0x8f,0x44,0xe8,0xa7,0xca, // :/resources/images/caustic_sample.jpg 0x0,0x0,0x1,0x24,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x28,0x86, 0x0,0x0,0x1,0x8f,0x2a,0xcf,0x26,0x6b, diff --git a/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt b/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt index 94dcfa7..d55e7dc 100644 --- a/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt +++ b/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt @@ -1,16 +1,12 @@ # Generated by CMake. Changes will be overwritten. -/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean_alt.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean_alt.cpp -/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.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.cpp -/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/graphics/meshloader.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.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/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/glwidget.h mmc:Q_OBJECT - mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.h + mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/moc_predefs.h mdp:/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/Availability.h mdp:/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/AvailabilityInternal.h @@ -1071,7 +1067,6 @@ mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/Eigen/src/plugins/ReshapedMethods.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/glew/include/GL/glew.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/arap.h - mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.h @@ -1387,25 +1382,21 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qopenglwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsglobal.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QMainWindow mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QWidget - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qmainwindow.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qsizepolicy.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtabwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgets-config.h 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/main.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/meshloader.cpp +/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/camera.h -/Users/sotech117/Documents/final/adv/ocean-simulation/util/tiny_obj_loader.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h +/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/mainwindow.h mmc:Q_OBJECT - mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h + mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/moc_predefs.h mdp:/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/Availability.h mdp:/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/AvailabilityInternal.h @@ -2466,6 +2457,7 @@ mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/Eigen/src/plugins/ReshapedMethods.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/glew/include/GL/glew.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/arap.h + mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/glwidget.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shader.h mdp:/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/shape.h @@ -2781,13 +2773,21 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qopenglwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsglobal.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QMainWindow mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QWidget + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qmainwindow.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qsizepolicy.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtabwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgets-config.h 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/graphics/camera.cpp -/Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/arap.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/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 diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index 48cd93c..2c5f261 100644 --- a/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: May 04 04:44 EDT +Start testing: May 04 15:14 EDT ---------------------------------------------------------- -End testing: May 04 04:44 EDT +End testing: May 04 15:14 EDT diff --git a/cmake-build-debug/ocean b/cmake-build-debug/ocean index 66cc53a..ff53975 100755 Binary files a/cmake-build-debug/ocean and b/cmake-build-debug/ocean differ diff --git a/resources/shaders/shader.frag b/resources/shaders/shader.frag index cc592c9..6d1bc57 100755 --- a/resources/shaders/shader.frag +++ b/resources/shaders/shader.frag @@ -1,4 +1,4 @@ -#version 330 core +#version 410 core out vec4 fragColor; in vec3 normal_cameraSpace; diff --git a/src/arap.cpp b/src/arap.cpp index 1228c08..2f10849 100644 --- a/src/arap.cpp +++ b/src/arap.cpp @@ -104,8 +104,8 @@ void ARAP::update(double seconds) // the last update m_ocean.fft_prime(m_time); - m_shape.setVertices_and_Normals(m_ocean.get_vertices(), m_ocean.getNormals()); - // m_shape.setVertices(m_ocean.get_vertices()); + // m_shape.setVertices_and_Normals(m_ocean.get_vertices(), m_ocean.getNormals()); + m_shape.setVertices(m_ocean.get_vertices()); m_time += m_timestep; diff --git a/src/glwidget.cpp b/src/glwidget.cpp index 0bf15d5..7d56389 100755 --- a/src/glwidget.cpp +++ b/src/glwidget.cpp @@ -189,14 +189,14 @@ void GLWidget::paintGL() glClear(GL_DEPTH_BUFFER_BIT); - m_pointShader->bind(); - m_pointShader->setUniform("proj", m_camera.getProjection()); - m_pointShader->setUniform("view", m_camera.getView()); - m_pointShader->setUniform("vSize", m_vSize); - m_pointShader->setUniform("width", width()); - m_pointShader->setUniform("height", height()); - m_arap.draw(m_pointShader, GL_POINTS); - m_pointShader->unbind(); +// m_pointShader->bind(); +// m_pointShader->setUniform("proj", m_camera.getProjection()); +// m_pointShader->setUniform("view", m_camera.getView()); +// m_pointShader->setUniform("vSize", m_vSize); +// m_pointShader->setUniform("width", width()); +// m_pointShader->setUniform("height", height()); +// m_arap.draw(m_pointShader, GL_POINTS); +// m_pointShader->unbind(); } void GLWidget::resizeGL(int w, int h) diff --git a/src/ocean/ocean_alt.cpp b/src/ocean/ocean_alt.cpp index dafa50b..d34ad55 100644 --- a/src/ocean/ocean_alt.cpp +++ b/src/ocean/ocean_alt.cpp @@ -132,20 +132,13 @@ Eigen::Vector2d ocean_alt::h_prime_t(int i, double t){ Eigen::Vector2d neg_complex_exp = complex_exp(-w_prime*t); // vector(real, imag) // now multiply our four vector(real, imag) out - double real_comp = - h0_prime[0]*pos_complex_exp[0] - - h0_prime[1]*pos_complex_exp[1] - + h0_prime_conj[0]*neg_complex_exp[0] - + h0_prime_conj[1]*neg_complex_exp[1]; + (h0_prime[0]*pos_complex_exp[0] - h0_prime[1]*pos_complex_exp[1]) + + (h0_prime_conj[0]*neg_complex_exp[0] - h0_prime_conj[1]*neg_complex_exp[1]); double imag_comp = - h0_prime[0]*pos_complex_exp[1] - + h0_prime[1]*pos_complex_exp[0] - + h0_prime_conj[0]*neg_complex_exp[1] - - h0_prime_conj[1]*neg_complex_exp[0]; - - + (h0_prime[0]*pos_complex_exp[1] + h0_prime[1]*pos_complex_exp[0]) + + (h0_prime_conj[0]*neg_complex_exp[1] + h0_prime_conj[1]*neg_complex_exp[0]); return Eigen::Vector2d(real_comp, imag_comp); } @@ -201,8 +194,8 @@ Eigen::Vector2d ocean_alt::get_k_vector(int n_prime, int m_prime){ double N_ = (double)num_rows; double M_ = (double)num_cols; - double k_x = (2.0*M_PI*n_ - M_PI*N_)/Lx; - double k_z = (2.0*M_PI*m_ - M_PI*M_)/Lz; + double k_x = (2*M_PI*n_ - M_PI*N_)/Lx; + double k_z = (2*M_PI*m_ - M_PI*M_)/Lz; return Eigen::Vector2d(k_x, k_z); } @@ -247,8 +240,8 @@ std::pair ocean_alt::sample_complex_gaussian(){ } // real and imaginary parts of the complex number - double real = sqrt(-2 * log(uniform_1)) * cos(2 * M_PI * uniform_2); - double imag = sqrt(-2 * log(uniform_1)) * sin(2 * M_PI * uniform_2); + double real = sqrt(-2*log(uniform_1)) * cos(2*M_PI*uniform_2); + double imag = sqrt(-2*log(uniform_1)) * sin(2*M_PI*uniform_2); return std::make_pair(real, imag); } @@ -280,8 +273,8 @@ std::vector ocean_alt::get_vertices() Eigen::Vector3f norm = Eigen::Vector3f(diff[0]/ sqrt(xs), diff[1]/ sqrt(ys), diff[2]/sqrt(zs)); // NEW -// Eigen::Vector3f norm = Eigen::Vector3f(-slope[0], 1.0, -slope[1]); -// norm.normalize(); + // Eigen::Vector3f norm = Eigen::Vector3f(-slope[0], 1.0, -slope[1]); + // norm.normalize(); // NEW @@ -452,7 +445,7 @@ std::vector ocean_alt::fast_fft for (int i = 0; i < N; i++) { // h[i] /= N; - // h[i] /= sqrt(N); + h[i] /= sqrt(N); h[i] *= sign[(i / num_rows + i % num_cols) % 2]; } diff --git a/src/ocean/ocean_alt.h b/src/ocean/ocean_alt.h index a3f1be5..4bb1d54 100644 --- a/src/ocean/ocean_alt.h +++ b/src/ocean/ocean_alt.h @@ -60,18 +60,18 @@ private: - const double Lx = 32.0; - const double Lz = 32.0; + const double Lx = 512.0; + const double Lz = 512.0; const int num_rows = 256; const int num_cols = 256; const int N = num_rows*num_cols; // total number of grid points - const double lambda = 0.4; // how much displacement matters + const double lambda = 0; // how much displacement matters const double spacing = 35.0; // spacing between grid points - const double A = .25; // numeric constant for the Phillips spectrum - const double V = 49; // wind speed + const double A = 100; // numeric constant for the Phillips spectrum + const double V = 50; // wind speed const double gravity = 9.81; const double L = V*V/gravity; const Eigen::Vector2d omega_wind = Eigen::Vector2d(1.0, 0.0); // wind direction, used in Phillips equation -- cgit v1.2.3-70-g09d2