From 317b2e879feae55299321247a505867b052fa5be Mon Sep 17 00:00:00 2001 From: Emmy Leadley Date: Sun, 6 Nov 2022 17:02:38 +0000 Subject: [PATCH] Update godot-cpp to 4.0-beta4 --- Readme.md | 2 +- SConstruct | 2 +- godot-cpp | 2 +- src/builder.cpp | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Readme.md b/Readme.md index 6cc495c..56aec8e 100644 --- a/Readme.md +++ b/Readme.md @@ -70,7 +70,7 @@ To see your textures in TrenchBroom, navigate to `Preferences` -> `Godot` -> `Ga # Building On all platforms, the build process is the same. Make sure scons is installed, and then just run -`scons target=release` to build. +`scons target=template_release` to build. On Mac, the process is the same, but you will have to codesign and notarize your resulting binary as well if you want it to run on consumer hardware. To do this, you need to already have the notary diff --git a/SConstruct b/SConstruct index 83dd10f..914726a 100644 --- a/SConstruct +++ b/SConstruct @@ -31,7 +31,7 @@ if env["platform"] == "osx": else: library = env.SharedLibrary( "addons/tbloader/bin/tbloader.{}.{}{}".format( - env["platform"], env["arch_suffix"], env["SHLIBSUFFIX"] + env["platform"], env["arch"], env["SHLIBSUFFIX"] ), source=sources, ) diff --git a/godot-cpp b/godot-cpp index fa4d18f..727673a 160000 --- a/godot-cpp +++ b/godot-cpp @@ -1 +1 @@ -Subproject commit fa4d18f21cfae319b8f16a1604742cfec6022079 +Subproject commit 727673a043955864d40935aefc44684bf9bc728a diff --git a/src/builder.cpp b/src/builder.cpp index 2a051da..eb56c90 100644 --- a/src/builder.cpp +++ b/src/builder.cpp @@ -320,9 +320,9 @@ void Builder::set_entity_node_common(Node3D* node, LMEntity& ent) } node->set_rotation(Vector3( - Math::deg2rad(-pitch), - Math::deg2rad(yaw + 180), - Math::deg2rad(roll) + Math::deg_to_rad(-pitch), + Math::deg_to_rad(yaw + 180), + Math::deg_to_rad(roll) )); } }