From 0d6b3ded83f583a858368b1bbceda60ba65453a2 Mon Sep 17 00:00:00 2001 From: sotech117 Date: Thu, 9 May 2024 15:29:13 -0400 Subject: fix spacing on wave, fix normals and displacement, add retiling --- cmake-build-debug/.ninja_log | 125 ++++++++++++++----------------------------- 1 file changed, 39 insertions(+), 86 deletions(-) (limited to 'cmake-build-debug/.ninja_log') diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log index 051ba0e..371a403 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -1,88 +1,41 @@ # ninja log v5 -12 41 1714798632131430431 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/timestamp dc143b4497306125 -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 -5173 5621 1714798637703869673 CMakeFiles/ocean.dir/src/graphics/graphicsdebug.cpp.o bf7241321ed3a409 -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 +2947 4344 1715274669529296463 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba +1848 2039 1715274667230803612 .rcc/qrc_Resources.cpp e023bb8377457e1b +54 1003 1715281217677853384 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a +1461 4462 1715280373353844511 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b +1452 4403 1715280373286798214 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 +13 50 1715281216730706979 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +2046 4734 1715274669919280047 CMakeFiles/ocean.dir/src/graphics/shader.cpp.o 267b6ae673a33204 +13 50 1715281216730706979 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 -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 +1848 2039 1715274667230803612 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp e023bb8377457e1b +0 312 1715274665170073627 build.ninja dbd6bd50c232cbc4 +13 50 1715281216730706979 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +13 50 1715281216730706979 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +39 439 1715274665627645867 CMakeFiles/StaticGLEW.dir/glew/src/glew.c.o 4784775df883673d +13 38 1715274665230530986 StaticGLEW_autogen/timestamp dc143b4497306125 +1904 5414 1712645733171665244 CMakeFiles/ocean.dir/src/graphics/meshloader.cpp.o 64961778db90f56 +13 38 1715274665230530986 StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 +13 38 1715274665230530986 /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 +1003 1128 1715281217805809420 ocean 90ea6245b9d0c531 +4734 7910 1715274673090001677 CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o 5414beaf8d128308 +1465 4774 1715280373664251970 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 +1454 4406 1715280373288458479 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd +2048 5185 1715274670365151792 CMakeFiles/ocean.dir/src/graphics/shape.cpp.o fad1395b11fceaa7 +78 110 1712645727876186134 CMakeFiles/StaticGLEW.dir/StaticGLEW_autogen/mocs_compilation.cpp.o cf14dd1335b34a8d +1453 4308 1715280373192267033 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 +13 38 1715274665230530986 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/timestamp dc143b4497306125 +12 50 1715281268927907042 ocean_autogen/timestamp 43dd0284b7c480b9 +12 50 1715281268927907042 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 50 1715281268927907042 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +12 50 1715281268927907042 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +55 1023 1715281269895587725 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a +1023 1134 1715281270009164793 ocean 90ea6245b9d0c531 +16 64 1715281338252186848 ocean_autogen/timestamp 43dd0284b7c480b9 +16 64 1715281338252186848 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +16 64 1715281338252186848 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +16 64 1715281338252186848 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +69 1286 1715281339468067863 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a +1286 1448 1715281339634009005 ocean 90ea6245b9d0c531 -- cgit v1.2.3-70-g09d2 From 14684344d553dee4b3cc252709716bff927e85b8 Mon Sep 17 00:00:00 2001 From: sotech117 Date: Thu, 9 May 2024 19:36:42 -0400 Subject: change viewport --- cmake-build-debug/.ninja_deps | Bin 739504 -> 788852 bytes cmake-build-debug/.ninja_log | 24 +++++++++ .../CMakeFiles/ocean_autogen.dir/ParseCache.txt | 54 ++++++++++----------- cmake-build-debug/Testing/Temporary/LastTest.log | 4 +- cmake-build-debug/ocean | Bin 8748664 -> 8638680 bytes src/arap.cpp | 16 +++++- src/ocean/ocean_alt.cpp | 2 +- src/ocean/ocean_alt.h | 2 +- 8 files changed, 69 insertions(+), 33 deletions(-) (limited to 'cmake-build-debug/.ninja_log') diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps index b1b950d..da58100 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 371a403..bb67914 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -39,3 +39,27 @@ 16 64 1715281338252186848 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 69 1286 1715281339468067863 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a 1286 1448 1715281339634009005 ocean 90ea6245b9d0c531 +12 1510 1715297341380746000 ocean_autogen/timestamp 43dd0284b7c480b9 +12 1510 1715297341380746000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +12 1510 1715297341380746000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +12 1510 1715297341380746000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +1521 3259 1715297343146557713 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a +1521 4165 1715297344049177658 CMakeFiles/ocean.dir/src/graphics/shape.cpp.o fad1395b11fceaa7 +1511 4736 1715297344619832271 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 +1515 4798 1715297344682105484 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd +1520 4836 1715297344714963200 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b +1512 4844 1715297344718772169 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 +1520 5532 1715297345415079003 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 +5533 5683 1715297345575695612 ocean 90ea6245b9d0c531 +15 65 1715297382540457798 ocean_autogen/timestamp 43dd0284b7c480b9 +15 65 1715297382540457798 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +15 65 1715297382540457798 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +15 65 1715297382540457798 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +69 1891 1715297384358715306 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b +1891 2012 1715297384485096862 ocean 90ea6245b9d0c531 +13 50 1715297426833568293 ocean_autogen/timestamp 43dd0284b7c480b9 +13 50 1715297426833568293 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +13 50 1715297426833568293 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +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 +1741 1862 1715297428643492070 ocean 90ea6245b9d0c531 diff --git a/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt b/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt index 363ebe7..5a5531e 100644 --- a/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt +++ b/cmake-build-debug/CMakeFiles/ocean_autogen.dir/ParseCache.txt @@ -1,11 +1,16 @@ # Generated by CMake. Changes will be overwritten. -/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/src/glwidget.h +/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 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 @@ -1066,6 +1071,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 @@ -1381,22 +1387,26 @@ 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/util/tiny_obj_loader.h -/Users/sotech117/Documents/final/adv/ocean-simulation/src/graphics/camera.h -/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/mainwindow.h +/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/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/graphics/shape.cpp +/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 @@ -2457,7 +2467,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 @@ -2773,21 +2782,12 @@ 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/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 +/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 diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index 41fa4a8..e8078db 100644 --- a/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: May 09 15:02 EDT +Start testing: May 09 19:30 EDT ---------------------------------------------------------- -End testing: May 09 15:02 EDT +End testing: May 09 19:30 EDT diff --git a/cmake-build-debug/ocean b/cmake-build-debug/ocean index 552319e..4d11337 100755 Binary files a/cmake-build-debug/ocean and b/cmake-build-debug/ocean differ diff --git a/src/arap.cpp b/src/arap.cpp index 729de07..08f2e15 100644 --- a/src/arap.cpp +++ b/src/arap.cpp @@ -49,8 +49,20 @@ void ARAP::init coeffMin = all_vertices.colwise().minCoeff(); coeffMax = all_vertices.colwise().maxCoeff(); - minCorner = coeffMin; - maxCorner = coeffMax; +// minCorner = coeffMin; +// maxCorner = coeffMax; + + std::cout << "minCorner: " << minCorner << std::endl; + std::cout << "maxCorner: " << maxCorner << std::endl; + + minCorner = Vector3f(0.0f, 0.0f, 0.0f); + maxCorner = Vector3f(1.0f, 0.0f, 1.0f); + + std::cout << "minCorner: " << minCorner << std::endl; + std::cout << "maxCorner: " << maxCorner << std::endl; +// +// minCorner = Vector3f(-1.0f, -1.0f, -1.0f); +// maxCorner = Vector3f(1.0f, 1.0f, 1.0f); // m_shape.initGroundPlane("cornell_box_full_lighting.png") diff --git a/src/ocean/ocean_alt.cpp b/src/ocean/ocean_alt.cpp index 6355abd..6636e62 100644 --- a/src/ocean/ocean_alt.cpp +++ b/src/ocean/ocean_alt.cpp @@ -312,7 +312,7 @@ void ocean_alt::update_ocean() // NEW Eigen::Vector3f norm = Eigen::Vector3f(-m_slopes_x[i][0], 1.0, -m_slopes_z[i][0]); - norm = -norm.normalized(); // FIXME: why do I have to be inverted? + norm = norm.normalized(); // FIXME: why do I have to be inverted? //if (i==6) std::cout << amplitude[0] << std::endl; diff --git a/src/ocean/ocean_alt.h b/src/ocean/ocean_alt.h index fa42d75..bf37b11 100644 --- a/src/ocean/ocean_alt.h +++ b/src/ocean/ocean_alt.h @@ -58,7 +58,7 @@ private: const int num_cols = 256; const int num_tiles_x = 1; - const int num_tiles_z = 1; + const int num_tiles_z = 2; const double vertex_displacement = Lx / 2; -- cgit v1.2.3-70-g09d2