Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Godot 4.0-beta4 #35

Merged
merged 1 commit into from
Nov 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
2 changes: 1 addition & 1 deletion godot-cpp
Submodule godot-cpp updated 96 files
+91 −20 .clang-format
+11 −43 .github/workflows/ci.yml
+54 −0 .github/workflows/static_checks.yml
+3 −0 .gitignore
+12 −12 Makefile
+28 −11 SConstruct
+53 −20 binding_generator.py
+2,607 −899 godot-headers/extension_api.json
+7 −6 godot-headers/godot/gdnative_interface.h
+3 −3 include/godot_cpp/classes/ref.hpp
+7 −7 include/godot_cpp/classes/wrapped.hpp
+6 −3 include/godot_cpp/core/binder_common.hpp
+3 −3 include/godot_cpp/core/builtin_ptrcall.hpp
+34 −11 include/godot_cpp/core/class_db.hpp
+7 −3 include/godot_cpp/core/defs.hpp
+3 −3 include/godot_cpp/core/engine_ptrcall.hpp
+3 −3 include/godot_cpp/core/error_macros.hpp
+25 −4 include/godot_cpp/core/math.hpp
+3 −3 include/godot_cpp/core/memory.hpp
+4 −4 include/godot_cpp/core/method_bind.hpp
+4 −3 include/godot_cpp/core/method_ptrcall.hpp
+3 −3 include/godot_cpp/core/mutex_lock.hpp
+1 −1 include/godot_cpp/core/object.hpp
+1 −1 include/godot_cpp/core/property_info.hpp
+2 −2 include/godot_cpp/core/type_info.hpp
+3 −3 include/godot_cpp/godot.hpp
+3 −3 include/godot_cpp/templates/cowdata.hpp
+3 −3 include/godot_cpp/templates/hash_map.hpp
+3 −3 include/godot_cpp/templates/hash_set.hpp
+3 −3 include/godot_cpp/templates/hashfuncs.hpp
+3 −3 include/godot_cpp/templates/list.hpp
+3 −3 include/godot_cpp/templates/pair.hpp
+3 −3 include/godot_cpp/templates/rb_map.hpp
+3 −3 include/godot_cpp/templates/rb_set.hpp
+3 −3 include/godot_cpp/templates/rid_owner.hpp
+3 −3 include/godot_cpp/templates/safe_refcount.hpp
+3 −3 include/godot_cpp/templates/search_array.hpp
+4 −4 include/godot_cpp/templates/self_list.hpp
+3 −3 include/godot_cpp/templates/sort_array.hpp
+3 −3 include/godot_cpp/templates/spin_lock.hpp
+3 −3 include/godot_cpp/templates/thread_work_pool.hpp
+3 −3 include/godot_cpp/templates/vector.hpp
+3 −3 include/godot_cpp/templates/vmap.hpp
+3 −3 include/godot_cpp/templates/vset.hpp
+80 −48 include/godot_cpp/variant/aabb.hpp
+97 −113 include/godot_cpp/variant/basis.hpp
+3 −3 include/godot_cpp/variant/char_string.hpp
+3 −3 include/godot_cpp/variant/char_utils.hpp
+46 −46 include/godot_cpp/variant/color.hpp
+24 −22 include/godot_cpp/variant/plane.hpp
+19 −23 include/godot_cpp/variant/projection.hpp
+52 −59 include/godot_cpp/variant/quaternion.hpp
+65 −35 include/godot_cpp/variant/rect2.hpp
+44 −24 include/godot_cpp/variant/rect2i.hpp
+47 −45 include/godot_cpp/variant/transform2d.hpp
+86 −50 include/godot_cpp/variant/transform3d.hpp
+3 −3 include/godot_cpp/variant/typed_array.hpp
+3 −3 include/godot_cpp/variant/ucaps.hpp
+3 −3 include/godot_cpp/variant/variant.hpp
+12 −10 include/godot_cpp/variant/vector2.hpp
+4 −7 include/godot_cpp/variant/vector2i.hpp
+27 −16 include/godot_cpp/variant/vector3.hpp
+4 −10 include/godot_cpp/variant/vector3i.hpp
+39 −38 include/godot_cpp/variant/vector4.hpp
+7 −11 include/godot_cpp/variant/vector4i.hpp
+1 −2 misc/scripts/clang_format.sh
+0 −23 misc/scripts/file_format.sh
+60 −0 misc/scripts/header_guards.sh
+11 −0 misc/scripts/mypy.ini
+6 −0 misc/scripts/mypy_check.sh
+38 −29 src/core/class_db.cpp
+2 −1 src/godot.cpp
+49 −13 src/variant/aabb.cpp
+401 −490 src/variant/basis.cpp
+128 −118 src/variant/color.cpp
+33 −5 src/variant/plane.cpp
+127 −120 src/variant/projection.cpp
+163 −43 src/variant/quaternion.cpp
+11 −1 src/variant/rect2.cpp
+1 −1 src/variant/rect2i.cpp
+69 −26 src/variant/transform2d.cpp
+44 −43 src/variant/transform3d.cpp
+32 −32 src/variant/variant.cpp
+4 −0 src/variant/vector2.cpp
+25 −15 src/variant/vector3.cpp
+0 −10 src/variant/vector3i.cpp
+98 −28 src/variant/vector4.cpp
+7 −15 src/variant/vector4i.cpp
+1 −3 test/SConstruct
+2 −2 test/demo/bin/libgdexample.osx.template_debug.framework/Resources/Info.plist
+2 −2 test/demo/bin/libgdexample.osx.template_release.framework/Resources/Info.plist
+12 −12 test/demo/example.gdextension
+1 −1 test/demo/main.gd
+14 −0 test/src/example.h
+2 −0 test/src/register_types.cpp
+50 −19 tools/targets.py
6 changes: 3 additions & 3 deletions src/builder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
));
}
}
Expand Down