diff --git a/cmake-build-debug/2023-2-8_0-47-21.log b/cmake-build-debug/2023-2-8_0-47-21.log deleted file mode 100644 index e69de29..0000000 diff --git a/cmake-build-debug/2023-2-8_13-11-3.log b/cmake-build-debug/2023-2-8_13-11-3.log deleted file mode 100644 index 45ec6cf..0000000 --- a/cmake-build-debug/2023-2-8_13-11-3.log +++ /dev/null @@ -1 +0,0 @@ -[13:11:03] [INFO]: Using GLAD GL 4.6 diff --git a/cmake-build-debug/2023-2-8_13-15-26.log b/cmake-build-debug/2023-2-8_13-15-26.log deleted file mode 100644 index e69de29..0000000 diff --git a/cmake-build-debug/2023-2-8_13-16-49.log b/cmake-build-debug/2023-2-8_13-16-49.log deleted file mode 100644 index e69de29..0000000 diff --git a/cmake-build-debug/2023-2-8_13-41-22.log b/cmake-build-debug/2023-2-8_13-41-22.log deleted file mode 100644 index af8fd8d..0000000 --- a/cmake-build-debug/2023-2-8_13-41-22.log +++ /dev/null @@ -1,236 +0,0 @@ -[13:41:22] [INFO]: Using GLAD GL 4.6 -[13:41:24] [DEBUG]: R Key is pressed! -[13:41:24] [TRACE]: R Key Single Press! -[13:41:24] [DEBUG]: R Key is pressed! -[13:41:24] [DEBUG]: R Key is pressed! -[13:41:24] [DEBUG]: R Key is pressed! -[13:41:24] [DEBUG]: R Key is pressed! -[13:41:24] [DEBUG]: R Key is pressed! -[13:41:24] [DEBUG]: R Key is pressed! -[13:41:24] [DEBUG]: R Key is pressed! -[13:41:24] [DEBUG]: R Key is pressed! -[13:41:24] [DEBUG]: R Key is pressed! -[13:41:24] [DEBUG]: R Key is pressed! -[13:41:24] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [TRACE]: R Key Single Press! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:26] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [TRACE]: R Key Single Press! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:30] [DEBUG]: R Key is pressed! -[13:41:31] [DEBUG]: R Key is pressed! -[13:41:31] [TRACE]: R Key Single Press! -[13:41:31] [DEBUG]: R Key is pressed! -[13:41:31] [DEBUG]: R Key is pressed! -[13:41:31] [DEBUG]: R Key is pressed! -[13:41:31] [DEBUG]: R Key is pressed! -[13:41:31] [DEBUG]: R Key is pressed! -[13:41:31] [DEBUG]: R Key is pressed! -[13:41:31] [DEBUG]: R Key is pressed! -[13:41:31] [DEBUG]: R Key is pressed! -[13:41:31] [DEBUG]: R Key is pressed! -[13:41:31] [DEBUG]: R Key is pressed! -[13:41:31] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:32] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [TRACE]: R Key Single Press! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:33] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [TRACE]: R Key Single Press! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:35] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [TRACE]: R Key Single Press! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:38] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! -[13:41:39] [DEBUG]: R Key is pressed! diff --git a/cmake-build-debug/2023-2-8_13-5-51.log b/cmake-build-debug/2023-2-8_13-5-51.log deleted file mode 100644 index e69de29..0000000 diff --git a/cmake-build-debug/2023-2-8_13-59-18.log b/cmake-build-debug/2023-2-8_13-59-18.log deleted file mode 100644 index 090f361..0000000 --- a/cmake-build-debug/2023-2-8_13-59-18.log +++ /dev/null @@ -1,8 +0,0 @@ -[13:59:18] [INFO]: Using GLAD GL 4.6 -[13:59:20] [DEBUG]: R Key is pressed! -[13:59:20] [TRACE]: R Key Single Press! -[13:59:20] [DEBUG]: R Key is pressed! -[13:59:20] [DEBUG]: R Key is pressed! -[13:59:20] [DEBUG]: R Key is pressed! -[13:59:20] [DEBUG]: R Key is pressed! -[13:59:20] [DEBUG]: R Key is pressed! diff --git a/cmake-build-debug/2023-2-8_13-6-1.log b/cmake-build-debug/2023-2-8_13-6-1.log deleted file mode 100644 index e69de29..0000000 diff --git a/cmake-build-debug/2023-2-8_13-8-34.log b/cmake-build-debug/2023-2-8_13-8-34.log deleted file mode 100644 index e69de29..0000000 diff --git a/cmake-build-debug/2023-2-8_14-2-6.log b/cmake-build-debug/2023-2-8_14-2-6.log deleted file mode 100644 index 99aba44..0000000 --- a/cmake-build-debug/2023-2-8_14-2-6.log +++ /dev/null @@ -1,10 +0,0 @@ -[14:02:06] [INFO]: Using GLAD GL 4.6 -[14:02:08] [DEBUG]: R Key is pressed! -[14:02:08] [TRACE]: R Key Single Press! -[14:02:08] [DEBUG]: R Key is pressed! -[14:02:08] [DEBUG]: R Key is pressed! -[14:02:08] [DEBUG]: R Key is pressed! -[14:02:08] [DEBUG]: R Key is pressed! -[14:02:08] [DEBUG]: R Key is pressed! -[14:02:08] [DEBUG]: R Key is pressed! -[14:02:08] [DEBUG]: R Key is pressed! diff --git a/cmake-build-emrelease/CMakeCache.txt b/cmake-build-emrelease/CMakeCache.txt index eb1b9ac..a8090f1 100644 --- a/cmake-build-emrelease/CMakeCache.txt +++ b/cmake-build-emrelease/CMakeCache.txt @@ -58,7 +58,7 @@ CMAKE_AR:FILEPATH=emar //Choose the type of build, options are: None Debug Release RelWithDebInfo // MinSizeRel ... -CMAKE_BUILD_TYPE:STRING=Debug +CMAKE_BUILD_TYPE:STRING=Release //Enable/Disable color output during build. CMAKE_COLOR_MAKEFILE:BOOL=ON @@ -234,16 +234,16 @@ CMAKE_PROJECT_HOMEPAGE_URL:STATIC= CMAKE_PROJECT_NAME:STATIC=FinalProject //Value Computed by CMake -CMAKE_PROJECT_VERSION:STATIC=0.4.0 +CMAKE_PROJECT_VERSION:STATIC=0.5.1 //Value Computed by CMake CMAKE_PROJECT_VERSION_MAJOR:STATIC=0 //Value Computed by CMake -CMAKE_PROJECT_VERSION_MINOR:STATIC=4 +CMAKE_PROJECT_VERSION_MINOR:STATIC=5 //Value Computed by CMake -CMAKE_PROJECT_VERSION_PATCH:STATIC=0 +CMAKE_PROJECT_VERSION_PATCH:STATIC=1 //Value Computed by CMake CMAKE_PROJECT_VERSION_TWEAK:STATIC= diff --git a/cmake-build-emrelease/CMakeFiles/3.25.1/CMakeSystem.cmake b/cmake-build-emrelease/CMakeFiles/3.25.1/CMakeSystem.cmake index 7a7859f..c57d7e7 100644 --- a/cmake-build-emrelease/CMakeFiles/3.25.1/CMakeSystem.cmake +++ b/cmake-build-emrelease/CMakeFiles/3.25.1/CMakeSystem.cmake @@ -1,6 +1,6 @@ -set(CMAKE_HOST_SYSTEM "Linux-6.1.0-3-amd64") +set(CMAKE_HOST_SYSTEM "Linux-6.1.0-5-amd64") set(CMAKE_HOST_SYSTEM_NAME "Linux") -set(CMAKE_HOST_SYSTEM_VERSION "6.1.0-3-amd64") +set(CMAKE_HOST_SYSTEM_VERSION "6.1.0-5-amd64") set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64") include("/usr/share/emscripten/cmake/Modules/Platform/Emscripten.cmake") diff --git a/cmake-build-emrelease/CMakeFiles/CMakeOutput.log b/cmake-build-emrelease/CMakeFiles/CMakeOutput.log index b24e45e..f06d64c 100644 --- a/cmake-build-emrelease/CMakeFiles/CMakeOutput.log +++ b/cmake-build-emrelease/CMakeFiles/CMakeOutput.log @@ -1,30 +1,30 @@ The target system is: Emscripten - 1 - x86 -The host system is: Linux - 6.1.0-3-amd64 - x86_64 +The host system is: Linux - 6.1.0-5-amd64 - x86_64 Determining if the include file unistd.h exists passed with the following output: -Change Dir: /home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-YoGmv6 +Change Dir: /home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-R1cnjV -Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_20850/fast && /usr/bin/gmake -f CMakeFiles/cmTC_20850.dir/build.make CMakeFiles/cmTC_20850.dir/build -gmake[1]: Entering directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-YoGmv6' -Building C object CMakeFiles/cmTC_20850.dir/CheckIncludeFile.c.o -/usr/bin/emcc -MD -MT CMakeFiles/cmTC_20850.dir/CheckIncludeFile.c.o -MF CMakeFiles/cmTC_20850.dir/CheckIncludeFile.c.o.d -o CMakeFiles/cmTC_20850.dir/CheckIncludeFile.c.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-YoGmv6/CheckIncludeFile.c" -Linking C executable cmTC_20850.js -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_20850.dir/link.txt --verbose=1 -/usr/bin/emcc @CMakeFiles/cmTC_20850.dir/objects1 -o cmTC_20850.js -gmake[1]: Leaving directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-YoGmv6' +Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_8162d/fast && /usr/bin/gmake -f CMakeFiles/cmTC_8162d.dir/build.make CMakeFiles/cmTC_8162d.dir/build +gmake[1]: Entering directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-R1cnjV' +Building C object CMakeFiles/cmTC_8162d.dir/CheckIncludeFile.c.o +/usr/bin/emcc -MD -MT CMakeFiles/cmTC_8162d.dir/CheckIncludeFile.c.o -MF CMakeFiles/cmTC_8162d.dir/CheckIncludeFile.c.o.d -o CMakeFiles/cmTC_8162d.dir/CheckIncludeFile.c.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-R1cnjV/CheckIncludeFile.c" +Linking C executable cmTC_8162d.js +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_8162d.dir/link.txt --verbose=1 +/usr/bin/emcc @CMakeFiles/cmTC_8162d.dir/objects1 -o cmTC_8162d.js +gmake[1]: Leaving directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-R1cnjV' Determining if the include file fcntl.h exists passed with the following output: -Change Dir: /home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-xPVPFz +Change Dir: /home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-fztl4Q -Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_ed00e/fast && /usr/bin/gmake -f CMakeFiles/cmTC_ed00e.dir/build.make CMakeFiles/cmTC_ed00e.dir/build -gmake[1]: Entering directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-xPVPFz' -Building C object CMakeFiles/cmTC_ed00e.dir/CheckIncludeFile.c.o -/usr/bin/emcc -MD -MT CMakeFiles/cmTC_ed00e.dir/CheckIncludeFile.c.o -MF CMakeFiles/cmTC_ed00e.dir/CheckIncludeFile.c.o.d -o CMakeFiles/cmTC_ed00e.dir/CheckIncludeFile.c.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-xPVPFz/CheckIncludeFile.c" -Linking C executable cmTC_ed00e.js -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_ed00e.dir/link.txt --verbose=1 -/usr/bin/emcc @CMakeFiles/cmTC_ed00e.dir/objects1 -o cmTC_ed00e.js -gmake[1]: Leaving directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-xPVPFz' +Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_3ae2a/fast && /usr/bin/gmake -f CMakeFiles/cmTC_3ae2a.dir/build.make CMakeFiles/cmTC_3ae2a.dir/build +gmake[1]: Entering directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-fztl4Q' +Building C object CMakeFiles/cmTC_3ae2a.dir/CheckIncludeFile.c.o +/usr/bin/emcc -MD -MT CMakeFiles/cmTC_3ae2a.dir/CheckIncludeFile.c.o -MF CMakeFiles/cmTC_3ae2a.dir/CheckIncludeFile.c.o.d -o CMakeFiles/cmTC_3ae2a.dir/CheckIncludeFile.c.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-fztl4Q/CheckIncludeFile.c" +Linking C executable cmTC_3ae2a.js +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_3ae2a.dir/link.txt --verbose=1 +/usr/bin/emcc @CMakeFiles/cmTC_3ae2a.dir/objects1 -o cmTC_3ae2a.js +gmake[1]: Leaving directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-fztl4Q' diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/DependInfo.cmake b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/DependInfo.cmake index 838740f..9b32cab 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/DependInfo.cmake +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/DependInfo.cmake @@ -11,8 +11,12 @@ set(CMAKE_DEPENDS_DEPENDENCY_FILES "/home/brett/Documents/Brock/CS 3P98/Final Project/src/main.cpp" "CMakeFiles/FinalProject.dir/src/main.cpp.o" "gcc" "CMakeFiles/FinalProject.dir/src/main.cpp.o.d" "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/camera.cpp" "CMakeFiles/FinalProject.dir/src/render/camera.cpp.o" "gcc" "CMakeFiles/FinalProject.dir/src/render/camera.cpp.o.d" "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/gl.cpp" "CMakeFiles/FinalProject.dir/src/render/gl.cpp.o" "gcc" "CMakeFiles/FinalProject.dir/src/render/gl.cpp.o.d" + "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/textures.cpp" "CMakeFiles/FinalProject.dir/src/render/textures.cpp.o" "gcc" "CMakeFiles/FinalProject.dir/src/render/textures.cpp.o.d" + "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/ui/debug.cpp" "CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o" "gcc" "CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o.d" "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/ui/text.cpp" "CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o" "gcc" "CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o.d" "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/window.cpp" "CMakeFiles/FinalProject.dir/src/render/window.cpp.o" "gcc" "CMakeFiles/FinalProject.dir/src/render/window.cpp.o.d" + "/home/brett/Documents/Brock/CS 3P98/Final Project/src/util/math.cpp" "CMakeFiles/FinalProject.dir/src/util/math.cpp.o" "gcc" "CMakeFiles/FinalProject.dir/src/util/math.cpp.o.d" + "/home/brett/Documents/Brock/CS 3P98/Final Project/src/util/settings.cpp" "CMakeFiles/FinalProject.dir/src/util/settings.cpp.o" "gcc" "CMakeFiles/FinalProject.dir/src/util/settings.cpp.o.d" "/home/brett/Documents/Brock/CS 3P98/Final Project/src/world/chunk/storage.cpp" "CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o" "gcc" "CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o.d" "/home/brett/Documents/Brock/CS 3P98/Final Project/src/world/chunk/world.cpp" "CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o" "gcc" "CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o.d" "/home/brett/Documents/Brock/CS 3P98/Final Project/src/world/registry.cpp" "CMakeFiles/FinalProject.dir/src/world/registry.cpp.o" "gcc" "CMakeFiles/FinalProject.dir/src/world/registry.cpp.o.d" diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/build.make b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/build.make index 5b0d8cd..fa41747 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/build.make +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/build.make @@ -117,11 +117,41 @@ CMakeFiles/FinalProject.dir/src/render/gl.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/FinalProject.dir/src/render/gl.cpp.s" /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/gl.cpp" -o CMakeFiles/FinalProject.dir/src/render/gl.cpp.s +CMakeFiles/FinalProject.dir/src/render/textures.cpp.o: CMakeFiles/FinalProject.dir/flags.make +CMakeFiles/FinalProject.dir/src/render/textures.cpp.o: CMakeFiles/FinalProject.dir/includes_CXX.rsp +CMakeFiles/FinalProject.dir/src/render/textures.cpp.o: /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/src/render/textures.cpp +CMakeFiles/FinalProject.dir/src/render/textures.cpp.o: CMakeFiles/FinalProject.dir/compiler_depend.ts + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/FinalProject.dir/src/render/textures.cpp.o" + /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/FinalProject.dir/src/render/textures.cpp.o -MF CMakeFiles/FinalProject.dir/src/render/textures.cpp.o.d -o CMakeFiles/FinalProject.dir/src/render/textures.cpp.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/textures.cpp" + +CMakeFiles/FinalProject.dir/src/render/textures.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/FinalProject.dir/src/render/textures.cpp.i" + /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/textures.cpp" > CMakeFiles/FinalProject.dir/src/render/textures.cpp.i + +CMakeFiles/FinalProject.dir/src/render/textures.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/FinalProject.dir/src/render/textures.cpp.s" + /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/textures.cpp" -o CMakeFiles/FinalProject.dir/src/render/textures.cpp.s + +CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o: CMakeFiles/FinalProject.dir/flags.make +CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o: CMakeFiles/FinalProject.dir/includes_CXX.rsp +CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o: /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/src/render/ui/debug.cpp +CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o: CMakeFiles/FinalProject.dir/compiler_depend.ts + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o" + /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o -MF CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o.d -o CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/ui/debug.cpp" + +CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.i" + /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/ui/debug.cpp" > CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.i + +CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.s" + /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/ui/debug.cpp" -o CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.s + CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o: CMakeFiles/FinalProject.dir/flags.make CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o: CMakeFiles/FinalProject.dir/includes_CXX.rsp CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o: /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/src/render/ui/text.cpp CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o: CMakeFiles/FinalProject.dir/compiler_depend.ts - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o" /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o -MF CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o.d -o CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/ui/text.cpp" CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.i: cmake_force @@ -136,7 +166,7 @@ CMakeFiles/FinalProject.dir/src/render/window.cpp.o: CMakeFiles/FinalProject.dir CMakeFiles/FinalProject.dir/src/render/window.cpp.o: CMakeFiles/FinalProject.dir/includes_CXX.rsp CMakeFiles/FinalProject.dir/src/render/window.cpp.o: /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/src/render/window.cpp CMakeFiles/FinalProject.dir/src/render/window.cpp.o: CMakeFiles/FinalProject.dir/compiler_depend.ts - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object CMakeFiles/FinalProject.dir/src/render/window.cpp.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_7) "Building CXX object CMakeFiles/FinalProject.dir/src/render/window.cpp.o" /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/FinalProject.dir/src/render/window.cpp.o -MF CMakeFiles/FinalProject.dir/src/render/window.cpp.o.d -o CMakeFiles/FinalProject.dir/src/render/window.cpp.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/window.cpp" CMakeFiles/FinalProject.dir/src/render/window.cpp.i: cmake_force @@ -147,11 +177,41 @@ CMakeFiles/FinalProject.dir/src/render/window.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/FinalProject.dir/src/render/window.cpp.s" /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S "/home/brett/Documents/Brock/CS 3P98/Final Project/src/render/window.cpp" -o CMakeFiles/FinalProject.dir/src/render/window.cpp.s +CMakeFiles/FinalProject.dir/src/util/math.cpp.o: CMakeFiles/FinalProject.dir/flags.make +CMakeFiles/FinalProject.dir/src/util/math.cpp.o: CMakeFiles/FinalProject.dir/includes_CXX.rsp +CMakeFiles/FinalProject.dir/src/util/math.cpp.o: /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/src/util/math.cpp +CMakeFiles/FinalProject.dir/src/util/math.cpp.o: CMakeFiles/FinalProject.dir/compiler_depend.ts + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object CMakeFiles/FinalProject.dir/src/util/math.cpp.o" + /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/FinalProject.dir/src/util/math.cpp.o -MF CMakeFiles/FinalProject.dir/src/util/math.cpp.o.d -o CMakeFiles/FinalProject.dir/src/util/math.cpp.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/src/util/math.cpp" + +CMakeFiles/FinalProject.dir/src/util/math.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/FinalProject.dir/src/util/math.cpp.i" + /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E "/home/brett/Documents/Brock/CS 3P98/Final Project/src/util/math.cpp" > CMakeFiles/FinalProject.dir/src/util/math.cpp.i + +CMakeFiles/FinalProject.dir/src/util/math.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/FinalProject.dir/src/util/math.cpp.s" + /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S "/home/brett/Documents/Brock/CS 3P98/Final Project/src/util/math.cpp" -o CMakeFiles/FinalProject.dir/src/util/math.cpp.s + +CMakeFiles/FinalProject.dir/src/util/settings.cpp.o: CMakeFiles/FinalProject.dir/flags.make +CMakeFiles/FinalProject.dir/src/util/settings.cpp.o: CMakeFiles/FinalProject.dir/includes_CXX.rsp +CMakeFiles/FinalProject.dir/src/util/settings.cpp.o: /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/src/util/settings.cpp +CMakeFiles/FinalProject.dir/src/util/settings.cpp.o: CMakeFiles/FinalProject.dir/compiler_depend.ts + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_9) "Building CXX object CMakeFiles/FinalProject.dir/src/util/settings.cpp.o" + /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/FinalProject.dir/src/util/settings.cpp.o -MF CMakeFiles/FinalProject.dir/src/util/settings.cpp.o.d -o CMakeFiles/FinalProject.dir/src/util/settings.cpp.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/src/util/settings.cpp" + +CMakeFiles/FinalProject.dir/src/util/settings.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/FinalProject.dir/src/util/settings.cpp.i" + /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E "/home/brett/Documents/Brock/CS 3P98/Final Project/src/util/settings.cpp" > CMakeFiles/FinalProject.dir/src/util/settings.cpp.i + +CMakeFiles/FinalProject.dir/src/util/settings.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/FinalProject.dir/src/util/settings.cpp.s" + /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S "/home/brett/Documents/Brock/CS 3P98/Final Project/src/util/settings.cpp" -o CMakeFiles/FinalProject.dir/src/util/settings.cpp.s + CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o: CMakeFiles/FinalProject.dir/flags.make CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o: CMakeFiles/FinalProject.dir/includes_CXX.rsp CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o: /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/src/world/chunk/storage.cpp CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o: CMakeFiles/FinalProject.dir/compiler_depend.ts - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_10) "Building CXX object CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o" /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o -MF CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o.d -o CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/src/world/chunk/storage.cpp" CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.i: cmake_force @@ -166,7 +226,7 @@ CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o: CMakeFiles/FinalProject CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o: CMakeFiles/FinalProject.dir/includes_CXX.rsp CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o: /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/src/world/chunk/world.cpp CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o: CMakeFiles/FinalProject.dir/compiler_depend.ts - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_7) "Building CXX object CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_11) "Building CXX object CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o" /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o -MF CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o.d -o CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/src/world/chunk/world.cpp" CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.i: cmake_force @@ -181,7 +241,7 @@ CMakeFiles/FinalProject.dir/src/world/registry.cpp.o: CMakeFiles/FinalProject.di CMakeFiles/FinalProject.dir/src/world/registry.cpp.o: CMakeFiles/FinalProject.dir/includes_CXX.rsp CMakeFiles/FinalProject.dir/src/world/registry.cpp.o: /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/src/world/registry.cpp CMakeFiles/FinalProject.dir/src/world/registry.cpp.o: CMakeFiles/FinalProject.dir/compiler_depend.ts - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object CMakeFiles/FinalProject.dir/src/world/registry.cpp.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_12) "Building CXX object CMakeFiles/FinalProject.dir/src/world/registry.cpp.o" /usr/bin/em++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/FinalProject.dir/src/world/registry.cpp.o -MF CMakeFiles/FinalProject.dir/src/world/registry.cpp.o.d -o CMakeFiles/FinalProject.dir/src/world/registry.cpp.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/src/world/registry.cpp" CMakeFiles/FinalProject.dir/src/world/registry.cpp.i: cmake_force @@ -197,8 +257,12 @@ FinalProject_OBJECTS = \ "CMakeFiles/FinalProject.dir/src/main.cpp.o" \ "CMakeFiles/FinalProject.dir/src/render/camera.cpp.o" \ "CMakeFiles/FinalProject.dir/src/render/gl.cpp.o" \ +"CMakeFiles/FinalProject.dir/src/render/textures.cpp.o" \ +"CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o" \ "CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o" \ "CMakeFiles/FinalProject.dir/src/render/window.cpp.o" \ +"CMakeFiles/FinalProject.dir/src/util/math.cpp.o" \ +"CMakeFiles/FinalProject.dir/src/util/settings.cpp.o" \ "CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o" \ "CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o" \ "CMakeFiles/FinalProject.dir/src/world/registry.cpp.o" @@ -209,18 +273,22 @@ FinalProject_EXTERNAL_OBJECTS = FinalProject.js: CMakeFiles/FinalProject.dir/src/main.cpp.o FinalProject.js: CMakeFiles/FinalProject.dir/src/render/camera.cpp.o FinalProject.js: CMakeFiles/FinalProject.dir/src/render/gl.cpp.o +FinalProject.js: CMakeFiles/FinalProject.dir/src/render/textures.cpp.o +FinalProject.js: CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o FinalProject.js: CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o FinalProject.js: CMakeFiles/FinalProject.dir/src/render/window.cpp.o +FinalProject.js: CMakeFiles/FinalProject.dir/src/util/math.cpp.o +FinalProject.js: CMakeFiles/FinalProject.dir/src/util/settings.cpp.o FinalProject.js: CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o FinalProject.js: CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o FinalProject.js: CMakeFiles/FinalProject.dir/src/world/registry.cpp.o FinalProject.js: CMakeFiles/FinalProject.dir/build.make FinalProject.js: libraries/BLT/libBLT.a -FinalProject.js: libraries/freetype-2.13.0/libfreetyped.a +FinalProject.js: libraries/freetype-2.13.0/libfreetype.a FinalProject.js: CMakeFiles/FinalProject.dir/linkLibs.rsp FinalProject.js: CMakeFiles/FinalProject.dir/objects1 FinalProject.js: CMakeFiles/FinalProject.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_9) "Linking CXX executable FinalProject.js" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_13) "Linking CXX executable FinalProject.js" $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/FinalProject.dir/link.txt --verbose=$(VERBOSE) # Rule to build all files generated by this target. diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/cmake_clean.cmake b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/cmake_clean.cmake index ceb1675..050a2b4 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/cmake_clean.cmake +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/cmake_clean.cmake @@ -5,10 +5,18 @@ file(REMOVE_RECURSE "CMakeFiles/FinalProject.dir/src/render/camera.cpp.o.d" "CMakeFiles/FinalProject.dir/src/render/gl.cpp.o" "CMakeFiles/FinalProject.dir/src/render/gl.cpp.o.d" + "CMakeFiles/FinalProject.dir/src/render/textures.cpp.o" + "CMakeFiles/FinalProject.dir/src/render/textures.cpp.o.d" + "CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o" + "CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o.d" "CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o" "CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o.d" "CMakeFiles/FinalProject.dir/src/render/window.cpp.o" "CMakeFiles/FinalProject.dir/src/render/window.cpp.o.d" + "CMakeFiles/FinalProject.dir/src/util/math.cpp.o" + "CMakeFiles/FinalProject.dir/src/util/math.cpp.o.d" + "CMakeFiles/FinalProject.dir/src/util/settings.cpp.o" + "CMakeFiles/FinalProject.dir/src/util/settings.cpp.o.d" "CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o" "CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o.d" "CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o" diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/flags.make b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/flags.make index 3c7411a..209e534 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/flags.make +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/flags.make @@ -6,5 +6,5 @@ CXX_DEFINES = CXX_INCLUDES = @CMakeFiles/FinalProject.dir/includes_CXX.rsp -CXX_FLAGS = -g -std=gnu++17 +CXX_FLAGS = -O3 -DNDEBUG -std=gnu++17 diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/link.txt b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/link.txt index 3429510..6977910 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/link.txt +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/link.txt @@ -1 +1 @@ -/usr/bin/em++ -g -sMAX_WEBGL_VERSION=2 -s ASSERTIONS=1 -sUSE_GLFW=3 --preload-file 'assets' @CMakeFiles/FinalProject.dir/objects1 -o FinalProject.js @CMakeFiles/FinalProject.dir/linkLibs.rsp +/usr/bin/em++ -O3 -DNDEBUG -sMAX_WEBGL_VERSION=2 -s ASSERTIONS=1 -sUSE_GLFW=3 --preload-file 'assets' @CMakeFiles/FinalProject.dir/objects1 -o FinalProject.js @CMakeFiles/FinalProject.dir/linkLibs.rsp diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/linkLibs.rsp b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/linkLibs.rsp index 4d0d7b9..651a174 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/linkLibs.rsp +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/linkLibs.rsp @@ -1 +1 @@ - libraries/BLT/libBLT.a "libraries/freetype-2.13.0/libfreetyped.a" + libraries/BLT/libBLT.a "libraries/freetype-2.13.0/libfreetype.a" diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/objects1 b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/objects1 index f58df1d..e6bfa4f 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/objects1 +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/objects1 @@ -1 +1 @@ -CMakeFiles/FinalProject.dir/src/main.cpp.o CMakeFiles/FinalProject.dir/src/render/camera.cpp.o CMakeFiles/FinalProject.dir/src/render/gl.cpp.o CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o CMakeFiles/FinalProject.dir/src/render/window.cpp.o CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o CMakeFiles/FinalProject.dir/src/world/registry.cpp.o +CMakeFiles/FinalProject.dir/src/main.cpp.o CMakeFiles/FinalProject.dir/src/render/camera.cpp.o CMakeFiles/FinalProject.dir/src/render/gl.cpp.o CMakeFiles/FinalProject.dir/src/render/textures.cpp.o CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o CMakeFiles/FinalProject.dir/src/render/window.cpp.o CMakeFiles/FinalProject.dir/src/util/math.cpp.o CMakeFiles/FinalProject.dir/src/util/settings.cpp.o CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o CMakeFiles/FinalProject.dir/src/world/registry.cpp.o diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/progress.make b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/progress.make index 82da5f3..016829f 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/progress.make +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/progress.make @@ -7,4 +7,8 @@ CMAKE_PROGRESS_6 = 15 CMAKE_PROGRESS_7 = 16 CMAKE_PROGRESS_8 = 17 CMAKE_PROGRESS_9 = 18 +CMAKE_PROGRESS_10 = 19 +CMAKE_PROGRESS_11 = 20 +CMAKE_PROGRESS_12 = 21 +CMAKE_PROGRESS_13 = 22 diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/main.cpp.o.d b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/main.cpp.o.d index a027fd9..87ec94a 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/main.cpp.o.d +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/main.cpp.o.d @@ -285,6 +285,30 @@ CMakeFiles/FinalProject.dir/src/main.cpp.o: \ /usr/share/emscripten/cache/sysroot/include/math.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__node_handle \ /usr/share/emscripten/cache/sysroot/include/c++/v1/optional \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/fstream \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/__locale \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/mutex \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/__mutex_base \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/system_error \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/__errc \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/cerrno \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/locale.h \ + /usr/share/emscripten/cache/sysroot/include/locale.h \ + /usr/share/emscripten/cache/sysroot/include/compat/xlocale.h \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/istream \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/ostream \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/bitset \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/ios \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/locale \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/cstdarg \ + /usr/share/emscripten/cache/sysroot/include/compat/stdarg.h \ + /usr/lib/llvm-14/lib/clang/14.0.6/include/stdarg.h \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/streambuf \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/__bsd_locale_fallbacks.h \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/filesystem \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/stack \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/deque \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/iomanip \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/render/window.h \ /usr/share/emscripten/cache/sysroot/include/GLES2/gl2.h \ /usr/share/emscripten/cache/sysroot/include/GLES2/gl2platform.h \ @@ -300,35 +324,25 @@ CMakeFiles/FinalProject.dir/src/main.cpp.o: \ /usr/share/emscripten/cache/sysroot/include/GLFW/glfw3.h \ /usr/share/emscripten/cache/sysroot/include/GL/gl.h \ /usr/share/emscripten/cache/sysroot/include/GL/glext.h \ - /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/std/math.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/math/math.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/math/vectors.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/math/matrix.h \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/render/gl.h \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/std/string.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/iostream \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/ios \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/__locale \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/mutex \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/__mutex_base \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/system_error \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/__errc \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/cerrno \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/locale.h \ - /usr/share/emscripten/cache/sysroot/include/locale.h \ - /usr/share/emscripten/cache/sysroot/include/compat/xlocale.h \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/istream \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/ostream \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/bitset \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/locale \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/cstdarg \ - /usr/share/emscripten/cache/sysroot/include/compat/stdarg.h \ - /usr/lib/llvm-14/lib/clang/14.0.6/include/stdarg.h \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/streambuf \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/__bsd_locale_fallbacks.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/sstream \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/render/ui/text.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/render/ui/debug.h \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/shaders/chunk.frag \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/shaders/chunk.vert \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/render/camera.h \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/world/chunk/world.h \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/world/chunk/storage.h \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/world/chunk/typedefs.h \ - /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/world/registry.h + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/world/registry.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/render/textures.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/stb/stb_image.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/util/settings.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/stb/stb_image_resize.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/util/math.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/stb/stb_perlin.h diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/gl.cpp.o b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/gl.cpp.o index f5fea79..fcf4142 100644 Binary files a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/gl.cpp.o and b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/gl.cpp.o differ diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/gl.cpp.o.d b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/gl.cpp.o.d index ab85f1d..18579bf 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/gl.cpp.o.d +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/gl.cpp.o.d @@ -28,7 +28,8 @@ CMakeFiles/FinalProject.dir/src/render/gl.cpp.o: \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__nullptr \ /usr/share/emscripten/cache/sysroot/include/GL/gl.h \ /usr/share/emscripten/cache/sysroot/include/GL/glext.h \ - /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/std/math.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/math/math.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/math/vectors.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/initializer_list \ /usr/share/emscripten/cache/sysroot/include/c++/v1/cstddef \ /usr/share/emscripten/cache/sysroot/include/c++/v1/version \ @@ -44,6 +45,7 @@ CMakeFiles/FinalProject.dir/src/render/gl.cpp.o: \ /usr/share/emscripten/cache/sysroot/include/c++/v1/type_traits \ /usr/share/emscripten/cache/sysroot/include/c++/v1/limits \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__undef_macros \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/math/matrix.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/vector \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__bit_reference \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__bits \ diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/window.cpp.o b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/window.cpp.o index 8176c7b..7be07d3 100644 Binary files a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/window.cpp.o and b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/window.cpp.o differ diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/window.cpp.o.d b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/window.cpp.o.d index be26ff6..d7b7894 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/window.cpp.o.d +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/window.cpp.o.d @@ -27,7 +27,8 @@ CMakeFiles/FinalProject.dir/src/render/window.cpp.o: \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__nullptr \ /usr/share/emscripten/cache/sysroot/include/GL/gl.h \ /usr/share/emscripten/cache/sysroot/include/GL/glext.h \ - /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/std/math.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/math/math.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/math/vectors.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/initializer_list \ /usr/share/emscripten/cache/sysroot/include/c++/v1/cstddef \ /usr/share/emscripten/cache/sysroot/include/c++/v1/version \ @@ -43,6 +44,7 @@ CMakeFiles/FinalProject.dir/src/render/window.cpp.o: \ /usr/share/emscripten/cache/sysroot/include/c++/v1/type_traits \ /usr/share/emscripten/cache/sysroot/include/c++/v1/limits \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__undef_macros \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/math/matrix.h \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/include/render/gl.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/vector \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__bit_reference \ diff --git a/cmake-build-emrelease/CMakeFiles/Makefile2 b/cmake-build-emrelease/CMakeFiles/Makefile2 index 6abd19e..d706233 100644 --- a/cmake-build-emrelease/CMakeFiles/Makefile2 +++ b/cmake-build-emrelease/CMakeFiles/Makefile2 @@ -116,16 +116,16 @@ libraries/freetype-2.13.0/clean: libraries/freetype-2.13.0/CMakeFiles/freetype.d # Target rules for target CMakeFiles/FinalProject.dir # All Build rule for target. -CMakeFiles/FinalProject.dir/all: libraries/BLT/CMakeFiles/BLT.dir/all CMakeFiles/FinalProject.dir/all: libraries/freetype-2.13.0/CMakeFiles/freetype.dir/all +CMakeFiles/FinalProject.dir/all: libraries/BLT/CMakeFiles/BLT.dir/all $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/depend $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=10,11,12,13,14,15,16,17,18 "Built target FinalProject" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=10,11,12,13,14,15,16,17,18,19,20,21,22 "Built target FinalProject" .PHONY : CMakeFiles/FinalProject.dir/all # Build rule for subdir invocation for target. CMakeFiles/FinalProject.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" 61 + $(CMAKE_COMMAND) -E cmake_progress_start "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" 65 $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/FinalProject.dir/all $(CMAKE_COMMAND) -E cmake_progress_start "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" 0 .PHONY : CMakeFiles/FinalProject.dir/rule @@ -172,7 +172,7 @@ libraries/BLT/CMakeFiles/BLT.dir/clean: libraries/freetype-2.13.0/CMakeFiles/freetype.dir/all: $(MAKE) $(MAKESILENT) -f libraries/freetype-2.13.0/CMakeFiles/freetype.dir/build.make libraries/freetype-2.13.0/CMakeFiles/freetype.dir/depend $(MAKE) $(MAKESILENT) -f libraries/freetype-2.13.0/CMakeFiles/freetype.dir/build.make libraries/freetype-2.13.0/CMakeFiles/freetype.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61 "Built target freetype" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles" --progress-num=23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65 "Built target freetype" .PHONY : libraries/freetype-2.13.0/CMakeFiles/freetype.dir/all # Build rule for subdir invocation for target. diff --git a/cmake-build-emrelease/CMakeFiles/progress.marks b/cmake-build-emrelease/CMakeFiles/progress.marks index b1e7d26..1479e19 100644 --- a/cmake-build-emrelease/CMakeFiles/progress.marks +++ b/cmake-build-emrelease/CMakeFiles/progress.marks @@ -1 +1 @@ -61 +65 diff --git a/cmake-build-emrelease/Makefile b/cmake-build-emrelease/Makefile index a9348d8..feba90c 100644 --- a/cmake-build-emrelease/Makefile +++ b/cmake-build-emrelease/Makefile @@ -295,6 +295,54 @@ src/render/gl.cpp.s: $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/render/gl.cpp.s .PHONY : src/render/gl.cpp.s +src/render/textures.o: src/render/textures.cpp.o +.PHONY : src/render/textures.o + +# target to build an object file +src/render/textures.cpp.o: + $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/render/textures.cpp.o +.PHONY : src/render/textures.cpp.o + +src/render/textures.i: src/render/textures.cpp.i +.PHONY : src/render/textures.i + +# target to preprocess a source file +src/render/textures.cpp.i: + $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/render/textures.cpp.i +.PHONY : src/render/textures.cpp.i + +src/render/textures.s: src/render/textures.cpp.s +.PHONY : src/render/textures.s + +# target to generate assembly for a file +src/render/textures.cpp.s: + $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/render/textures.cpp.s +.PHONY : src/render/textures.cpp.s + +src/render/ui/debug.o: src/render/ui/debug.cpp.o +.PHONY : src/render/ui/debug.o + +# target to build an object file +src/render/ui/debug.cpp.o: + $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o +.PHONY : src/render/ui/debug.cpp.o + +src/render/ui/debug.i: src/render/ui/debug.cpp.i +.PHONY : src/render/ui/debug.i + +# target to preprocess a source file +src/render/ui/debug.cpp.i: + $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.i +.PHONY : src/render/ui/debug.cpp.i + +src/render/ui/debug.s: src/render/ui/debug.cpp.s +.PHONY : src/render/ui/debug.s + +# target to generate assembly for a file +src/render/ui/debug.cpp.s: + $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.s +.PHONY : src/render/ui/debug.cpp.s + src/render/ui/text.o: src/render/ui/text.cpp.o .PHONY : src/render/ui/text.o @@ -343,6 +391,54 @@ src/render/window.cpp.s: $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/render/window.cpp.s .PHONY : src/render/window.cpp.s +src/util/math.o: src/util/math.cpp.o +.PHONY : src/util/math.o + +# target to build an object file +src/util/math.cpp.o: + $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/util/math.cpp.o +.PHONY : src/util/math.cpp.o + +src/util/math.i: src/util/math.cpp.i +.PHONY : src/util/math.i + +# target to preprocess a source file +src/util/math.cpp.i: + $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/util/math.cpp.i +.PHONY : src/util/math.cpp.i + +src/util/math.s: src/util/math.cpp.s +.PHONY : src/util/math.s + +# target to generate assembly for a file +src/util/math.cpp.s: + $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/util/math.cpp.s +.PHONY : src/util/math.cpp.s + +src/util/settings.o: src/util/settings.cpp.o +.PHONY : src/util/settings.o + +# target to build an object file +src/util/settings.cpp.o: + $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/util/settings.cpp.o +.PHONY : src/util/settings.cpp.o + +src/util/settings.i: src/util/settings.cpp.i +.PHONY : src/util/settings.i + +# target to preprocess a source file +src/util/settings.cpp.i: + $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/util/settings.cpp.i +.PHONY : src/util/settings.cpp.i + +src/util/settings.s: src/util/settings.cpp.s +.PHONY : src/util/settings.s + +# target to generate assembly for a file +src/util/settings.cpp.s: + $(MAKE) $(MAKESILENT) -f CMakeFiles/FinalProject.dir/build.make CMakeFiles/FinalProject.dir/src/util/settings.cpp.s +.PHONY : src/util/settings.cpp.s + src/world/chunk/storage.o: src/world/chunk/storage.cpp.o .PHONY : src/world/chunk/storage.o @@ -441,12 +537,24 @@ help: @echo "... src/render/gl.o" @echo "... src/render/gl.i" @echo "... src/render/gl.s" + @echo "... src/render/textures.o" + @echo "... src/render/textures.i" + @echo "... src/render/textures.s" + @echo "... src/render/ui/debug.o" + @echo "... src/render/ui/debug.i" + @echo "... src/render/ui/debug.s" @echo "... src/render/ui/text.o" @echo "... src/render/ui/text.i" @echo "... src/render/ui/text.s" @echo "... src/render/window.o" @echo "... src/render/window.i" @echo "... src/render/window.s" + @echo "... src/util/math.o" + @echo "... src/util/math.i" + @echo "... src/util/math.s" + @echo "... src/util/settings.o" + @echo "... src/util/settings.i" + @echo "... src/util/settings.s" @echo "... src/world/chunk/storage.o" @echo "... src/world/chunk/storage.i" @echo "... src/world/chunk/storage.s" diff --git a/cmake-build-emrelease/cmake_install.cmake b/cmake-build-emrelease/cmake_install.cmake index 6c3966a..d3dfad3 100644 --- a/cmake-build-emrelease/cmake_install.cmake +++ b/cmake-build-emrelease/cmake_install.cmake @@ -12,7 +12,7 @@ if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") else() - set(CMAKE_INSTALL_CONFIG_NAME "Debug") + set(CMAKE_INSTALL_CONFIG_NAME "Release") endif() message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") endif() diff --git a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/flags.make b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/flags.make index 36e8f9b..3968636 100644 --- a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/flags.make +++ b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/flags.make @@ -6,5 +6,5 @@ CXX_DEFINES = CXX_INCLUDES = @CMakeFiles/BLT.dir/includes_CXX.rsp -CXX_FLAGS = -g -std=gnu++17 +CXX_FLAGS = -O3 -DNDEBUG -std=gnu++17 diff --git a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o index 03444d5..70e90d9 100644 Binary files a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o and b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o differ diff --git a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt_block.cpp.o b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt_block.cpp.o index d1a1c57..c299ce7 100644 Binary files a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt_block.cpp.o and b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt_block.cpp.o differ diff --git a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o index 4745c20..acce31b 100644 Binary files a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o and b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o differ diff --git a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o.d b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o.d index 6460607..bc21d1e 100644 --- a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o.d +++ b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o.d @@ -285,26 +285,31 @@ libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o: \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__node_handle \ /usr/share/emscripten/cache/sysroot/include/c++/v1/optional \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/std/logging.h \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/fstream \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/__locale \ /usr/share/emscripten/cache/sysroot/include/c++/v1/mutex \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__mutex_base \ /usr/share/emscripten/cache/sysroot/include/c++/v1/system_error \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__errc \ /usr/share/emscripten/cache/sysroot/include/c++/v1/cerrno \ - /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/std/time.h \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/sstream \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/locale.h \ + /usr/share/emscripten/cache/sysroot/include/locale.h \ + /usr/share/emscripten/cache/sysroot/include/compat/xlocale.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/istream \ /usr/share/emscripten/cache/sysroot/include/c++/v1/ostream \ /usr/share/emscripten/cache/sysroot/include/c++/v1/bitset \ /usr/share/emscripten/cache/sysroot/include/c++/v1/ios \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/__locale \ - /usr/share/emscripten/cache/sysroot/include/c++/v1/locale.h \ - /usr/share/emscripten/cache/sysroot/include/locale.h \ - /usr/share/emscripten/cache/sysroot/include/compat/xlocale.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/locale \ /usr/share/emscripten/cache/sysroot/include/c++/v1/cstdarg \ /usr/share/emscripten/cache/sysroot/include/compat/stdarg.h \ /usr/lib/llvm-14/lib/clang/14.0.6/include/stdarg.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/streambuf \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__bsd_locale_fallbacks.h \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/filesystem \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/stack \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/deque \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/iomanip \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/std/time.h \ + /usr/share/emscripten/cache/sysroot/include/c++/v1/sstream \ /usr/share/emscripten/cache/sysroot/include/c++/v1/iostream \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/std/format.h diff --git a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o index 5b5c5b2..79464cf 100644 Binary files a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o and b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o differ diff --git a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o index 1d50883..29c2185 100644 Binary files a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o and b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o differ diff --git a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/logging.cpp.o b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/logging.cpp.o index 166bdcc..7aafebf 100644 Binary files a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/logging.cpp.o and b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/logging.cpp.o differ diff --git a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o index 34f995b..c299ce7 100644 Binary files a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o and b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o differ diff --git a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o.d b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o.d index f5a6bd4..d65fb93 100644 --- a/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o.d +++ b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o.d @@ -297,8 +297,10 @@ libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o: \ /usr/share/emscripten/cache/sysroot/include/c++/v1/streambuf \ /usr/share/emscripten/cache/sysroot/include/c++/v1/__bsd_locale_fallbacks.h \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/std/map.h \ - /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/std/math.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/math/math.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/math/vectors.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/cmath \ /usr/share/emscripten/cache/sysroot/include/compat/math.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/math.h \ - /usr/share/emscripten/cache/sysroot/include/math.h + /usr/share/emscripten/cache/sysroot/include/math.h \ + /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/BLT/include/blt/math/matrix.h diff --git a/cmake-build-emrelease/libraries/BLT/cmake_install.cmake b/cmake-build-emrelease/libraries/BLT/cmake_install.cmake index b028010..e4244f6 100644 --- a/cmake-build-emrelease/libraries/BLT/cmake_install.cmake +++ b/cmake-build-emrelease/libraries/BLT/cmake_install.cmake @@ -12,7 +12,7 @@ if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") else() - set(CMAKE_INSTALL_CONFIG_NAME "Debug") + set(CMAKE_INSTALL_CONFIG_NAME "Release") endif() message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") endif() diff --git a/cmake-build-emrelease/libraries/BLT/libBLT.a b/cmake-build-emrelease/libraries/BLT/libBLT.a index 3c4c227..2693d4e 100644 Binary files a/cmake-build-emrelease/libraries/BLT/libBLT.a and b/cmake-build-emrelease/libraries/BLT/libBLT.a differ diff --git a/cmake-build-relwithdebinfo/.ninja_deps b/cmake-build-relwithdebinfo/.ninja_deps index edbcdcd..c3c583b 100644 Binary files a/cmake-build-relwithdebinfo/.ninja_deps and b/cmake-build-relwithdebinfo/.ninja_deps differ diff --git a/cmake-build-relwithdebinfo/.ninja_log b/cmake-build-relwithdebinfo/.ninja_log index a51b75e..ad39faa 100644 --- a/cmake-build-relwithdebinfo/.ninja_log +++ b/cmake-build-relwithdebinfo/.ninja_log @@ -2,18 +2,18 @@ 2323 3085 1677855183432425834 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pfr/pfr.c.o 36ee13ce7f760ef5 3268 3715 1677855184064443416 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type42/type42.c.o af1b1264db82aeae 3412 3495 1677855183844437295 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/builds/unix/ftsystem.c.o 827aa9e59ce2e7a7 -3 1191 1677999180799372405 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o d042df377c55f1ff +4 1567 1678044752322985689 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o d042df377c55f1ff 3085 3174 1677855183520428281 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/svg/svg.c.o dc9fa4644e4bfeff -3 1207 1677999180815372847 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c +3 1775 1678054914554537782 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c 2047 2124 1677855182472399126 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftsynth.c.o c94e1df207dca05f 467 677 1677855181024358840 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/monitor.c.o 3306a3caed247cee +4 582 1678054913362505808 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o 9999b1f01228dc1e 1945 2020 1677855182368396233 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftinit.c.o c79de44174f27a42 -3 462 1677989294608133429 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o 9999b1f01228dc1e -3 697 1677858183421620170 CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o 67c82fe66fca827 +2 347 1678036211511110623 CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o 67c82fe66fca827 1889 1929 1677855182276393672 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftfstype.c.o c1571efbcaa8f933 -3 2049 1677989296192176850 libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o 3879c77c4691aa0a +4 2489 1678054915262556775 libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o 3879c77c4691aa0a 1756 1820 1677855182168390667 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbdf.c.o d55aaa7d5cd3d5c -4 1104 1677858183829631248 CMakeFiles/FinalProject.dir/src/render/window.cpp.o d3ff816bc92bb4a6 +3 1083 1678044751838972646 CMakeFiles/FinalProject.dir/src/render/window.cpp.o d3ff816bc92bb4a6 3268 4060 1677855184408452986 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type1/type1.c.o e9ac3fb73828fd6d 677 798 1677855181148362288 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/vulkan.c.o 726a0ce9066c22d2 1895 2088 1677855182436398124 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftglyph.c.o 287c587d2b62e728 @@ -23,195 +23,73 @@ 799 1141 1677855181488371749 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_init.c.o 84c854e192bd136 1819 2119 1677855182468399014 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbitmap.c.o 1beee6fba21a431a 3421 3467 1677855183816436516 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftdebug.c.o fdb7df678b36f40f -1697 3944 1677855184288449646 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbase.c.o 4be5f2832180d492 +3 754 1678054913534510424 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o 3b328e151712ca4 1821 1895 1677855182244392782 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftcid.c.o be7252df658034eb -6 959 1677858183685627338 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o 3b328e151712ca4 +1697 3944 1677855184288449646 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbase.c.o 4be5f2832180d492 2672 3276 1677855183624431174 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/raster/raster.c.o f81177488ebd3ad 203 379 1677855180728350604 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/init.c.o 7363bcb2dba2054a -2113 2153 1677855182500399904 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bzip2/ftbzip2.c.o 7d125f3d19646cd0 +2489 2554 1678054915330558596 libraries/BLT/libBLT.a b8f809e0bb7338ed +2554 2807 1678054915586565466 FinalProject 9e02455301d10951 2020 2085 1677855182432398012 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpfr.c.o 565b64bbd1fc7af5 -989 1123 1677999316411116349 FinalProject 743e0d59f44b5ac0 -2049 2123 1677989296260178714 libraries/BLT/libBLT.a b8f809e0bb7338ed -1359 3173 1677855183520428281 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/logging.cpp.o a4d3cad66687d105 +2113 2153 1677855182500399904 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bzip2/ftbzip2.c.o 7d125f3d19646cd0 1141 1230 1677855181576374196 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/posix_thread.c.o ed8a69d447bea26a -2546 3420 1677855183768435180 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pshinter/pshinter.c.o d1c695600d3a7dfd +4 1535 1678054914314531346 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/logging.cpp.o a4d3cad66687d105 1157 1382 1677855181728378425 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/glx_context.c.o 3a83b8e61a7e27f1 +2546 3420 1677855183768435180 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pshinter/pshinter.c.o d1c695600d3a7dfd 1052 1131 1677855181480371526 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/xkb_unicode.c.o b26e96d6509cc15d 2153 2323 1677855182672404689 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/lzw/ftlzw.c.o d04e126e5d735f8b -3 680 1677999180287358265 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o 5776e342ea508518 +3 884 1678044751642967363 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o 5776e342ea508518 996 1698 1677855182044387219 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_window.c.o 3c77d54154e66152 -2539 4386 1677855184732461998 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psaux/psaux.c.o 2a71d88eed8a5228 1357 2539 1677855182884410587 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/loader.cpp.o dba8b361d1594e59 -3 3841 1677991208008852927 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 245d855e300d9590 -1929 1988 1677855182336395340 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgxval.c.o d760f2ca9797735d +2539 4386 1677855184732461998 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psaux/psaux.c.o 2a71d88eed8a5228 1698 1756 1677855182100388775 libraries/glfw-3.3.8/src/libglfw3.a fd552f215cfdce3e -2 989 1677999316279112705 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb +1929 1988 1677855182336395340 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgxval.c.o d760f2ca9797735d +3 3708 1678044759579181272 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 245d855e300d9590 +3 1117 1678054246248682149 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb 379 735 1677855181084360508 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/input.c.o b9b0555d1bde647a -5617 5711 1677855186044498497 libraries/freetype-2.13.0/libfreetype.a 2cada0509b693271 1528 1889 1677855182236392559 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt_block.cpp.o 2100792179af25a6 +5617 5711 1677855186044498497 libraries/freetype-2.13.0/libfreetype.a 2cada0509b693271 1894 1953 1677855182300394339 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgasp.c.o 6eb2c5578119b9c8 -2834 5441 1677855185788491376 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sfnt/sfnt.c.o f8f71756e461ba89 3 202 1677855180552345709 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/context.c.o 66a0481f161ec0b0 +2834 5441 1677855185788491376 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sfnt/sfnt.c.o f8f71756e461ba89 2153 2319 1677855182668404578 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/gzip/ftgzip.c.o a0a7cf4736cb9d 2849 3268 1677855183616430951 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/smooth/smooth.c.o 2bc4ae7d644f7cd3 -925 1168 1677855181516372527 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_monitor.c.o f704fd1b3f3f9ebf 1131 1199 1677855181548373417 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/posix_time.c.o 85b163330cb816e5 +925 1168 1677855181516372527 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_monitor.c.o f704fd1b3f3f9ebf 1168 1371 1677855181720378205 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/egl_context.c.o b183bcb8286b3466 3174 5617 1677855185964496274 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/truetype/truetype.c.o f922d14a41a03de2 -1382 1993 1677855182340395452 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o 3e0e238c32ed62ec +4 597 1678054913378506237 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o 3e0e238c32ed62ec 2139 2545 1677855182892410810 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cid/type1cid.c.o 23bf561e9b90dd0 2775 3535 1677855183884438408 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sdf/sdf.c.o 807c8e056b31c5d0 1953 2106 1677855182452398568 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftmm.c.o 7b1dd129e6fb4981 -3 902 1677999180511364452 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o aba7285d6d94217e +2 823 1678049927792655243 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o aba7285d6d94217e 1199 1358 1677855181708377870 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/osmesa_context.c.o a913dd02c9ac6f97 -3 971 1677989295116147354 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o 67d0982a1f44b9dd 2088 2139 1677855182488399570 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftwinfnt.c.o 9fabacfc2ff8811a -2556 2834 1677855183180418823 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psnames/psnames.c.o 9d8ecfaa201fc592 +2 779 1678046595861972061 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o 67d0982a1f44b9dd 2319 2775 1677855183124417264 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pcf/pcf.c.o 14518ecf856d21d0 -1230 1624 1677855181972385216 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o 49e1226ae352c85c +2556 2834 1677855183180418823 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psnames/psnames.c.o 9d8ecfaa201fc592 +2 346 1677999654468443745 CMakeFiles/FinalProject.dir/src/util/math.cpp.o 74bf519fdbe61408 +3 293 1678054245424660266 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o 49e1226ae352c85c 1989 2044 1677855182392396899 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftotval.c.o 1775fdea3e52c802 -3 1704 1677858184429647537 CMakeFiles/FinalProject.dir/src/render/gl.cpp.o 2660a3bd1778e5e3 -3 1551 1677858184277643410 CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o 4bc61f357ca60822 +3 1258 1678054246388685865 CMakeFiles/FinalProject.dir/src/render/gl.cpp.o 2660a3bd1778e5e3 3276 3499 1677855183848437406 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/winfonts/winfnt.c.o e43948e4a6dbf2e9 +3 1727 1678044752482990004 CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o 4bc61f357ca60822 2044 2556 1677855182904411145 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftstroke.c.o d23f15afb5e42f5b -1624 3576 1677855183924439521 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/autofit/autofit.c.o be86846738c7b3be 1703 1818 1677855182168390667 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbbox.c.o 33ee4db3f35b92d3 +1624 3576 1677855183924439521 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/autofit/autofit.c.o be86846738c7b3be 2085 2153 1677855182500399904 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/fttype1.c.o f2704e6735522163 2119 2672 1677855183020414370 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cache/ftcache.c.o 6a50d2c3764a714 2124 3412 1677855183760434957 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cff/cff.c.o 47495ad83245b5e7 1204 1349 1677855181696377535 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/linux_joystick.c.o 3df40cb71360060f -2 326 1677999463351171408 CMakeFiles/FinalProject.dir/src/util/math.cpp.o 74bf519fdbe61408 -2 586 1677999463611178583 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o 5776e342ea508518 -2 992 1677999464015189731 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -992 1125 1677999464147193373 FinalProject 9e02455301d10951 -2 346 1677999654468443745 CMakeFiles/FinalProject.dir/src/util/math.cpp.o 74bf519fdbe61408 -2 590 1677999654712450475 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o 5776e342ea508518 -2 984 1677999655104461288 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -984 1124 1677999655244465150 FinalProject 9e02455301d10951 -2 999 1677999666568777499 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -999 1134 1677999666700781139 FinalProject 9e02455301d10951 -2 992 1677999674805004668 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -992 1128 1677999674941008420 FinalProject 9e02455301d10951 -2 986 1677999751559121567 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -986 1121 1677999751691125211 FinalProject 9e02455301d10951 -2 1056 1677999803156544525 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1056 1200 1677999803300548498 FinalProject 9e02455301d10951 -2 1052 1677999847397764549 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -3 1059 1677999847405764769 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1059 1200 1677999847545768630 FinalProject 9e02455301d10951 -2 798 1678000243116675165 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o aba7285d6d94217e -2 1007 1678000243324680899 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -2 1048 1678000243364682000 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1048 1185 1678000243500685751 FinalProject 9e02455301d10951 -2 1080 1678000383432558547 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1080 1215 1678000383564562202 FinalProject 9e02455301d10951 -3 1030 1678000427941790584 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1030 1167 1678000428077794349 FinalProject 9e02455301d10951 -3 1035 1678000453702503475 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1035 1171 1678000453834507128 FinalProject 9e02455301d10951 -3 497 1678001869021580268 CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o 67c82fe66fca827 -2 704 1678001869225585896 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o 5776e342ea508518 -3 891 1678001869413591083 CMakeFiles/FinalProject.dir/src/render/window.cpp.o d3ff816bc92bb4a6 -3 1041 1678001869565595275 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o aba7285d6d94217e -3 1185 1678001869705599136 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o 67d0982a1f44b9dd -2 1185 1678001869705599136 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -3 1293 1678001869813602117 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -3 1461 1678001869985606861 CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o 4bc61f357ca60822 -2 1473 1678001869993607082 CMakeFiles/FinalProject.dir/src/render/gl.cpp.o 2660a3bd1778e5e3 -3 1498 1678001870021607853 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o d042df377c55f1ff -3 4245 1678001872765683546 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 245d855e300d9590 -4245 4382 1678001872901687298 FinalProject 9e02455301d10951 -2 1084 1678001913922818829 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -2 1143 1678001913982820481 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1143 1284 1678001914122824346 FinalProject 9e02455301d10951 -5 1163 1678001963448184910 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1163 1302 1678001963584188662 FinalProject 9e02455301d10951 -3 1150 1678001986184812060 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1150 1295 1678001986328816031 FinalProject 9e02455301d10951 -2 979 1678002360003078427 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -2 1213 1678002360235084605 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1213 1354 1678002360379088443 FinalProject 9e02455301d10951 -3 963 1678002421972732125 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -3 1168 1678002422176737579 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1168 1309 1678002422316741322 FinalProject 9e02455301d10951 -2 1194 1678002513891194994 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1194 1330 1678002514027198645 FinalProject 9e02455301d10951 -2 1185 1678002540423907880 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1186 1329 1678002540563911643 FinalProject 9e02455301d10951 -4 1193 1678002887201285746 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1193 1334 1678002887341289549 FinalProject 9e02455301d10951 -2 1292 1678002930794470705 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1292 1437 1678002930942474730 FinalProject 9e02455301d10951 -2 903 1678002982091866374 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -2 1172 1678002982359873670 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1172 1302 1678002982487877153 FinalProject 9e02455301d10951 -2 1232 1678003046149610977 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1232 1380 1678003046297615010 FinalProject 9e02455301d10951 -3 1165 1678003141536211977 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1165 1308 1678003141676215797 FinalProject 9e02455301d10951 -5 528 1678035671972415653 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o 9999b1f01228dc1e -3 1155 1678035672600432827 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -3 1544 1678035672988443438 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -8 2111 1678035673552458861 libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o 3879c77c4691aa0a -2111 2300 1678035673712463238 libraries/BLT/libBLT.a b8f809e0bb7338ed -2300 2439 1678035673880467831 FinalProject 9e02455301d10951 -2 781 1678036144893300937 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o 67d0982a1f44b9dd -781 926 1678036145037304851 FinalProject 9e02455301d10951 -2 347 1678036211511110623 CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o 67c82fe66fca827 -2 776 1678036211939122245 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o 67d0982a1f44b9dd -776 913 1678036212075125941 FinalProject 9e02455301d10951 -3 1233 1678036426324940656 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1233 1374 1678036426464944454 FinalProject 9e02455301d10951 -3 1213 1678036492830744284 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1213 1342 1678036492958747755 FinalProject 9e02455301d10951 -4 1163 1678036648706969756 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1163 1300 1678036648842973441 FinalProject 9e02455301d10951 -3 1162 1678036705604511582 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1162 1299 1678036705740515269 FinalProject 9e02455301d10951 -2 1142 1678036779122503443 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1142 1273 1678036779250506911 FinalProject 9e02455301d10951 -2 1100 1678037058578072044 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1100 1233 1678037058710075621 FinalProject 9e02455301d10951 -2 1145 1678037237731137782 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -2 1296 1678037237863141607 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1296 1436 1678037238019146130 FinalProject 9e02455301d10951 -2 1068 1678037259119757069 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -3 1135 1678037259187759034 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1135 1289 1678037259339763431 FinalProject 9e02455301d10951 -2 397 1678044142498558458 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o 49e1226ae352c85c -3 477 1678044142578560611 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o 3e0e238c32ed62ec -2 1207 1678044143310580313 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -2 1236 1678044143338581067 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -3 1244 1678044143346581283 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/logging.cpp.o a4d3cad66687d105 -1244 1300 1678044143402582790 libraries/BLT/libBLT.a b8f809e0bb7338ed -2 1346 1678044143446583974 CMakeFiles/FinalProject.dir/src/render/gl.cpp.o 2660a3bd1778e5e3 -1347 1498 1678044143598588065 FinalProject 9e02455301d10951 -3 884 1678044751642967363 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o 5776e342ea508518 -3 1083 1678044751838972646 CMakeFiles/FinalProject.dir/src/render/window.cpp.o d3ff816bc92bb4a6 -3 1248 1678044752006977174 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o aba7285d6d94217e -4 1567 1678044752322985689 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o d042df377c55f1ff -3 1604 1678044752362986770 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -2 1614 1678044752370986986 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -3 1727 1678044752482990004 CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o 4bc61f357ca60822 -3 1833 1678044752590992916 CMakeFiles/FinalProject.dir/src/render/gl.cpp.o 2660a3bd1778e5e3 -3 3708 1678044759579181272 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 245d855e300d9590 -3708 3850 1678044759719185045 FinalProject 9e02455301d10951 -2 1236 1678044870954183425 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -2 1283 1678044871002184718 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1283 1427 1678044871142188492 FinalProject 9e02455301d10951 -2 1252 1678044879546415046 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1252 1399 1678044879690418928 FinalProject 9e02455301d10951 -2 1091 1678044921607548918 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -3 1209 1678044921723552045 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1209 1351 1678044921863555819 FinalProject 9e02455301d10951 -2 1111 1678045208599286533 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -3 1341 1678045208827292682 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1341 1474 1678045208959296241 FinalProject 9e02455301d10951 -3 1228 1678045386908222629 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1228 1364 1678045387044226578 FinalProject 9e02455301d10951 -2 1312 1678045466430520596 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1312 1463 1678045466582524970 FinalProject 9e02455301d10951 -2 779 1678046595861972061 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o 67d0982a1f44b9dd -4 1021 1678047258692079886 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb -3 1204 1678047407560157339 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c -1205 1345 1678047407700161239 FinalProject 9e02455301d10951 +2 887 1678055083771079147 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb +887 1041 1678055083923083229 FinalProject 9e02455301d10951 +2 1311 1678055181321699082 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c +1311 1457 1678055181469703057 FinalProject 9e02455301d10951 +2 1342 1678055576036318711 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c +1342 1514 1678055576208323594 FinalProject 9e02455301d10951 +2 765 1678055970199363250 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o aba7285d6d94217e +766 914 1678055970347367355 FinalProject 9e02455301d10951 +2 788 1678056070878149731 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o aba7285d6d94217e +788 927 1678056071014153488 FinalProject 9e02455301d10951 +2 739 1678056088250629550 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o aba7285d6d94217e +739 871 1678056088378633084 FinalProject 9e02455301d10951 diff --git a/cmake-build-relwithdebinfo/2023-2-8_13-8-9.log b/cmake-build-relwithdebinfo/2023-2-8_13-8-9.log deleted file mode 100644 index 33d978b..0000000 --- a/cmake-build-relwithdebinfo/2023-2-8_13-8-9.log +++ /dev/null @@ -1,93 +0,0 @@ -[13:08:09] [INFO]: Using GLAD GL 4.6 -[13:08:11] [DEBUG]: R Key is pressed! -[13:08:11] [TRACE]: R Key Single Press! -[13:08:11] [DEBUG]: R Key is pressed! -[13:08:11] [DEBUG]: R Key is pressed! -[13:08:11] [DEBUG]: R Key is pressed! -[13:08:11] [DEBUG]: R Key is pressed! -[13:08:11] [DEBUG]: R Key is pressed! -[13:08:11] [DEBUG]: R Key is pressed! -[13:08:15] [DEBUG]: R Key is pressed! -[13:08:15] [TRACE]: R Key Single Press! -[13:08:15] [DEBUG]: R Key is pressed! -[13:08:15] [DEBUG]: R Key is pressed! -[13:08:15] [DEBUG]: R Key is pressed! -[13:08:15] [DEBUG]: R Key is pressed! -[13:08:15] [DEBUG]: R Key is pressed! -[13:08:15] [DEBUG]: R Key is pressed! -[13:08:15] [DEBUG]: R Key is pressed! -[13:08:15] [DEBUG]: R Key is pressed! -[13:08:15] [TRACE]: R Key Single Press! -[13:08:15] [DEBUG]: R Key is pressed! -[13:08:15] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:16] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [TRACE]: R Key Single Press! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:20] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! -[13:08:21] [DEBUG]: R Key is pressed! diff --git a/cmake-build-relwithdebinfo/FinalProject b/cmake-build-relwithdebinfo/FinalProject index 740641c..a5c7998 100755 Binary files a/cmake-build-relwithdebinfo/FinalProject and b/cmake-build-relwithdebinfo/FinalProject differ diff --git a/cmake-build-relwithdebinfo/Testing/Temporary/LastTest.log b/cmake-build-relwithdebinfo/Testing/Temporary/LastTest.log index 053c0bb..e2757de 100644 --- a/cmake-build-relwithdebinfo/Testing/Temporary/LastTest.log +++ b/cmake-build-relwithdebinfo/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Mar 05 15:16 EST +Start testing: Mar 05 17:41 EST ---------------------------------------------------------- -End testing: Mar 05 15:16 EST +End testing: Mar 05 17:41 EST diff --git a/cmake-build-relwithdebinfo/libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o b/cmake-build-relwithdebinfo/libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o index d22fa77..0303c16 100644 Binary files a/cmake-build-relwithdebinfo/libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o and b/cmake-build-relwithdebinfo/libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o differ diff --git a/cmake-build-relwithdebinfo/libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o b/cmake-build-relwithdebinfo/libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o index 0a0c07c..c6b9927 100644 Binary files a/cmake-build-relwithdebinfo/libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o and b/cmake-build-relwithdebinfo/libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o differ diff --git a/cmake-build-relwithdebinfo/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o b/cmake-build-relwithdebinfo/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o index a64b52a..971c32c 100644 Binary files a/cmake-build-relwithdebinfo/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o and b/cmake-build-relwithdebinfo/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o differ diff --git a/cmake-build-relwithdebinfo/libraries/BLT/libBLT.a b/cmake-build-relwithdebinfo/libraries/BLT/libBLT.a index 2611b03..9dccdd6 100644 Binary files a/cmake-build-relwithdebinfo/libraries/BLT/libBLT.a and b/cmake-build-relwithdebinfo/libraries/BLT/libBLT.a differ diff --git a/include/world/chunk/storage.h b/include/world/chunk/storage.h index c025f51..f54d86b 100644 --- a/include/world/chunk/storage.h +++ b/include/world/chunk/storage.h @@ -62,6 +62,8 @@ namespace fp { */ void addFace(face face, const block_pos& pos, unsigned char texture_index); + void optimizeFaces(); + inline std::vector& getVertices() { return vertices; } diff --git a/include/world/chunk/world.h b/include/world/chunk/world.h index a76f3f8..7fb2e19 100644 --- a/include/world/chunk/world.h +++ b/include/world/chunk/world.h @@ -26,7 +26,8 @@ namespace fp { } static inline block_pos world_to_internal(const block_pos& coord) { - return {world_to_internal(coord.x), world_to_internal(coord.y), world_to_internal(coord.z)}; + return {world_to_internal(coord.x), world_to_internal(coord.y), + world_to_internal(coord.z)}; } /** @@ -80,58 +81,19 @@ namespace fp { chunk_vao = new VAO(); auto vbo = new VBO(ARRAY_BUFFER, nullptr, 0); auto data_size = 3 * sizeof(float) + 3 * sizeof(float); - chunk_vao->bindVBO(vbo, 0, 3, GL_FLOAT, (int)data_size, 0); - chunk_vao->bindVBO(vbo, 1, 3, GL_FLOAT, (int)data_size, 3 * sizeof(float), true); + chunk_vao->bindVBO(vbo, 0, 3, GL_FLOAT, (int) data_size, 0); + chunk_vao->bindVBO(vbo, 1, 3, GL_FLOAT, (int) data_size, 3 * sizeof(float), true); chunk_vao->bindElementVBO(new VBO(ELEMENT_BUFFER, nullptr, 0)); } - inline void render(shader& shader){ - if (render_size > 0) { - blt::mat4x4 translation{}; - translation.translate((float) pos.x * CHUNK_SIZE, - (float) pos.y * CHUNK_SIZE, - (float) pos.z * CHUNK_SIZE - ); - shader.setMatrix("translation", translation); - // bind the chunk's VAO - chunk_vao->bind(); - // despite binding the element buffer at creation time, this is required. - chunk_vao->getVBO(-1)->bind(); - glEnableVertexAttribArray(0); - glEnableVertexAttribArray(1); - glEnableVertexAttribArray(2); - glDrawElements(GL_TRIANGLES, (int) render_size, GL_UNSIGNED_INT, nullptr); - glDisableVertexAttribArray(2); - glDisableVertexAttribArray(1); - glDisableVertexAttribArray(0); - } - } - - inline void updateChunkMesh(){ - auto& vertices = mesh->getVertices(); - auto& indices = mesh->getIndices(); - - BLT_DEBUG( - "Chunk [%d, %d, %d] mesh updated with %d vertices and %d indices taking (%d, %d) bytes!", - pos.x, pos.y, pos.z, - vertices.size(), indices.size(), vertices.size() * sizeof(vertex), - indices.size() * sizeof(unsigned int)); - - // upload the new vertices to the GPU - chunk_vao->getVBO(0)->update(vertices); - chunk_vao->getVBO(-1)->update(indices); - render_size = indices.size(); + void render(shader& shader); - // delete the local chunk mesh memory, since we no longer need to store it. - delete (mesh); - mesh = nullptr; - markDone(); - } + void updateChunkMesh(); /** * Mark the chunk as completely dirty and in need of a full check refresh */ - inline void markDirty(){ + inline void markDirty() { dirtiness = FULL_MESH; } @@ -146,41 +108,45 @@ namespace fp { /** * Full chunk mesh is now completely generated and waiting on uploading to the GPU */ - inline void markComplete(){ + inline void markComplete() { dirtiness = REFRESH; } /** * Mesh uploading complete, chunk meshing is now done and inactive */ - inline void markDone(){ + inline void markDone() { dirtiness = OKAY; } - + [[nodiscard]] inline block_storage*& getBlockStorage() { return storage; } - - [[nodiscard]] inline mesh_storage*& getMeshStorage(){ + + [[nodiscard]] inline mesh_storage*& getMeshStorage() { return mesh; } - - [[nodiscard]] inline VAO*& getVAO(){ + + [[nodiscard]] inline VAO*& getVAO() { return chunk_vao; } - + [[nodiscard]] inline chunk_pos getPos() const { return pos; } - + [[nodiscard]] inline chunk_mesh_status getDirtiness() const { return dirtiness; } - + [[nodiscard]] inline chunk_update_status& getStatus() { return status; } + inline void setStatus(const chunk_update_status& new_status) { + status = new_status; + } + ~chunk() { delete storage; delete chunk_vao; @@ -206,7 +172,7 @@ namespace fp { void generateChunkMesh(chunk* chunk); - static chunk* generateChunk(const chunk_pos& pos); + chunk* generateChunk(const chunk_pos& pos); inline void getNeighbours(const chunk_pos& pos, chunk_neighbours& neighbours) { neighbours[X_POS] = getChunk(chunk_pos{pos.x + 1, pos.y, pos.z}); @@ -218,18 +184,20 @@ namespace fp { } inline void insertChunk(chunk* chunk) { + if (chunk == nullptr) + return; chunk_storage.insert({chunk->getPos(), chunk}); chunk_neighbours chunkNeighbours{}; getNeighbours(chunk->getPos(), chunkNeighbours); - for (auto* p : chunkNeighbours.neighbours){ + for (auto* p : chunkNeighbours.neighbours) { if (p) - p->getStatus() = NEIGHBOUR_CREATE; + p->setStatus(NEIGHBOUR_CREATE); } } - inline chunk* getChunk(const chunk_pos& pos){ + inline chunk* getChunk(const chunk_pos& pos) { const auto map_pos = chunk_storage.find(pos); if (map_pos == chunk_storage.end()) return nullptr; diff --git a/libraries/BLT b/libraries/BLT index 063a679..d50e13d 160000 --- a/libraries/BLT +++ b/libraries/BLT @@ -1 +1 @@ -Subproject commit 063a67927811339f70f4664c1a32dfeed0b6e9a2 +Subproject commit d50e13dcb6b026b34ee7f902d6eb94fa35a32176 diff --git a/src/main.cpp b/src/main.cpp index b0fb8a7..3db4236 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ void loop(){ } int main() { - auto logging_properties = blt::logging::LOG_PROPERTIES{true, true, true, "./"}; + auto logging_properties = blt::logging::LOG_PROPERTIES{true, true, false, "./"}; logging_properties.m_logFullPath = true; #ifdef __EMSCRIPTEN__ @@ -57,20 +57,6 @@ int main() { chunk_shader = new fp::shader(shader_chunk_vert, shader_chunk_frag); world = new fp::world(); - world->setBlock({0,0,0}, fp::registry::STONE); - - for (int i = 0; i < CHUNK_SIZE; i++) { - for (int j = 0; j < CHUNK_SIZE; j++) { - for (int k = 0; k < CHUNK_SIZE; k++) { - world->setBlock({i, j, k}, (int)(stb_perlin_fbm_noise3(i / 8.0, j / 8.0, k / 8.0, 2.0, 0.5, 6) > 0.5 ? fp::registry::STONE : fp::registry::AIR)); - } - } - } - world->setBlock({-2, 2, 2}, fp::registry::STONE); - world->setBlock({-2, 2, -2}, fp::registry::STONE); - world->setBlock({-5, 6, -5}, fp::registry::COBBLE); - world->setBlock({2, 2, -2}, fp::registry::STONE); - glEnable(GL_CULL_FACE); glEnable(GL_DEPTH_TEST); glCullFace(GL_BACK); diff --git a/src/world/chunk/storage.cpp b/src/world/chunk/storage.cpp index 5609298..7ada8c1 100644 --- a/src/world/chunk/storage.cpp +++ b/src/world/chunk/storage.cpp @@ -80,7 +80,8 @@ void fp::mesh_storage::addFace(fp::face face, const block_pos& pos, unsigned cha // generate translated vertices for (int i = 0; i < VTX_ARR_SIZE; i++) { - // first copy all the information over, since there is extra information we need to preserve like index and UV / normal + // first copy all the default vertex information over, + // since there is extra information we need to preserve like UVs and normals translated_face_vertices[i] = face_vertices[i]; translated_face_vertices[i].index = (float) texture_index; // then we can apply the translation, since the face_vertex value is already there we can add the translation raw @@ -100,7 +101,7 @@ void fp::mesh_storage::addFace(fp::face face, const block_pos& pos, unsigned cha auto current_index_pos = vertices.size(); vertices.push_back(index_vertex); // Since we are inserting using the order of the face_indices this will ensure that the triangle vertices are ordered correctly (outward facing) - created_vertices_index.insert({index_vertex, current_index_pos}); + created_vertices_index[index_vertex] = current_index_pos; indices.push_back(current_index_pos); } else { // does exist in the face_vertices we can use that knowledge to reduce the total # of vertices @@ -108,3 +109,7 @@ void fp::mesh_storage::addFace(fp::face face, const block_pos& pos, unsigned cha } } } + +void fp::mesh_storage::optimizeFaces() { + +} diff --git a/src/world/chunk/world.cpp b/src/world/chunk/world.cpp index 9a3c87c..14a0f26 100644 --- a/src/world/chunk/world.cpp +++ b/src/world/chunk/world.cpp @@ -9,11 +9,10 @@ #include #include #include "stb/stb_perlin.h" +#include void fp::world::generateFullMesh(mesh_storage* mesh, fp::chunk* chunk) { BLT_START_INTERVAL("Chunk Mesh", "Full Mesh"); - // checks to outside the bounds of the chunk should not have faces added. this will be handled by the partial mesh! - bool outside = false; for (int i = 0; i < CHUNK_SIZE; i++) { for (int j = 0; j < CHUNK_SIZE; j++) { @@ -109,7 +108,7 @@ void fp::world::generateEdgeMesh(mesh_storage* mesh, fp::chunk* chunk) { void fp::world::generateChunkMesh(fp::chunk* chunk) { if (chunk->getMeshStorage() == nullptr) - chunk->getMeshStorage() = new mesh_storage; + chunk->getMeshStorage() = new mesh_storage(); if (chunk->getDirtiness() == FULL_MESH) { // full chunk mesh generateFullMesh(chunk->getMeshStorage(), chunk); @@ -181,6 +180,8 @@ void fp::world::render(fp::shader& shader) { } fp::chunk* fp::world::generateChunk(const fp::chunk_pos& pos) { + if (this->getChunk(pos)) + return nullptr; BLT_START_INTERVAL("Chunk Generate", "Instantiate"); auto* c = new chunk(pos); block_storage*& storage = c->getBlockStorage(); @@ -206,3 +207,46 @@ fp::chunk* fp::world::generateChunk(const fp::chunk_pos& pos) { return c; } + +void fp::chunk::render(fp::shader& shader) { + if (render_size > 0) { + blt::mat4x4 translation{}; + translation.translate((float) pos.x * CHUNK_SIZE, + (float) pos.y * CHUNK_SIZE, + (float) pos.z * CHUNK_SIZE + ); + shader.setMatrix("translation", translation); + // bind the chunk's VAO + chunk_vao->bind(); + // despite binding the element buffer at creation time, this is required. + chunk_vao->getVBO(-1)->bind(); + glEnableVertexAttribArray(0); + glEnableVertexAttribArray(1); + glEnableVertexAttribArray(2); + glDrawElements(GL_TRIANGLES, (int) render_size, GL_UNSIGNED_INT, nullptr); + glDisableVertexAttribArray(2); + glDisableVertexAttribArray(1); + glDisableVertexAttribArray(0); + } +} + +void fp::chunk::updateChunkMesh() { + auto& vertices = mesh->getVertices(); + auto& indices = mesh->getIndices(); + + BLT_DEBUG( + "Chunk [%d, %d, %d] mesh updated with %d vertices and %d indices taking (%s, %s) bytes!", + pos.x, pos.y, pos.z, + vertices.size(), indices.size(), blt::string::fromBytes(vertices.size() * sizeof(vertex)).c_str(), + blt::string::fromBytes(indices.size() * sizeof(unsigned int)).c_str()); + + // upload the new vertices to the GPU + chunk_vao->getVBO(0)->update(vertices); + chunk_vao->getVBO(-1)->update(indices); + render_size = indices.size(); + + // delete the local chunk mesh memory, since we no longer need to store it. + delete (mesh); + mesh = nullptr; + markDone(); +}