- Updated packages

- Fix wayland cpm link
- Fix settings not saving if migration fails

CMakeLists.txt

@@ -155,10 +155,10 @@ if(magic_enum_ADDED)
 endif()
 
 if(NOT WIN32 AND RAWRBOX_USE_WAYLAND)
-    CPMAddPackage("gl:wayland/weston@12.0.3")
+    CPMAddPackage("https://gitlab.freedesktop.org/wayland/weston@13.0.3")
 endif()
 
-CPMAddPackage("gh:stephenberry/glaze@2.6.9")
+CPMAddPackage("gh:stephenberry/glaze@2.9.0")
 
 # ---
 if(RAWRBOX_BUILD_RAWRBOX_NETWORK OR RAWRBOX_BUILD_RAWRBOX_ASSIMP)

cmake/cpm.cmake

@@ -1,4 +1,4 @@
-set(CPM_DOWNLOAD_VERSION 0.39.0)
+set(CPM_DOWNLOAD_VERSION 0.40.0)
 
 set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
 

package-lock.cmake

@@ -17,7 +17,7 @@ CPMDeclarePackage(magic_enum
 )
 # glaze
 CPMDeclarePackage(glaze
-  VERSION 2.6.9
+  VERSION 2.9.0
   GITHUB_REPOSITORY stephenberry/glaze
   SYSTEM YES
   EXCLUDE_FROM_ALL YES
@@ -60,7 +60,7 @@ CPMDeclarePackage(thread-pool
 )
 # cpptrace
 CPMDeclarePackage(cpptrace
-  VERSION 0.6.0
+  VERSION 0.6.1
   GITHUB_REPOSITORY jeremy-rifkin/cpptrace
   SYSTEM YES
   EXCLUDE_FROM_ALL YES
@@ -77,7 +77,7 @@ CPMDeclarePackage(cpptrace
 # luau
 CPMDeclarePackage(luau
   NAME luau
-  GIT_TAG 0.628
+  GIT_TAG 0.630
   GITHUB_REPOSITORY luau-lang/luau
   OPTIONS
     "LUAU_BUILD_CLI OFF"

rawrbox.network/src/scripting/wrappers/packet.cpp

@@ -27,7 +27,7 @@ namespace rawrbox {
 	void PacketWrapper::writeFloat(float val) { data.write(val); }
 	void PacketWrapper::writeDouble(double val) { data.write(val); }
 	void PacketWrapper::writeString(const std::string& val) { data.write(val); }
-	void PacketWrapper::writeTable(const luabridge::LuaRef& val) { data.write(glz::write<glz::opts{.prettify = true}>(rawrbox::LuaUtils::luaToJsonObject(val))); }
+	void PacketWrapper::writeTable(const luabridge::LuaRef& val) { data.write(glz::write<glz::opts{.prettify = true}>(rawrbox::LuaUtils::luaToJsonObject(val))->c_str()); }
 	// -------
 
 	// READ ----

rawrbox.scripting/CMakeLists.txt

@@ -26,7 +26,7 @@ CPMAddPackage(
     GITHUB_REPOSITORY
         luau-lang/luau
     GIT_TAG
-        0.628
+        0.630
     OPTIONS
         "LUAU_BUILD_CLI OFF"
         "LUAU_BUILD_TESTS OFF"

rawrbox.scripting/src/manager.cpp

@@ -169,7 +169,7 @@ namespace rawrbox {
 		luabridge::getGlobalNamespace(L)
 		    .addFunction("printTable", [](const luabridge::LuaRef& ref) {
 			    auto json = rawrbox::LuaUtils::luaToJsonObject(ref);
-			    _logger->info("{}", glz::write<glz::opts{.prettify = true}>(json));
+			    _logger->info("{}", glz::write<glz::opts{.prettify = true}>(json)->c_str());
 		    })
 		    .addFunction("print", [](lua_State* state) {
 			    auto args = rawrbox::LuaUtils::argsToString(state);

rawrbox.utils/CMakeLists.txt

@@ -77,7 +77,7 @@ if(thread-pool_ADDED)
 endif()
 
 # DEPS ----
-CPMAddPackage("gh:jeremy-rifkin/[email protected].0")
+CPMAddPackage("gh:jeremy-rifkin/[email protected].1")
 if(cpptrace_ADDED)
   set_lib_runtime_mt(cpptrace-lib)
 endif()

rawrbox.utils/src/settings.cpp

@@ -26,7 +26,7 @@ namespace rawrbox {
 		std::ofstream out(fileName);
 		if (!out.is_open()) throw this->_logger->error("Failed to save settings '{}'", fileName);
 
-		out << glz::write<glz::opts{.prettify = true}>(this->_settings);
+		out << glz::write<glz::opts{.prettify = true}>(this->_settings)->c_str();
 		out.close();
 	}
 
@@ -56,19 +56,17 @@ namespace rawrbox {
 				}
 
 				rawrbox::JSONUtils::patch(this->_settings, fixedDiff);
-				this->_settings["VERSION"] = this->getVersion(); // For settings version comparison
-				this->save();
+				this->_logger->warn("Settings migrated!");
 			} else {
 				this->_logger->warn("Missing version, cannot migrate! Adding current version, some things might be broken!");
-				this->_settings["VERSION"] = this->getVersion(); // For settings version comparison
 			}
 
 		} else {
 			this->_settings = this->getDefaults();
-			this->_settings["VERSION"] = this->getVersion(); // For settings version comparison
-
-			this->save();
 		}
+
+		this->_settings["VERSION"] = this->getVersion(); // For settings version comparison
+		this->save();
 	}
 
 	glz::json_t& Settings::getSettings() {

samples/011-physics-3D/src/game.cpp

@@ -246,7 +246,7 @@ namespace phys_3d_test {
 		if (!this->_ready) return;
 
 		auto* stencil = rawrbox::RENDERER->stencil();
-		stencil->drawText(fmt::format("[F1]   PAUSED: {}", rawrbox::PHYSICS::simulate), {15, 15});
+		stencil->drawText(fmt::format("[F1]   PAUSED: {}", !rawrbox::PHYSICS::simulate), {15, 15});
 		stencil->drawText(fmt::format("[F2]   DEBUG: {}", this->_debug), {15, 28});
 		stencil->drawText(fmt::format("[F3]   CLEAR"), {15, 48});