diff --git a/CMakeLists.txt b/CMakeLists.txt index 56b9b43..b04b1f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,10 +52,10 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/assets DESTINATION ${CMAKE_CURRENT_BINARY_ if (USE_EXTRAS) #set_target_properties(FinalProject PROPERTIES LINK_FLAGS "-s DEMANGLE_SUPPORT=1 --preload-file ${CMAKE_SOURCE_DIR}/assets --bind") #set_target_properties(FinalProject PROPERTIES LINK_FLAGS "-s DEMANGLE_SUPPORT=1 --preload-file 'assets' --bind") - set_target_properties(FinalProject PROPERTIES LINK_FLAGS "-sMAX_WEBGL_VERSION=2 -s ASSERTIONS=1 -sUSE_GLFW=3 --preload-file 'assets'") + set_target_properties(FinalProject PROPERTIES LINK_FLAGS "-sMAX_WEBGL_VERSION=2 -sASSERTIONS=1 -pthread -sPTHREAD_POOL_SIZE=8 -s INITIAL_MEMORY=134217728 -sUSE_GLFW=3 --preload-file 'assets'") # these flags will be set by cmake automatically based on build type #set_target_properties(FinalProject PROPERTIES COMPILE_FLAGS "-O3") - #set_target_properties(FinalProject PROPERTIES COMPILE_FLAGS "-g") + set_target_properties(FinalProject PROPERTIES COMPILE_FLAGS "-pthread") else() target_link_libraries(FinalProject PRIVATE glfw) endif() \ No newline at end of file diff --git a/build_debug_emscript.sh b/build_debug_emscript.sh index 86cf10d..024d01f 100755 --- a/build_debug_emscript.sh +++ b/build_debug_emscript.sh @@ -8,3 +8,4 @@ emmake make -j 16 cp FinalProject.js /var/www/html/emscript/ cp FinalProject.data /var/www/html/emscript/ cp FinalProject.wasm /var/www/html/emscript/ +cp FinalProject.worker.js /var/www/html/emscript/ diff --git a/build_emscript.sh b/build_emscript.sh index 517ac0d..ba01066 100755 --- a/build_emscript.sh +++ b/build_emscript.sh @@ -8,3 +8,4 @@ emmake make -j 16 cp FinalProject.js /var/www/html/emscript/ cp FinalProject.data /var/www/html/emscript/ cp FinalProject.wasm /var/www/html/emscript/ +cp FinalProject.worker.js /var/www/html/emscript/ diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log index 01b0db7..5c5d894 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -23,7 +23,7 @@ 1840 1892 1677649374931277679 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpatent.c.o 6617c5fd2e75a2f9 858 1084 1677649374123254573 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_init.c.o 7a310a4749a2e05 1651 1775 1677649374815274363 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbitmap.c.o 8ce02b3a42c98959 -0 98 1678070657256680627 build.ninja 190f84590f6ee728 +0 98 1678162061061650682 build.ninja 190f84590f6ee728 2550 2591 1677649375631297699 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftdebug.c.o b73c3b9b7d19e4d5 3 366 1677858170717275276 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o 342a5daa6ca9681d 1656 1710 1677649374747272417 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftcid.c.o c5d515ae6d477f99 diff --git a/cmake-build-emrelease/CMakeCache.txt b/cmake-build-emrelease/CMakeCache.txt index a8090f1..f98598a 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=Release +CMAKE_BUILD_TYPE:STRING=Debug //Enable/Disable color output during build. CMAKE_COLOR_MAKEFILE:BOOL=ON diff --git a/cmake-build-emrelease/CMakeFiles/CMakeOutput.log b/cmake-build-emrelease/CMakeFiles/CMakeOutput.log index 61b4e77..9b110a6 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-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-nkD9HZ +Change Dir: /home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-sKGnp4 -Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_964c5/fast && /usr/bin/gmake -f CMakeFiles/cmTC_964c5.dir/build.make CMakeFiles/cmTC_964c5.dir/build -gmake[1]: Entering directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-nkD9HZ' -Building C object CMakeFiles/cmTC_964c5.dir/CheckIncludeFile.c.o -/usr/bin/emcc -MD -MT CMakeFiles/cmTC_964c5.dir/CheckIncludeFile.c.o -MF CMakeFiles/cmTC_964c5.dir/CheckIncludeFile.c.o.d -o CMakeFiles/cmTC_964c5.dir/CheckIncludeFile.c.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-nkD9HZ/CheckIncludeFile.c" -Linking C executable cmTC_964c5.js -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_964c5.dir/link.txt --verbose=1 -/usr/bin/emcc @CMakeFiles/cmTC_964c5.dir/objects1 -o cmTC_964c5.js -gmake[1]: Leaving directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-nkD9HZ' +Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_d6074/fast && /usr/bin/gmake -f CMakeFiles/cmTC_d6074.dir/build.make CMakeFiles/cmTC_d6074.dir/build +gmake[1]: Entering directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-sKGnp4' +Building C object CMakeFiles/cmTC_d6074.dir/CheckIncludeFile.c.o +/usr/bin/emcc -MD -MT CMakeFiles/cmTC_d6074.dir/CheckIncludeFile.c.o -MF CMakeFiles/cmTC_d6074.dir/CheckIncludeFile.c.o.d -o CMakeFiles/cmTC_d6074.dir/CheckIncludeFile.c.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-sKGnp4/CheckIncludeFile.c" +Linking C executable cmTC_d6074.js +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_d6074.dir/link.txt --verbose=1 +/usr/bin/emcc @CMakeFiles/cmTC_d6074.dir/objects1 -o cmTC_d6074.js +gmake[1]: Leaving directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-sKGnp4' 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-s1aY2P +Change Dir: /home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-NhkJcD -Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_90857/fast && /usr/bin/gmake -f CMakeFiles/cmTC_90857.dir/build.make CMakeFiles/cmTC_90857.dir/build -gmake[1]: Entering directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-s1aY2P' -Building C object CMakeFiles/cmTC_90857.dir/CheckIncludeFile.c.o -/usr/bin/emcc -MD -MT CMakeFiles/cmTC_90857.dir/CheckIncludeFile.c.o -MF CMakeFiles/cmTC_90857.dir/CheckIncludeFile.c.o.d -o CMakeFiles/cmTC_90857.dir/CheckIncludeFile.c.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-s1aY2P/CheckIncludeFile.c" -Linking C executable cmTC_90857.js -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_90857.dir/link.txt --verbose=1 -/usr/bin/emcc @CMakeFiles/cmTC_90857.dir/objects1 -o cmTC_90857.js -gmake[1]: Leaving directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-s1aY2P' +Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_51a42/fast && /usr/bin/gmake -f CMakeFiles/cmTC_51a42.dir/build.make CMakeFiles/cmTC_51a42.dir/build +gmake[1]: Entering directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-NhkJcD' +Building C object CMakeFiles/cmTC_51a42.dir/CheckIncludeFile.c.o +/usr/bin/emcc -MD -MT CMakeFiles/cmTC_51a42.dir/CheckIncludeFile.c.o -MF CMakeFiles/cmTC_51a42.dir/CheckIncludeFile.c.o.d -o CMakeFiles/cmTC_51a42.dir/CheckIncludeFile.c.o -c "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-NhkJcD/CheckIncludeFile.c" +Linking C executable cmTC_51a42.js +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_51a42.dir/link.txt --verbose=1 +/usr/bin/emcc @CMakeFiles/cmTC_51a42.dir/objects1 -o cmTC_51a42.js +gmake[1]: Leaving directory '/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-emrelease/CMakeFiles/CMakeScratch/TryCompile-NhkJcD' diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/build.make b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/build.make index fa41747..07a01d3 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/build.make +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/build.make @@ -284,7 +284,7 @@ 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/libfreetype.a +FinalProject.js: libraries/freetype-2.13.0/libfreetyped.a FinalProject.js: CMakeFiles/FinalProject.dir/linkLibs.rsp FinalProject.js: CMakeFiles/FinalProject.dir/objects1 FinalProject.js: CMakeFiles/FinalProject.dir/link.txt diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/flags.make b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/flags.make index 209e534..125c82e 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 = -O3 -DNDEBUG -std=gnu++17 +CXX_FLAGS = -g -pthread -std=gnu++17 diff --git a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/link.txt b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/link.txt index 6977910..a7fb114 100644 --- a/cmake-build-emrelease/CMakeFiles/FinalProject.dir/link.txt +++ b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/link.txt @@ -1 +1 @@ -/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 +/usr/bin/em++ -g -sMAX_WEBGL_VERSION=2 -sASSERTIONS=1 -pthread -sPTHREAD_POOL_SIZE=8 -s INITIAL_MEMORY=134217728 -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 651a174..4d0d7b9 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/libfreetype.a" + libraries/BLT/libBLT.a "libraries/freetype-2.13.0/libfreetyped.a" 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 37e60ea..c324d66 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 @@ -356,10 +356,5 @@ CMakeFiles/FinalProject.dir/src/main.cpp.o: \ /usr/share/emscripten/cache/sysroot/include/c++/v1/any \ /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/parallel-hashmap/parallel_hashmap/phmap_base.h \ /usr/share/emscripten/cache/sysroot/include/c++/v1/shared_mutex \ - /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/sparsepp/sparsepp/spp.h \ - /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/sparsepp/sparsepp/spp_stdint.h \ - /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/sparsepp/sparsepp/spp_config.h \ - /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/sparsepp/sparsepp/spp_traits.h \ - /home/brett/Documents/Brock/CS\ 3P98/Final\ Project/libraries/sparsepp/sparsepp/spp_utils.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 fcf4142..cf038f8 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/window.cpp.o b/cmake-build-emrelease/CMakeFiles/FinalProject.dir/src/render/window.cpp.o index 7be07d3..b88be71 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/Makefile2 b/cmake-build-emrelease/CMakeFiles/Makefile2 index be0d208..d706233 100644 --- a/cmake-build-emrelease/CMakeFiles/Makefile2 +++ b/cmake-build-emrelease/CMakeFiles/Makefile2 @@ -116,8 +116,8 @@ 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,19,20,21,22 "Built target FinalProject" diff --git a/cmake-build-emrelease/cmake_install.cmake b/cmake-build-emrelease/cmake_install.cmake index d3dfad3..6c3966a 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 "Release") + set(CMAKE_INSTALL_CONFIG_NAME "Debug") 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 3968636..36e8f9b 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 = -O3 -DNDEBUG -std=gnu++17 +CXX_FLAGS = -g -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 70e90d9..6c7ea4b 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 c299ce7..d1a1c57 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 acce31b..b436902 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/std/filesystem.cpp.o b/cmake-build-emrelease/libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o index 79464cf..5b5c5b2 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 29c2185..f75deee 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 7aafebf..6735e3b 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 c299ce7..34f995b 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/cmake_install.cmake b/cmake-build-emrelease/libraries/BLT/cmake_install.cmake index e4244f6..b028010 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 "Release") + set(CMAKE_INSTALL_CONFIG_NAME "Debug") 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 2693d4e..d0c4ea2 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 8a45c63..dc97495 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 1c297f5..8bc96ee 100644 --- a/cmake-build-relwithdebinfo/.ninja_log +++ b/cmake-build-relwithdebinfo/.ninja_log @@ -1,199 +1,99 @@ # ninja log v5 -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 -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 1364 1678070250221935013 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 +2348 3084 1678070661300787790 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pfr/pfr.c.o ab228dba245a6513 +3284 3690 1678070661904803796 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type42/type42.c.o 93c3ce93b8e83e70 +3403 3485 1678070661700798390 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/builds/unix/ftsystem.c.o 41e50141df636173 +4 1864 1678156188152640160 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 3e7542c3498b07ce +3084 3160 1678070661376789805 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/svg/svg.c.o ae5121127ee23e21 +6 1354 1678161265380326567 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 +2013 2081 1678070660296761185 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftsynth.c.o b5f57b53ec1f4e7e 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 -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 -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 -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 +4 810 1678156187100611896 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o cd550cf933ac9581 +1909 1984 1678070660200758641 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftinit.c.o f2500fd05d35095 +3 723 1678156187012609532 CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o 7c1555163f00549 +1852 1902 1678070660116756415 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftfstype.c.o ec6a23a3a20d2377 +707 2705 1678156188992662727 libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o 8d9e4316b1ad8908 +1747 1846 1678070660060754930 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbdf.c.o 37d0b402287d22e9 +3 1240 1678156187528623395 CMakeFiles/FinalProject.dir/src/render/window.cpp.o 9d08e7d5a6aae412 +3283 4047 1678070662260813231 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type1/type1.c.o a1290423c90c3865 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 +1902 2100 1678070660316761715 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftglyph.c.o b150602498cdf092 736 1052 1677855181400369299 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/window.c.o f41ed544e41bb850 -2106 2849 1677855183196419267 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bdf/bdf.c.o 4b769d5fae89194d -1993 2047 1677855182396397011 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpatent.c.o 502fe0621b2db366 +2081 2853 1678070661068781643 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bdf/bdf.c.o 65e7b6d08bf50e02 +1955 2001 1678070660216759065 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpatent.c.o 52f916a94f362852 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 -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 -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 +1791 2094 1678070660308761503 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbitmap.c.o 73c3ed28cf4c1b78 +3486 3546 1678070661760799981 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftdebug.c.o c39a51376c41f413 +614 1542 1678070659756746874 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o e3a12a5053a595e6 +1847 1909 1678070660124756627 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftcid.c.o 43a6797a1b7f129 +1666 3895 1678070662108809202 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbase.c.o 998834c6b644b111 +2709 3284 1678070661496792984 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/raster/raster.c.o fd52fcb1ba4f8286 203 379 1677855180728350604 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/init.c.o 7363bcb2dba2054a -2489 2554 1678054915330558596 libraries/BLT/libBLT.a b8f809e0bb7338ed -898 1064 1678070494476372676 FinalProject 9e02455301d10951 -2020 2085 1677855182432398012 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpfr.c.o 565b64bbd1fc7af5 -2113 2153 1677855182500399904 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bzip2/ftbzip2.c.o 7d125f3d19646cd0 +2705 2769 1678156189048664232 libraries/BLT/libBLT.a b8f809e0bb7338ed +1354 1486 1678161265512330112 FinalProject 9e02455301d10951 +1985 2047 1678070660260760230 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpfr.c.o b074804bd9b17778 +2095 2134 1678070660348762562 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bzip2/ftbzip2.c.o b1451876ad0c2cd2 1141 1230 1677855181576374196 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/posix_thread.c.o ed8a69d447bea26a -4 1535 1678054914314531346 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/logging.cpp.o a4d3cad66687d105 +1092 2832 1678070661044781006 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/logging.cpp.o d4363ab8a0e2f812 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 +2502 3403 1678070661616796164 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pshinter/pshinter.c.o 6a56fca8daaa5013 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 884 1678044751642967363 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o 5776e342ea508518 +2220 2348 1678070660564768286 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/lzw/ftlzw.c.o f61b10c3b626c1dd +3 1057 1678156187344618452 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o f3620cf4e7968b7 996 1698 1677855182044387219 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_window.c.o 3c77d54154e66152 -1357 2539 1677855182884410587 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/loader.cpp.o dba8b361d1594e59 -2539 4386 1677855184732461998 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psaux/psaux.c.o 2a71d88eed8a5228 +922 2220 1678070660432764788 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/loader.cpp.o c557c5218af7c768 +2483 4334 1678070662548820863 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psaux/psaux.c.o 168e0faabf4c1331 1698 1756 1677855182100388775 libraries/glfw-3.3.8/src/libglfw3.a fd552f215cfdce3e -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 921 1678070249777923350 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb +1905 1955 1678070660168757791 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgxval.c.o d581a2d86fb2551f +3 4373 1678156190660707538 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 257310165eab029f +4 994 1678161265020316894 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f 379 735 1677855181084360508 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/input.c.o b9b0555d1bde647a -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 +1375 1740 1678070659956752174 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt_block.cpp.o 2776c4c4013ee52a +5418 5512 1678070663712851709 libraries/freetype-2.13.0/libfreetype.a 2cada0509b693271 +1902 1955 1678070660168757791 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgasp.c.o 146c833e53477d4c 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 +2853 5416 1678070663628849483 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sfnt/sfnt.c.o 15e6bf212fed69ee +2135 2277 1678070660492766379 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/gzip/ftgzip.c.o aec595ccf350c3de +2918 3294 1678070661508793302 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/smooth/smooth.c.o 1b6e9346e5327151 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 -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 -2 898 1678070494308368236 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 -2088 2139 1677855182488399570 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftwinfnt.c.o 9fabacfc2ff8811a -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 -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 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 -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 -3 609 1678070658824722177 CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o 7c1555163f00549 -4 614 1678070658828722283 CMakeFiles/FinalProject.dir/src/util/math.cpp.o ec283719ebaf6ceb -3 922 1678070659136730445 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o f3620cf4e7968b7 -609 1091 1678070659304734897 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o 2c3b8fea3d8cd068 -4 1220 1678070659432738289 CMakeFiles/FinalProject.dir/src/render/window.cpp.o 9d08e7d5a6aae412 -4 1323 1678070659536741045 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o 1b53573cc457256f -4 1356 1678070659572742000 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 -3 1375 1678070659588742424 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -614 1542 1678070659756746874 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o e3a12a5053a595e6 -3 1666 1678070659880750162 CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o c83570e70885b684 -1375 1740 1678070659956752174 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt_block.cpp.o 2776c4c4013ee52a -1220 1747 1678070659960752280 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o cd550cf933ac9581 -4 1791 1678070660004753447 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 3e7542c3498b07ce -1747 1846 1678070660060754930 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbdf.c.o 37d0b402287d22e9 -3 1851 1678070660064755036 CMakeFiles/FinalProject.dir/src/render/gl.cpp.o abd063fd20b16b86 -1852 1902 1678070660116756415 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftfstype.c.o ec6a23a3a20d2377 -1740 1902 1678070660116756415 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbbox.c.o ab4beb2a7b0c8127 -4 1905 1678070660116756415 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 -1847 1909 1678070660124756627 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftcid.c.o 43a6797a1b7f129 -1323 1923 1678070660136756944 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o 605e32b89f0f85a9 -1902 1955 1678070660168757791 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgasp.c.o 146c833e53477d4c -1905 1955 1678070660168757791 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgxval.c.o d581a2d86fb2551f -1909 1984 1678070660200758641 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftinit.c.o f2500fd05d35095 -1955 2001 1678070660216759065 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpatent.c.o 52f916a94f362852 -1955 2013 1678070660228759382 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftotval.c.o 8326ff6fba9ef6fe -1985 2047 1678070660260760230 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpfr.c.o b074804bd9b17778 -1923 2061 1678070660276760655 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftmm.c.o 7f9dcbd40156aa76 -2013 2081 1678070660296761185 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftsynth.c.o b5f57b53ec1f4e7e -1791 2094 1678070660308761503 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbitmap.c.o 73c3ed28cf4c1b78 -1902 2100 1678070660316761715 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftglyph.c.o b150602498cdf092 -2061 2105 1678070660320761821 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftwinfnt.c.o 8591fe9cce0a1085 -2047 2106 1678070660320761821 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/fttype1.c.o 3946ebde2d00331a -2095 2134 1678070660348762562 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bzip2/ftbzip2.c.o b1451876ad0c2cd2 -922 2220 1678070660432764788 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/loader.cpp.o c557c5218af7c768 -2135 2277 1678070660492766379 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/gzip/ftgzip.c.o aec595ccf350c3de -2220 2348 1678070660564768286 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/lzw/ftlzw.c.o f61b10c3b626c1dd -2106 2483 1678070660696771785 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cid/type1cid.c.o c45b39f284e63eae -2001 2502 1678070660716772314 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftstroke.c.o 9b94524c5811b687 -2277 2694 1678070660908777403 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pcf/pcf.c.o 481b5322fe45f200 -2100 2709 1678070660924777826 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cache/ftcache.c.o 5a8e38b3a9c5e9e2 -1092 2832 1678070661044781006 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/logging.cpp.o d4363ab8a0e2f812 -2081 2853 1678070661068781643 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bdf/bdf.c.o 65e7b6d08bf50e02 -2694 2918 1678070661132783338 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psnames/psnames.c.o 9d009df581fba93d -2348 3084 1678070661300787790 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pfr/pfr.c.o ab228dba245a6513 -3084 3160 1678070661376789805 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/svg/svg.c.o ae5121127ee23e21 -2105 3283 1678070661496792984 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cff/cff.c.o 5007f6dffd445a31 -2709 3284 1678070661496792984 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/raster/raster.c.o fd52fcb1ba4f8286 -2918 3294 1678070661508793302 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/smooth/smooth.c.o 1b6e9346e5327151 -2502 3403 1678070661616796164 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pshinter/pshinter.c.o 6a56fca8daaa5013 -3403 3485 1678070661700798390 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/builds/unix/ftsystem.c.o 41e50141df636173 -3294 3524 1678070661740799450 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/winfonts/winfnt.c.o 842598df706e72c6 -3486 3546 1678070661760799981 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftdebug.c.o c39a51376c41f413 -2832 3621 1678070661836801994 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sdf/sdf.c.o fbef424bacef95c0 -1542 3627 1678070661840802099 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/autofit/autofit.c.o bb728798bc789b1b -3284 3690 1678070661904803796 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type42/type42.c.o 93c3ce93b8e83e70 -1666 3895 1678070662108809202 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbase.c.o 998834c6b644b111 -3283 4047 1678070662260813231 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type1/type1.c.o a1290423c90c3865 -1357 4157 1678070662368816093 libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o 8d9e4316b1ad8908 -4157 4216 1678070662428817683 libraries/BLT/libBLT.a b8f809e0bb7338ed -2483 4334 1678070662548820863 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psaux/psaux.c.o 168e0faabf4c1331 -3 4908 1678070663120836021 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 257310165eab029f -2853 5416 1678070663628849483 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sfnt/sfnt.c.o 15e6bf212fed69ee 3160 5418 1678070663632849589 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/truetype/truetype.c.o 7979b4831a62bb0c -5418 5512 1678070663712851709 libraries/freetype-2.13.0/libfreetype.a 2cada0509b693271 -5513 5644 1678070663856855526 FinalProject 9e02455301d10951 -2 1189 1678070797696405230 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 -2 1196 1678070797700405336 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -2 1558 1678070798064414997 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 -1558 1697 1678070798200418606 FinalProject 9e02455301d10951 -2 1133 1678071288909467858 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 -2 1138 1678071288913467966 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -2 1545 1678071289321478831 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 -1545 1701 1678071289473482878 FinalProject 9e02455301d10951 -2 1102 1678071407260620146 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -3 1293 1678071407452625261 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 -3 1514 1678071407672631122 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 -1514 1646 1678071407804634638 FinalProject 9e02455301d10951 -3 1159 1678078878328191358 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -3 1298 1678078878464194991 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 -3 1505 1678078878672200550 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 -1505 1651 1678078878816204396 FinalProject 9e02455301d10951 -3 1323 1678079214041194293 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -3 1383 1678079214101195909 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 -3 1669 1678079214385203548 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 -1669 1810 1678079214525207315 FinalProject 9e02455301d10951 -3 1116 1678079529081684926 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -1116 1252 1678079529213688490 FinalProject 9e02455301d10951 -2 1074 1678079549194227853 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -1074 1213 1678079549330231523 FinalProject 9e02455301d10951 -2 1078 1678079638360635791 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -1078 1210 1678079638488639250 FinalProject 9e02455301d10951 -2 1164 1678079750599668721 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -1164 1313 1678079750747672722 FinalProject 9e02455301d10951 -3 1201 1678079789580722493 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 -1201 1339 1678079789716726168 FinalProject 9e02455301d10951 -3 1244 1678080266533746012 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -3 1388 1678080266677750041 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 -3 1892 1678080267181764146 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 -1892 2036 1678080267325768177 FinalProject 9e02455301d10951 -2 1108 1678080343643900030 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -2 1220 1678080343755903154 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 -2 1521 1678080344055911519 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 -1521 1655 1678080344187915200 FinalProject 9e02455301d10951 -2 1191 1678115458859390863 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -2 1420 1678115459091397186 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 -2 1575 1678115459243401325 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 -1575 1704 1678115459371404813 FinalProject 9e02455301d10951 -2 1181 1678115586658870102 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -2 1332 1678115586806874126 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 -3 1557 1678115587030880222 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 -1557 1693 1678115587166883922 FinalProject 9e02455301d10951 -2 1071 1678115738963010170 CMakeFiles/FinalProject.dir/src/main.cpp.o 44f0aca089894d0f -2 1222 1678115739115014299 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 -2 1350 1678115739243017776 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 3e7542c3498b07ce -2 1467 1678115739359020927 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 -1467 1599 1678115739491024515 FinalProject 9e02455301d10951 +1323 1923 1678070660136756944 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o 605e32b89f0f85a9 +2106 2483 1678070660696771785 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cid/type1cid.c.o c45b39f284e63eae +2832 3621 1678070661836801994 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sdf/sdf.c.o fbef424bacef95c0 +1923 2061 1678070660276760655 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftmm.c.o 7f9dcbd40156aa76 +4 1117 1678161265140320118 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 19cb330422f1ead7 +1199 1358 1677855181708377870 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/osmesa_context.c.o a913dd02c9ac6f97 +2061 2105 1678070660320761821 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftwinfnt.c.o 8591fe9cce0a1085 +4 906 1678161264932314531 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o 1b53573cc457256f +2277 2694 1678070660908777403 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pcf/pcf.c.o 481b5322fe45f200 +2694 2918 1678070661132783338 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psnames/psnames.c.o 9d009df581fba93d +4 707 1678156186996609103 CMakeFiles/FinalProject.dir/src/util/math.cpp.o ec283719ebaf6ceb +609 1091 1678070659304734897 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o 2c3b8fea3d8cd068 +1955 2013 1678070660228759382 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftotval.c.o 8326ff6fba9ef6fe +3 1770 1678156188060637689 CMakeFiles/FinalProject.dir/src/render/gl.cpp.o abd063fd20b16b86 +3294 3524 1678070661740799450 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/winfonts/winfnt.c.o 842598df706e72c6 +3 1611 1678156187900633391 CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o c83570e70885b684 +2001 2502 1678070660716772314 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftstroke.c.o 9b94524c5811b687 +1740 1902 1678070660116756415 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbbox.c.o ab4beb2a7b0c8127 +1542 3627 1678070661840802099 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/autofit/autofit.c.o bb728798bc789b1b +2047 2106 1678070660320761821 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/fttype1.c.o 3946ebde2d00331a +2100 2709 1678070660924777826 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cache/ftcache.c.o 5a8e38b3a9c5e9e2 +2105 3283 1678070661496792984 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cff/cff.c.o 5007f6dffd445a31 +1204 1349 1677855181696377535 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/linux_joystick.c.o 3df40cb71360060f +3 1481 1678162838530951070 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 +1481 1696 1678162838750957039 FinalProject 9e02455301d10951 +3 1562 1678162874999940179 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 +1562 1725 1678162875163944626 FinalProject 9e02455301d10951 +3 1644 1678162903612715840 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 +1644 1795 1678162903760719852 FinalProject 9e02455301d10951 +3 1308 1678162995035192233 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 +1308 1441 1678162995167195807 FinalProject 9e02455301d10951 +3 1421 1678163051756727318 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 +1421 1568 1678163051904731323 FinalProject 9e02455301d10951 +3 1435 1678163068889190804 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 +1435 1596 1678163069049195131 FinalProject 9e02455301d10951 +3 1372 1678163100294040191 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 +1372 1511 1678163100434043980 FinalProject 9e02455301d10951 +2 1435 1678163134806973354 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 5a5f514ae327b7c6 +1435 1597 1678163134966977681 FinalProject 9e02455301d10951 diff --git a/cmake-build-relwithdebinfo/FinalProject b/cmake-build-relwithdebinfo/FinalProject index 049611e..612e3ba 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 379fe61..6f7dd02 100644 --- a/cmake-build-relwithdebinfo/Testing/Temporary/LastTest.log +++ b/cmake-build-relwithdebinfo/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Mar 06 10:15 EST +Start testing: Mar 06 23:26 EST ---------------------------------------------------------- -End testing: Mar 06 10:15 EST +End testing: Mar 06 23:26 EST 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 c6b9927..860a6ca 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/libBLT.a b/cmake-build-relwithdebinfo/libraries/BLT/libBLT.a index 9dccdd6..51abea1 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 bbe5c0f..4751d93 100644 --- a/include/world/chunk/storage.h +++ b/include/world/chunk/storage.h @@ -14,8 +14,11 @@ #include #include #include +#ifdef __EMSCRIPTEN__ #include +#else #include +#endif // contains storage classes for block IDs inside chunks plus eventual lookup of block states @@ -44,7 +47,7 @@ namespace fp { if (pos.x < 0 || pos.x >= CHUNK_SIZE || pos.y < 0 || pos.y >= CHUNK_SIZE || pos.z < 0 || pos.z >= CHUNK_SIZE) { return false; } - return fp::registry::get(get(pos)).visibility >= fp::registry::TRANSPARENT_TEXTURE; + return fp::registry::get(get(pos)).visibility > fp::registry::OPAQUE; } inline void set(const block_pos& pos, block_type blockID) { @@ -54,7 +57,13 @@ namespace fp { class mesh_storage { private: + // spp doesn't support emscripten, but phmap does work + // slightly more memory consumption but still much lower than std::unordered_map (plus much faster access) +#ifdef __EMSCRIPTEN__ + phmap::flat_hash_map created_vertices_index; +#else spp::sparse_hash_map created_vertices_index; +#endif std::vector vertices; std::vector indices; public: diff --git a/include/world/chunk/world.h b/include/world/chunk/world.h index 77f295a..274de4d 100644 --- a/include/world/chunk/world.h +++ b/include/world/chunk/world.h @@ -105,7 +105,7 @@ namespace fp { dirtiness = REFRESH; } - [[nodiscard]] inline block_storage*& getBlockStorage() { + [[nodiscard]] inline block_storage* getBlockStorage() { return storage; } diff --git a/libraries/BLT b/libraries/BLT index d50e13d..b62d4bf 160000 --- a/libraries/BLT +++ b/libraries/BLT @@ -1 +1 @@ -Subproject commit d50e13dcb6b026b34ee7f902d6eb94fa35a32176 +Subproject commit b62d4bfe78930132ce649852f9fef5df72f17de6 diff --git a/src/render/ui/debug.cpp b/src/render/ui/debug.cpp index 3c18a21..b4956ec 100644 --- a/src/render/ui/debug.cpp +++ b/src/render/ui/debug.cpp @@ -7,6 +7,7 @@ #include #include #include +#include "render/camera.h" namespace fp::debug { const float spacing = 5; @@ -54,5 +55,15 @@ namespace fp::debug { fps += std::to_string((double) fp::window::getFrameDeltaRaw() / 1000000.0); fps += "ms)"; drawAndIncrement(fps, x_offset * 2, left_y_pos); + + auto& camera_pos = fp::camera::getPosition(); + std::string pos = "Position: "; + pos += std::to_string(camera_pos.x()); + pos += " "; + pos += std::to_string(camera_pos.y()); + pos += " "; + pos += std::to_string(camera_pos.z()); + + drawAndIncrement(pos, x_offset * 2, left_y_pos); } } diff --git a/src/util/settings.cpp b/src/util/settings.cpp index 4ffce91..48194d6 100644 --- a/src/util/settings.cpp +++ b/src/util/settings.cpp @@ -20,6 +20,10 @@ void write_default_values(){ void fp::settings::load(const std::string& file) { write_default_values(); + +#ifdef __EMSCRIPTEN__ + return; +#endif BLT_INFO("Loading settings file %s!", file.c_str()); @@ -48,6 +52,9 @@ void fp::settings::load(const std::string& file) { } void fp::settings::save(const std::string& file) { +#ifdef __EMSCRIPTEN__ + return; +#endif std::ofstream output {file}; output.exceptions(std::ios::failbit | std::ios::badbit); for (const auto& property : properties){ diff --git a/src/world/chunk/world.cpp b/src/world/chunk/world.cpp index 7c3ee69..9c1ee34 100644 --- a/src/world/chunk/world.cpp +++ b/src/world/chunk/world.cpp @@ -15,12 +15,12 @@ inline void checkEdgeFaces( fp::mesh_storage* mesh, fp::chunk* chunk, fp::chunk* neighbour, fp::face face, const fp::block_pos& pos, const fp::block_pos& neighbour_pos ) { - auto*& storage = chunk->getBlockStorage(); + auto* storage = chunk->getBlockStorage(); auto& block = fp::registry::get(storage->get(pos)); auto texture_index = fp::registry::getTextureIndex(block.textureName); - if (block.visibility <= fp::registry::TRANSPARENT_TEXTURE) { - if (fp::registry::get(storage->get(neighbour_pos)).visibility) + if (block.visibility == fp::registry::OPAQUE) { + if (fp::registry::get(storage->get(neighbour_pos)).visibility > fp::registry::OPAQUE) mesh->addFace(face, pos, texture_index); } } @@ -46,7 +46,7 @@ void fp::world::generateChunkMesh(chunk* chunk) { BLT_START_INTERVAL("Chunk", "Mesh"); - auto*& block_storage = chunk->getBlockStorage(); + auto* block_storage = chunk->getBlockStorage(); for (int i = 0; i < CHUNK_SIZE; i++) { for (int j = 0; j < CHUNK_SIZE; j++) { @@ -55,8 +55,8 @@ void fp::world::generateChunkMesh(chunk* chunk) { auto texture_index = fp::registry::getTextureIndex(block.textureName); - // The main chunk mesh can handle opaque and transparent textures. (Transparency will be discarded) - if (block.visibility <= registry::TRANSPARENT_TEXTURE) { + // The main chunk mesh can handle opaque textures. + if (block.visibility == registry::OPAQUE) { if (block_storage->checkBlockVisibility({i - 1, j, k})) mesh->addFace(X_NEG, {i, j, k}, texture_index); if (block_storage->checkBlockVisibility({i + 1, j, k})) @@ -172,19 +172,21 @@ fp::chunk* fp::world::generateChunk(const fp::chunk_pos& pos) { return nullptr; BLT_START_INTERVAL("Chunk Generate", "Instantiate"); auto* c = new chunk(pos); - block_storage*& storage = c->getBlockStorage(); + block_storage* storage = c->getBlockStorage(); for (int i = 0; i < CHUNK_SIZE; i++) { - for (int j = 0; j < CHUNK_SIZE; j++) { - for (int k = 0; k < CHUNK_SIZE; k++) { - auto block_x = pos.x + i; - auto block_y = pos.y + j; - auto block_z = pos.z + k; - storage->set( - {i, j, k}, - (int) (stb_perlin_fbm_noise3(block_x / 8.0, block_y / 8.0, - block_z / 8.0, 2.0, 0.5, 6 - ) > 0.5 ? fp::registry::STONE : fp::registry::AIR)); + auto block_x = float(pos.x * CHUNK_SIZE + i); + for (int k = 0; k < CHUNK_SIZE; k++) { + auto block_z = float(pos.z * CHUNK_SIZE + k); + auto world_height = stb_perlin_ridge_noise3(block_x / 128.0f, + 8.1539123f, + block_z / 128.0f, 2.0f, 0.5f, 1.0, 12.0f) * 128 + 64; + + for (int j = 0; j < CHUNK_SIZE; j++) { + auto block_y = float(pos.y * CHUNK_SIZE + j); + + if (block_y < world_height) + storage->set({i, j, k}, fp::registry::STONE); } } }