From 6e5292c83da8639c826e08fd99f2aa2afdab6d36 Mon Sep 17 00:00:00 2001 From: lupoDharkael Date: Thu, 16 May 2019 13:28:31 +0200 Subject: [PATCH 01/19] Update gitignore --- .gitignore | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/.gitignore b/.gitignore index 10b327e3..45094ba8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,159 @@ bin *.creator.user *.files *.includes + +# Gprof output +gmon.out + +# Vim temp files +*.swo +*.swp + +# Qt project files +*.config +*.creator +*.creator.* +*.files +*.includes +*.cflags +*.cxxflags + +# Eclipse CDT files +.cproject +.settings/ + +# Geany/geany-plugins files +*.geany +.geanyprj + +# Misc +.DS_Store +logs/ + +# for projects that use SCons for building: http://http://www.scons.org/ +.sconf_temp +.sconsign.dblite +*.pyc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.opendb +*.VC.VC.opendb +enc_temp_folder/ + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# CodeLite project files +*.project +*.workspace +.codelite/ + +# Windows Azure Build Output +csx/ +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.pfx +*.publishsettings +node_modules/ +__pycache__/ + +# KDE +.directory + +#Kdevelop project files +*.kdev4 + +# xCode +xcuserdata + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# ========================= +# Windows detritus +# ========================= + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ +logo.h +*.autosave + +# https://github.com/github/gitignore/blob/master/Global/Tags.gitignore +# Ignore tags created by etags, ctags, gtags (GNU global) and cscope +TAGS +!TAGS/ +tags +*.tags +!tags/ +gtags.files +GTAGS +GRTAGS +GPATH +cscope.files +cscope.out +cscope.in.out +cscope.po.out +godot.creator.* + +# Visual Studio 2017 and Visual Studio Code workspace folder +/.vs +/.vscode + +# Visual Studio Code workspace file +*.code-workspace + +# Scons progress indicator +.scons_node_count + +# ccls cache (https://github.com/MaskRay/ccls) +.ccls-cache/ + +# compile commands (https://clang.llvm.org/docs/JSONCompilationDatabase.html) +compile_commands.json From a2e6f7a5efab2fcf765429aa6985a6faca750c74 Mon Sep 17 00:00:00 2001 From: NHodgesVFX Date: Tue, 4 Feb 2020 16:33:43 -0500 Subject: [PATCH 02/19] Fix Vector's Bounce Reflect Fixes Vector 2 and 3 bounce and reflect methods to match gdscript Co-Authored-By: Bruno Campos Move calculation to reflect fix commit squash fix style --- include/core/Vector2.hpp | 4 ++-- include/core/Vector3.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/core/Vector2.hpp b/include/core/Vector2.hpp index 99ac60f2..5364330c 100644 --- a/include/core/Vector2.hpp +++ b/include/core/Vector2.hpp @@ -180,8 +180,8 @@ struct Vector2 { return -reflect(p_normal); } - inline Vector2 reflect(const Vector2 &p_vec) const { - return p_vec - *this * this->dot(p_vec) * 2.0; + inline Vector2 reflect(const Vector2 &p_normal) const { + return -(*this -p_normal * this->dot(p_normal) * 2.0); } inline real_t angle() const { diff --git a/include/core/Vector3.hpp b/include/core/Vector3.hpp index 2d78f211..8b39113b 100644 --- a/include/core/Vector3.hpp +++ b/include/core/Vector3.hpp @@ -238,8 +238,8 @@ struct Vector3 { return v; } - inline Vector3 reflect(const Vector3 &by) const { - return by - *this * this->dot(by) * 2.f; + inline Vector3 reflect(const Vector3 &p_normal) const { + return -(*this - p_normal * this->dot(p_normal) * 2.f); } inline Vector3 rotated(const Vector3 &axis, const real_t phi) const { From 82476108bab5d59d2fddec97138296d7b9ae4494 Mon Sep 17 00:00:00 2001 From: NHodgesVFX Date: Thu, 6 Feb 2020 18:44:50 -0500 Subject: [PATCH 03/19] Fix Style Issues --- include/core/Vector2.hpp | 2 +- include/core/Vector3.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/core/Vector2.hpp b/include/core/Vector2.hpp index 5364330c..d7c00b5a 100644 --- a/include/core/Vector2.hpp +++ b/include/core/Vector2.hpp @@ -181,7 +181,7 @@ struct Vector2 { } inline Vector2 reflect(const Vector2 &p_normal) const { - return -(*this -p_normal * this->dot(p_normal) * 2.0); + return -(*this - p_normal * this->dot(p_normal) * 2.0); } inline real_t angle() const { diff --git a/include/core/Vector3.hpp b/include/core/Vector3.hpp index 8b39113b..144e3699 100644 --- a/include/core/Vector3.hpp +++ b/include/core/Vector3.hpp @@ -239,7 +239,7 @@ struct Vector3 { } inline Vector3 reflect(const Vector3 &p_normal) const { - return -(*this - p_normal * this->dot(p_normal) * 2.f); + return -(*this - p_normal * this->dot(p_normal) * 2.0); } inline Vector3 rotated(const Vector3 &axis, const real_t phi) const { From db941344e32590142eadebe7d0ec362e71528ec1 Mon Sep 17 00:00:00 2001 From: Marc Gilleron Date: Mon, 30 Mar 2020 22:58:20 +0100 Subject: [PATCH 04/19] Fix default value of `bits` misnaming resulting library --- SConstruct | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/SConstruct b/SConstruct index 881b44dc..43887bde 100644 --- a/SConstruct +++ b/SConstruct @@ -68,6 +68,17 @@ else: 'platform=' ) +env = Environment(ENV = os.environ) + +is64 = sys.maxsize > 2**32 +if ( + env['TARGET_ARCH'] == 'amd64' or + env['TARGET_ARCH'] == 'emt64' or + env['TARGET_ARCH'] == 'x86_64' or + env['TARGET_ARCH'] == 'arm64-v8a' +): + is64 = True + opts = Variables([], ARGUMENTS) opts.Add(EnumVariable( 'platform', @@ -79,8 +90,8 @@ opts.Add(EnumVariable( opts.Add(EnumVariable( 'bits', 'Target platform bits', - 'default', - ('default', '32', '64') + '64' if is64 else '32', + ('32', '64') )) opts.Add(BoolVariable( 'use_llvm', @@ -145,22 +156,9 @@ opts.Add( os.environ.get("ANDROID_NDK_ROOT", None) ) -env = Environment(ENV = os.environ) opts.Update(env) Help(opts.GenerateHelpText(env)) -is64 = sys.maxsize > 2**32 -if ( - env['TARGET_ARCH'] == 'amd64' or - env['TARGET_ARCH'] == 'emt64' or - env['TARGET_ARCH'] == 'x86_64' or - env['TARGET_ARCH'] == 'arm64-v8a' -): - is64 = True - -if env['bits'] == 'default': - env['bits'] = '64' if is64 else '32' - # This makes sure to keep the session environment variables on Windows. # This way, you can run SCons in a Visual Studio 2017 prompt and it will find # all the required tools From 5c96e5ede5dd9adf0c744c9a425ecb0fc2a2729c Mon Sep 17 00:00:00 2001 From: Duncan Sparks Date: Wed, 17 Jun 2020 11:45:19 -0700 Subject: [PATCH 05/19] Fix alloca.h error in Defs.h --- include/core/Defs.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/core/Defs.hpp b/include/core/Defs.hpp index 1b4923e6..9981afe5 100644 --- a/include/core/Defs.hpp +++ b/include/core/Defs.hpp @@ -62,8 +62,10 @@ enum class Error { #include // alloca() is non-standard. When using MSVC, it's in malloc.h. -#if defined(__linux__) || defined(__APPLE__) || defined(__MINGW32__) +#if defined(__linux__) || defined(__APPLE__) #include +#else +#include #endif typedef float real_t; From 3b16f34d893fd79a8720c5933e406ce19bf7b3f9 Mon Sep 17 00:00:00 2001 From: Duncan Sparks Date: Wed, 17 Jun 2020 12:12:57 -0700 Subject: [PATCH 06/19] Add option for template get_node --- SConstruct | 7 +++++- binding_generator.py | 55 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 50 insertions(+), 12 deletions(-) diff --git a/SConstruct b/SConstruct index 881b44dc..17659731 100644 --- a/SConstruct +++ b/SConstruct @@ -144,6 +144,11 @@ opts.Add( 'Path to your Android NDK installation. By default, uses ANDROID_NDK_ROOT from your defined environment variables.', os.environ.get("ANDROID_NDK_ROOT", None) ) +opts.Add(BoolVariable( + 'generate_template_get_node', + "Generate a template version of the Node class's get_node.", + False +)) env = Environment(ENV = os.environ) opts.Update(env) @@ -362,7 +367,7 @@ if env['generate_bindings']: # Actually create the bindings here import binding_generator - binding_generator.generate_bindings(json_api_file) + binding_generator.generate_bindings(json_api_file, env['generate_template_get_node']) # Sources to compile sources = [] diff --git a/binding_generator.py b/binding_generator.py index 3b01f0ba..1992f6d6 100644 --- a/binding_generator.py +++ b/binding_generator.py @@ -4,9 +4,15 @@ import json # comment. +# Convenience function for using template get_node +def correct_method_name(class_name, method): + if method["name"] == "get_node" and class_name == "Node": + method["name"] = "get_node_internal" + + classes = [] -def generate_bindings(path): +def generate_bindings(path, use_template_get_node): global classes classes = json.load(open(path)) @@ -15,11 +21,11 @@ def generate_bindings(path): for c in classes: # print c['name'] - used_classes = get_used_classes(c) + used_classes = get_used_classes(c, use_template_get_node) - header = generate_class_header(used_classes, c) + header = generate_class_header(used_classes, c, use_template_get_node) - impl = generate_class_implementation(icalls, used_classes, c) + impl = generate_class_implementation(icalls, used_classes, c, use_template_get_node) header_file = open("include/gen/" + strip_name(c["name"]) + ".hpp", "w+") header_file.write(header) @@ -62,7 +68,7 @@ def make_gdnative_type(t): return strip_name(t) + " " -def generate_class_header(used_classes, c): +def generate_class_header(used_classes, c, use_template_get_node): source = [] source.append("#ifndef GODOT_CPP_" + strip_name(c["name"]).upper() + "_HPP") @@ -140,6 +146,8 @@ def generate_class_header(used_classes, c): source.append("\tstruct ___method_bindings {") for method in c["methods"]: + if use_template_get_node: + correct_method_name(class_name, method) source.append("\t\tgodot_method_bind *mb_" + method["name"] + ";") source.append("\t};") @@ -201,7 +209,8 @@ def generate_class_header(used_classes, c): source.append("") for method in c["methods"]: - + if use_template_get_node: + correct_method_name(class_name, method) method_signature = "" # TODO decide what to do about virtual methods @@ -279,10 +288,28 @@ def generate_class_header(used_classes, c): source.append("\t" + method_signature + ";") source.append(vararg_templates) - source.append("};") - source.append("") + if use_template_get_node: + # Extra definition for template get_node that calls the renamed get_node_internal; has a default template parameter for backwards compatibility. + if class_name == "Node": + source.append("\ttemplate ") + source.append("\tT *get_node(const NodePath path) const {") + source.append("\t\treturn Object::cast_to(get_node_internal(path));") + source.append("\t}") + source.append("};") + source.append("") + + # ...And a specialized version so we don't unnecessarily cast when using the default. + if class_name == "Node": + source.append("template <>") + source.append("inline Node *Node::get_node(const NodePath path) const {") + source.append("\treturn get_node_internal(path);") + source.append("}") + source.append("") + else: + source.append("};") + source.append("") source.append("}") source.append("") @@ -296,7 +323,7 @@ def generate_class_header(used_classes, c): -def generate_class_implementation(icalls, used_classes, c): +def generate_class_implementation(icalls, used_classes, c, use_template_get_node): class_name = strip_name(c["name"]) source = [] source.append("#include \"" + class_name + ".hpp\"") @@ -353,7 +380,9 @@ def generate_class_implementation(icalls, used_classes, c): source.append("void " + class_name + "::___init_method_bindings() {") for method in c["methods"]: - source.append("\t___mb.mb_" + method["name"] + " = godot::api->godot_method_bind_get_method(\"" + c["name"] + "\", \"" + method["name"] + "\");") + if use_template_get_node: + correct_method_name(class_name, method) + source.append("\t___mb.mb_" + method["name"] + " = godot::api->godot_method_bind_get_method(\"" + c["name"] + "\", \"" + ("get_node" if use_template_get_node and method["name"] == "get_node_internal" else method["name"]) + "\");") source.append("}") source.append("") @@ -365,6 +394,8 @@ def generate_class_implementation(icalls, used_classes, c): source.append("}") for method in c["methods"]: + if use_template_get_node: + correct_method_name(class_name, method) method_signature = "" @@ -710,9 +741,11 @@ def get_icall_name(sig): -def get_used_classes(c): +def get_used_classes(c, use_template_get_node): classes = [] for method in c["methods"]: + if use_template_get_node: + correct_method_name(strip_name(c["name"]), method) if is_class_type(method["return_type"]) and not (method["return_type"] in classes): classes.append(method["return_type"]) From d808f04497f61b55899ccbc1ddd6cd94ec79d2f2 Mon Sep 17 00:00:00 2001 From: smeikx Date: Tue, 30 Jun 2020 22:27:13 +0200 Subject: [PATCH 07/19] fix Android build command in README Using `*-linux-android29-clang` results in errors, adding `++` fixes this. Credits go to zhangshiqian1214: https://github.com/godotengine/godot-cpp/issues/372#issuecomment-596079055 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ef8d89ac..64909773 100644 --- a/README.md +++ b/README.md @@ -256,11 +256,11 @@ submit a pull request :slightly_smiling_face: ```bash cd SimpleLibrary -aarch64-linux-android29-clang -fPIC -o src/init.os -c src/init.cpp -g -O3 -std=c++14 -Igodot-cpp/include -Igodot-cpp/include/core -Igodot-cpp/include/gen -Igodot-cpp/godot_headers -aarch64-linux-android29-clang -o bin/libtest.so -shared src/init.os -Lgodot-cpp/bin -l +aarch64-linux-android29-clang++ -fPIC -o src/init.os -c src/init.cpp -g -O3 -std=c++14 -Igodot-cpp/include -Igodot-cpp/include/core -Igodot-cpp/include/gen -Igodot-cpp/godot_headers +aarch64-linux-android29-clang++ -o bin/libtest.so -shared src/init.os -Lgodot-cpp/bin -l ``` -You'll need to replace `` with the file that was created in [**Compiling the cpp bindings library**](#compiling-the-cpp-bindings-library). The command above targets `arm64v8`. To target `armv7`, use `armv7a-linux-androideabi29-clang` instead of `aarch64-linux-android29-clang`. +You'll need to replace `` with the file that was created in [**Compiling the cpp bindings library**](#compiling-the-cpp-bindings-library). The command above targets `arm64v8`. To target `armv7`, use `armv7a-linux-androideabi29-clang++` instead of `aarch64-linux-android29-clang++`. This creates the file `libtest.so` in your `SimpleLibrary/bin` directory. From 20fdc09c963f876e5d894bc4c0fd3d24b4215190 Mon Sep 17 00:00:00 2001 From: Jummit Date: Wed, 15 Jul 2020 17:05:54 +0200 Subject: [PATCH 08/19] Add missing move_toward to Vector2 and Vector3 --- include/core/Vector2.hpp | 7 +++++++ include/core/Vector3.hpp | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/include/core/Vector2.hpp b/include/core/Vector2.hpp index 2a4f5fe8..2a4c9027 100644 --- a/include/core/Vector2.hpp +++ b/include/core/Vector2.hpp @@ -178,6 +178,13 @@ struct Vector2 { Vector2 cubic_interpolate(const Vector2 &p_b, const Vector2 &p_pre_a, const Vector2 &p_post_b, real_t p_t) const; + Vector2 move_toward(const Vector2 &p_to, const real_t p_delta) const { + Vector2 v = *this; + Vector2 vd = p_to - v; + real_t len = vd.length(); + return len <= p_delta || len < CMP_EPSILON ? p_to : v + vd / len * p_delta; + } + inline Vector2 slide(const Vector2 &p_vec) const { return p_vec - *this * this->dot(p_vec); } diff --git a/include/core/Vector3.hpp b/include/core/Vector3.hpp index 7e2c3022..bbe8a950 100644 --- a/include/core/Vector3.hpp +++ b/include/core/Vector3.hpp @@ -167,6 +167,13 @@ struct Vector3 { Vector3 cubic_interpolate(const Vector3 &b, const Vector3 &pre_a, const Vector3 &post_b, const real_t t) const; + Vector3 move_toward(const Vector3 &p_to, const real_t p_delta) const { + Vector3 v = *this; + Vector3 vd = p_to - v; + real_t len = vd.length(); + return len <= p_delta || len < CMP_EPSILON ? p_to : v + vd / len * p_delta; + } + Vector3 bounce(const Vector3 &p_normal) const { return -reflect(p_normal); } From a1ba843f3668ed53a25f5eb7866d882552028d53 Mon Sep 17 00:00:00 2001 From: TerraAr <37753757+TerraAr@users.noreply.github.com> Date: Fri, 14 Aug 2020 21:42:10 -0300 Subject: [PATCH 09/19] Created operator. Created String::operator+=(const wchar_t), that was mark as Todo. --- src/core/String.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/String.cpp b/src/core/String.cpp index 7340b6d6..65d210fe 100644 --- a/src/core/String.cpp +++ b/src/core/String.cpp @@ -135,7 +135,7 @@ void String::operator+=(const String &s) { } void String::operator+=(const wchar_t c) { - // @Todo + _godot_string = godot::api->godot_string_operator_plus(&_godot_string, &(String(c)._godot_string)); } bool String::operator<(const String &s) const { From 5e656923cfe9469a5f33104503e10ca076ce30b8 Mon Sep 17 00:00:00 2001 From: TerraAr <37753757+TerraAr@users.noreply.github.com> Date: Fri, 14 Aug 2020 23:32:38 -0300 Subject: [PATCH 10/19] Fixed operator Fixed String::operator+=(const wchar_t). The problem was that a temporary variable don't have an address. --- src/core/String.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/String.cpp b/src/core/String.cpp index 65d210fe..35da37f8 100644 --- a/src/core/String.cpp +++ b/src/core/String.cpp @@ -135,7 +135,8 @@ void String::operator+=(const String &s) { } void String::operator+=(const wchar_t c) { - _godot_string = godot::api->godot_string_operator_plus(&_godot_string, &(String(c)._godot_string)); + String _to_be_added = c; + _godot_string = godot::api->godot_string_operator_plus(&_godot_string, &_to_be_added._godot_string); } bool String::operator<(const String &s) const { From 0939d0f6d15e8a5870ec7bb0dafb617e0d97d532 Mon Sep 17 00:00:00 2001 From: Daniel Rakos Date: Fri, 21 Jun 2019 16:40:36 +0200 Subject: [PATCH 11/19] Fixed memory leak with String objects The member _godot_string should never be straight out overwritten ever without first destroying the underlying string object's memory. This change solves the problem through the introduction of a new private constructor to create String objects with a pre-existing godot_string handle. --- include/core/String.hpp | 3 + src/core/String.cpp | 174 +++++++++------------------------------- 2 files changed, 40 insertions(+), 137 deletions(-) diff --git a/include/core/String.hpp b/include/core/String.hpp index d448567e..ebf161aa 100644 --- a/include/core/String.hpp +++ b/include/core/String.hpp @@ -29,6 +29,9 @@ public: class String { godot_string _godot_string; + String(godot_string contents) : + _godot_string(contents) {} + public: String(); String(const char *contents); diff --git a/src/core/String.cpp b/src/core/String.cpp index 7340b6d6..0deca29e 100644 --- a/src/core/String.cpp +++ b/src/core/String.cpp @@ -25,52 +25,31 @@ const char *godot::CharString::get_data() const { } String String::num(double p_num, int p_decimals) { - String new_string; - new_string._godot_string = godot::api->godot_string_num_with_decimals(p_num, p_decimals); - - return new_string; + return String(godot::api->godot_string_num_with_decimals(p_num, p_decimals)); } String String::num_scientific(double p_num) { - String new_string; - new_string._godot_string = godot::api->godot_string_num_scientific(p_num); - - return new_string; + return String(godot::api->godot_string_num_scientific(p_num)); } String String::num_real(double p_num) { - String new_string; - new_string._godot_string = godot::api->godot_string_num_real(p_num); - - return new_string; + return String(godot::api->godot_string_num_real(p_num)); } String String::num_int64(int64_t p_num, int base, bool capitalize_hex) { - String new_string; - new_string._godot_string = godot::api->godot_string_num_int64_capitalized(p_num, base, capitalize_hex); - - return new_string; + return String(godot::api->godot_string_num_int64_capitalized(p_num, base, capitalize_hex)); } String String::chr(godot_char_type p_char) { - String new_string; - new_string._godot_string = godot::api->godot_string_chr(p_char); - - return new_string; + return String(godot::api->godot_string_chr(p_char)); } String String::md5(const uint8_t *p_md5) { - String new_string; - new_string._godot_string = godot::api->godot_string_md5(p_md5); - - return new_string; + return String(godot::api->godot_string_md5(p_md5)); } String String::hex_encode_buffer(const uint8_t *p_buffer, int p_len) { - String new_string; - new_string._godot_string = godot::api->godot_string_hex_encode_buffer(p_buffer, p_len); - - return new_string; + return String(godot::api->godot_string_hex_encode_buffer(p_buffer, p_len)); } godot::String::String() { @@ -124,14 +103,11 @@ bool String::operator!=(const String &s) const { } String String::operator+(const String &s) const { - String new_string; - new_string._godot_string = godot::api->godot_string_operator_plus(&_godot_string, &s._godot_string); - - return new_string; + return String(godot::api->godot_string_operator_plus(&_godot_string, &s._godot_string)); } void String::operator+=(const String &s) { - _godot_string = godot::api->godot_string_operator_plus(&_godot_string, &s._godot_string); + *this = String(godot::api->godot_string_operator_plus(&_godot_string, &s._godot_string)); } void String::operator+=(const wchar_t c) { @@ -223,24 +199,15 @@ PoolStringArray String::bigrams() const { } String String::c_escape() const { - String new_string; - new_string._godot_string = godot::api->godot_string_c_escape(&_godot_string); - - return new_string; + return String(godot::api->godot_string_c_escape(&_godot_string)); } String String::c_unescape() const { - String new_string; - new_string._godot_string = godot::api->godot_string_c_unescape(&_godot_string); - - return new_string; + return String(godot::api->godot_string_c_unescape(&_godot_string)); } String String::capitalize() const { - String new_string; - new_string._godot_string = godot::api->godot_string_capitalize(&_godot_string); - - return new_string; + return String(godot::api->godot_string_capitalize(&_godot_string)); } bool String::empty() const { @@ -268,41 +235,31 @@ int String::findn(String p_what, int p_from) const { } String String::format(Variant values) const { - String new_string; - new_string._godot_string = godot::api->godot_string_format(&_godot_string, (godot_variant *)&values); - - return new_string; + return String(godot::api->godot_string_format(&_godot_string, (godot_variant *)&values)); } String String::format(Variant values, String placeholder) const { - String new_string; godot_char_string contents = godot::api->godot_string_utf8(&placeholder._godot_string); - new_string._godot_string = godot::api->godot_string_format_with_custom_placeholder(&_godot_string, (godot_variant *)&values, godot::api->godot_char_string_get_data(&contents)); + String new_string(godot::api->godot_string_format_with_custom_placeholder(&_godot_string, (godot_variant *)&values, godot::api->godot_char_string_get_data(&contents))); godot::api->godot_char_string_destroy(&contents); return new_string; } String String::get_base_dir() const { - String new_string; - new_string._godot_string = godot::api->godot_string_get_base_dir(&_godot_string); - - return new_string; + return String(godot::api->godot_string_get_base_dir(&_godot_string)); } String String::get_basename() const { - godot_string new_string = godot::api->godot_string_get_basename(&_godot_string); - return *(String *)&new_string; + return String(godot::api->godot_string_get_basename(&_godot_string)); } String String::get_extension() const { - godot_string new_string = godot::api->godot_string_get_extension(&_godot_string); - return *(String *)&new_string; + return String(godot::api->godot_string_get_extension(&_godot_string)); } String String::get_file() const { - godot_string new_string = godot::api->godot_string_get_file(&_godot_string); - return *(String *)&new_string; + return String(godot::api->godot_string_get_file(&_godot_string)); } int String::hash() const { @@ -314,10 +271,7 @@ int String::hex_to_int() const { } String String::insert(int position, String what) const { - String new_string; - new_string._godot_string = godot::api->godot_string_insert(&_godot_string, position, what._godot_string); - - return new_string; + return String(godot::api->godot_string_insert(&_godot_string, position, what._godot_string)); } bool String::is_abs_path() const { @@ -357,17 +311,11 @@ bool String::is_valid_ip_address() const { } String String::json_escape() const { - String new_string; - new_string._godot_string = godot::api->godot_string_json_escape(&_godot_string); - - return new_string; + return String(godot::api->godot_string_json_escape(&_godot_string)); } String String::left(int position) const { - String new_string; - new_string._godot_string = godot::api->godot_string_left(&_godot_string, position); - - return new_string; + return String(godot::api->godot_string_left(&_godot_string, position)); } bool String::match(String expr) const { @@ -384,10 +332,7 @@ PoolByteArray String::md5_buffer() const { } String String::md5_text() const { - String new_string; - new_string._godot_string = godot::api->godot_string_md5_text(&_godot_string); - - return new_string; + return String(godot::api->godot_string_md5_text(&_godot_string)); } int String::ord_at(int at) const { @@ -395,52 +340,31 @@ int String::ord_at(int at) const { } String String::pad_decimals(int digits) const { - String new_string; - new_string._godot_string = godot::api->godot_string_pad_decimals(&_godot_string, digits); - - return new_string; + return String(godot::api->godot_string_pad_decimals(&_godot_string, digits)); } String String::pad_zeros(int digits) const { - String new_string; - new_string._godot_string = godot::api->godot_string_pad_zeros(&_godot_string, digits); - - return new_string; + return String(godot::api->godot_string_pad_zeros(&_godot_string, digits)); } String String::percent_decode() const { - String new_string; - new_string._godot_string = godot::api->godot_string_percent_decode(&_godot_string); - - return new_string; + return String(godot::api->godot_string_percent_decode(&_godot_string)); } String String::percent_encode() const { - String new_string; - new_string._godot_string = godot::api->godot_string_percent_encode(&_godot_string); - - return new_string; + return String(godot::api->godot_string_percent_encode(&_godot_string)); } String String::plus_file(String file) const { - String new_string; - new_string._godot_string = godot::api->godot_string_plus_file(&_godot_string, &file._godot_string); - - return new_string; + return String(godot::api->godot_string_plus_file(&_godot_string, &file._godot_string)); } String String::replace(String p_key, String p_with) const { - String new_string; - new_string._godot_string = godot::api->godot_string_replace(&_godot_string, p_key._godot_string, p_with._godot_string); - - return new_string; + return String(godot::api->godot_string_replace(&_godot_string, p_key._godot_string, p_with._godot_string)); } String String::replacen(String what, String forwhat) const { - String new_string; - new_string._godot_string = godot::api->godot_string_replacen(&_godot_string, what._godot_string, forwhat._godot_string); - - return new_string; + return String(godot::api->godot_string_replacen(&_godot_string, what._godot_string, forwhat._godot_string)); } int String::rfind(String p_what, int p_from) const { @@ -452,10 +376,7 @@ int String::rfindn(String p_what, int p_from) const { } String String::right(int position) const { - String new_string; - new_string._godot_string = godot::api->godot_string_right(&_godot_string, position); - - return new_string; + return String(godot::api->godot_string_right(&_godot_string, position)); } PoolByteArray String::sha256_buffer() const { @@ -465,10 +386,7 @@ PoolByteArray String::sha256_buffer() const { } String String::sha256_text() const { - String new_string; - new_string._godot_string = godot::api->godot_string_sha256_text(&_godot_string); - - return new_string; + return String(godot::api->godot_string_sha256_text(&_godot_string)); } float String::similarity(String text) const { @@ -494,17 +412,11 @@ PoolRealArray String::split_floats(String divisor, bool allow_empty) const { } String String::strip_edges(bool left, bool right) const { - String new_string; - new_string._godot_string = godot::api->godot_string_strip_edges(&_godot_string, left, right); - - return new_string; + return String(godot::api->godot_string_strip_edges(&_godot_string, left, right)); } String String::substr(int from, int len) const { - String new_string; - new_string._godot_string = godot::api->godot_string_substr(&_godot_string, from, len); - - return new_string; + return String(godot::api->godot_string_substr(&_godot_string, from, len)); } float String::to_float() const { @@ -516,31 +428,19 @@ int64_t String::to_int() const { } String String::to_lower() const { - String new_string; - new_string._godot_string = godot::api->godot_string_to_lower(&_godot_string); - - return new_string; + return String(godot::api->godot_string_to_lower(&_godot_string)); } String String::to_upper() const { - String new_string; - new_string._godot_string = godot::api->godot_string_to_upper(&_godot_string); - - return new_string; + return String(godot::api->godot_string_to_upper(&_godot_string)); } String String::xml_escape() const { - String new_string; - new_string._godot_string = godot::api->godot_string_xml_escape(&_godot_string); - - return new_string; + return String(godot::api->godot_string_xml_escape(&_godot_string)); } String String::xml_unescape() const { - String new_string; - new_string._godot_string = godot::api->godot_string_xml_unescape(&_godot_string); - - return new_string; + return String(godot::api->godot_string_xml_unescape(&_godot_string)); } signed char String::casecmp_to(String p_str) const { From 7d347edb12645e6a7a09539ac1ba10ae1783f2ac Mon Sep 17 00:00:00 2001 From: TerraAr <37753757+TerraAr@users.noreply.github.com> Date: Sat, 15 Aug 2020 15:10:16 -0300 Subject: [PATCH 12/19] Updated operator I've updated the operator that I had created to use the private constructor of the class. --- src/core/String.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/String.cpp b/src/core/String.cpp index 35da37f8..72222b7e 100644 --- a/src/core/String.cpp +++ b/src/core/String.cpp @@ -135,8 +135,8 @@ void String::operator+=(const String &s) { } void String::operator+=(const wchar_t c) { - String _to_be_added = c; - _godot_string = godot::api->godot_string_operator_plus(&_godot_string, &_to_be_added._godot_string); + String _to_be_added = String(c); + *this = String(godot::api->godot_string_operator_plus(&_godot_string, &_to_be_added._godot_string)); } bool String::operator<(const String &s) const { From 33f9de16e414ad091fb6d4a6326f5cc435016ef9 Mon Sep 17 00:00:00 2001 From: sheepandshepherd Date: Mon, 21 Oct 2019 18:08:03 +0200 Subject: [PATCH 13/19] Use godot_object_cast_to instead of TagDB to cast engine types --- binding_generator.py | 12 ++++++++++++ include/core/Godot.hpp | 33 +++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/binding_generator.py b/binding_generator.py index 13505dbe..2f175920 100644 --- a/binding_generator.py +++ b/binding_generator.py @@ -146,10 +146,14 @@ def generate_class_header(used_classes, c): source.append("\t};") source.append("\tstatic ___method_bindings ___mb;") + source.append("\tstatic void *_detail_class_tag;") source.append("") source.append("public:") source.append("\tstatic void ___init_method_bindings();") + # class id from core engine for casting + source.append("\tinline static size_t ___get_id() { return (size_t)_detail_class_tag; }") + source.append("") @@ -355,11 +359,19 @@ def generate_class_implementation(icalls, used_classes, c): source.append(class_name + "::___method_bindings " + class_name + "::___mb = {};") source.append("") + source.append("void *" + class_name + "::_detail_class_tag = nullptr;") + source.append("") + source.append("void " + class_name + "::___init_method_bindings() {") for method in c["methods"]: source.append("\t___mb.mb_" + method["name"] + " = godot::api->godot_method_bind_get_method(\"" + c["name"] + "\", \"" + method["name"] + "\");") + source.append("\tgodot_string_name class_name;") + source.append("\tgodot::api->godot_string_name_new_data(&class_name, \"" + c["name"] + "\");") + source.append("\t_detail_class_tag = godot::core_1_2_api->godot_get_class_tag(&class_name);") + source.append("\tgodot::api->godot_string_name_destroy(&class_name);") + source.append("}") source.append("") diff --git a/include/core/Godot.hpp b/include/core/Godot.hpp index ddf1e3e0..9d17a2b9 100644 --- a/include/core/Godot.hpp +++ b/include/core/Godot.hpp @@ -100,7 +100,7 @@ public: return godot::detail::create_custom_class_instance(); \ } \ inline static size_t ___get_id() { return typeid(Name).hash_code(); } \ - inline static size_t ___get_base_id() { return typeid(Base).hash_code(); } \ + inline static size_t ___get_base_id() { return Base::___get_id(); } \ inline static const char *___get_base_type_name() { return Base::___get_class_name(); } \ inline static godot::Object *___get_from_variant(godot::Variant a) { \ return (godot::Object *)godot::detail::get_custom_class_instance( \ @@ -513,23 +513,28 @@ T *Object::cast_to(const Object *obj) { if (!obj) return nullptr; - size_t have_tag = (size_t)godot::nativescript_1_1_api->godot_nativescript_get_type_tag(obj->_owner); + if (T::___CLASS_IS_SCRIPT) { + size_t have_tag = (size_t)godot::nativescript_1_1_api->godot_nativescript_get_type_tag(obj->_owner); + if (have_tag) { + if (!godot::_TagDB::is_type_known((size_t)have_tag)) { + have_tag = 0; + } + } - if (have_tag) { - if (!godot::_TagDB::is_type_known((size_t)have_tag)) { - have_tag = 0; + if (!have_tag) { + have_tag = obj->_type_tag; + } + + if (godot::_TagDB::is_type_compatible(T::___get_id(), have_tag)) { + return detail::get_custom_class_instance(obj); + } + } else { + if (godot::core_1_2_api->godot_object_cast_to(obj->_owner, (void *)T::___get_id())) { + return (T *)obj; } } - if (!have_tag) { - have_tag = obj->_type_tag; - } - - if (godot::_TagDB::is_type_compatible(typeid(T).hash_code(), have_tag)) { - return (T::___CLASS_IS_SCRIPT) ? detail::get_custom_class_instance(obj) : (T *)obj; - } else { - return nullptr; - } + return nullptr; } #endif From 63066f2570a90cb1e373562640a67a84f70df642 Mon Sep 17 00:00:00 2001 From: Marc Gilleron Date: Sun, 23 Aug 2020 15:11:57 +0100 Subject: [PATCH 14/19] Replace ".os" with ".o" because it is "Object files" on Linux --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ef8d89ac..a0543484 100644 --- a/README.md +++ b/README.md @@ -221,8 +221,8 @@ Once you've compiled the GDNative C++ bindings (see above), you can compile the ```bash cd SimpleLibrary -clang -fPIC -o src/init.os -c src/init.cpp -g -O3 -std=c++14 -Igodot-cpp/include -Igodot-cpp/include/core -Igodot-cpp/include/gen -Igodot-cpp/godot_headers -clang -o bin/libtest.so -shared src/init.os -Lgodot-cpp/bin -l +clang -fPIC -o src/init.o -c src/init.cpp -g -O3 -std=c++14 -Igodot-cpp/include -Igodot-cpp/include/core -Igodot-cpp/include/gen -Igodot-cpp/godot_headers +clang -o bin/libtest.so -shared src/init.o -Lgodot-cpp/bin -l ``` You'll need to replace `` with the file that was created in [**Compiling the cpp bindings library**](#compiling-the-cpp-bindings-library). @@ -256,8 +256,8 @@ submit a pull request :slightly_smiling_face: ```bash cd SimpleLibrary -aarch64-linux-android29-clang -fPIC -o src/init.os -c src/init.cpp -g -O3 -std=c++14 -Igodot-cpp/include -Igodot-cpp/include/core -Igodot-cpp/include/gen -Igodot-cpp/godot_headers -aarch64-linux-android29-clang -o bin/libtest.so -shared src/init.os -Lgodot-cpp/bin -l +aarch64-linux-android29-clang -fPIC -o src/init.o -c src/init.cpp -g -O3 -std=c++14 -Igodot-cpp/include -Igodot-cpp/include/core -Igodot-cpp/include/gen -Igodot-cpp/godot_headers +aarch64-linux-android29-clang -o bin/libtest.so -shared src/init.o -Lgodot-cpp/bin -l ``` You'll need to replace `` with the file that was created in [**Compiling the cpp bindings library**](#compiling-the-cpp-bindings-library). The command above targets `arm64v8`. To target `armv7`, use `armv7a-linux-androideabi29-clang` instead of `aarch64-linux-android29-clang`. From bd72bd4d6854f281d7f999ab41330063766fa6e9 Mon Sep 17 00:00:00 2001 From: Duncan Sparks Date: Sun, 23 Aug 2020 09:01:23 -0700 Subject: [PATCH 15/19] Fix redundant check in binding_generator.py --- binding_generator.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/binding_generator.py b/binding_generator.py index 9b54b22c..b4bfc2a5 100644 --- a/binding_generator.py +++ b/binding_generator.py @@ -291,24 +291,22 @@ def generate_class_header(used_classes, c, use_template_get_node): source.append(vararg_templates) - if use_template_get_node: + if use_template_get_node and class_name == "Node": # Extra definition for template get_node that calls the renamed get_node_internal; has a default template parameter for backwards compatibility. - if class_name == "Node": - source.append("\ttemplate ") - source.append("\tT *get_node(const NodePath path) const {") - source.append("\t\treturn Object::cast_to(get_node_internal(path));") - source.append("\t}") + source.append("\ttemplate ") + source.append("\tT *get_node(const NodePath path) const {") + source.append("\t\treturn Object::cast_to(get_node_internal(path));") + source.append("\t}") source.append("};") source.append("") # ...And a specialized version so we don't unnecessarily cast when using the default. - if class_name == "Node": - source.append("template <>") - source.append("inline Node *Node::get_node(const NodePath path) const {") - source.append("\treturn get_node_internal(path);") - source.append("}") - source.append("") + source.append("template <>") + source.append("inline Node *Node::get_node(const NodePath path) const {") + source.append("\treturn get_node_internal(path);") + source.append("}") + source.append("") else: source.append("};") source.append("") From 6bca96ed42b03f97f787ba9497c95bf9f65d6f81 Mon Sep 17 00:00:00 2001 From: Duncan Sparks Date: Sun, 23 Aug 2020 09:02:12 -0700 Subject: [PATCH 16/19] Change default parameter to "yes" --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 17659731..b63ee57d 100644 --- a/SConstruct +++ b/SConstruct @@ -147,7 +147,7 @@ opts.Add( opts.Add(BoolVariable( 'generate_template_get_node', "Generate a template version of the Node class's get_node.", - False + True )) env = Environment(ENV = os.environ) From a2ebc8bbec0cdc80b2539786f64078930830d464 Mon Sep 17 00:00:00 2001 From: Duncan Sparks Date: Sun, 23 Aug 2020 10:30:27 -0700 Subject: [PATCH 17/19] Update binding_generator.py --- binding_generator.py | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/binding_generator.py b/binding_generator.py index b4bfc2a5..b7cfe81f 100644 --- a/binding_generator.py +++ b/binding_generator.py @@ -5,9 +5,10 @@ import json # comment. # Convenience function for using template get_node -def correct_method_name(class_name, method): - if method["name"] == "get_node" and class_name == "Node": - method["name"] = "get_node_internal" +def correct_method_name(method_list): + for method in method_list: + if method["name"] == "get_node": + method["name"] = "get_node_internal" classes = [] @@ -21,7 +22,9 @@ def generate_bindings(path, use_template_get_node): for c in classes: # print c['name'] - used_classes = get_used_classes(c, use_template_get_node) + used_classes = get_used_classes(c) + if use_template_get_node and c["name"] == "Node": + correct_method_name(c["methods"]) header = generate_class_header(used_classes, c, use_template_get_node) @@ -148,8 +151,6 @@ def generate_class_header(used_classes, c, use_template_get_node): source.append("\tstruct ___method_bindings {") for method in c["methods"]: - if use_template_get_node: - correct_method_name(class_name, method) source.append("\t\tgodot_method_bind *mb_" + method["name"] + ";") source.append("\t};") @@ -211,8 +212,6 @@ def generate_class_header(used_classes, c, use_template_get_node): source.append("") for method in c["methods"]: - if use_template_get_node: - correct_method_name(class_name, method) method_signature = "" # TODO decide what to do about virtual methods @@ -383,8 +382,6 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node source.append("void " + class_name + "::___init_method_bindings() {") for method in c["methods"]: - if use_template_get_node: - correct_method_name(class_name, method) source.append("\t___mb.mb_" + method["name"] + " = godot::api->godot_method_bind_get_method(\"" + c["name"] + "\", \"" + ("get_node" if use_template_get_node and method["name"] == "get_node_internal" else method["name"]) + "\");") source.append("}") @@ -397,8 +394,6 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node source.append("}") for method in c["methods"]: - if use_template_get_node: - correct_method_name(class_name, method) method_signature = "" method_signature += make_gdnative_type(method["return_type"], ref_allowed) @@ -746,11 +741,9 @@ def get_icall_name(sig): -def get_used_classes(c, use_template_get_node): +def get_used_classes(c): classes = [] for method in c["methods"]: - if use_template_get_node: - correct_method_name(strip_name(c["name"]), method) if is_class_type(method["return_type"]) and not (method["return_type"] in classes): classes.append(method["return_type"]) From 469e9da86ca374c051e31524cd4059feea2aa3cb Mon Sep 17 00:00:00 2001 From: Marc Gilleron Date: Sun, 23 Aug 2020 21:32:05 +0100 Subject: [PATCH 18/19] Rename `RID::get_rid()` => `get_id()` to match Godot --- include/core/RID.hpp | 2 +- src/core/RID.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/core/RID.hpp b/include/core/RID.hpp index d89823b6..3b3ce809 100644 --- a/include/core/RID.hpp +++ b/include/core/RID.hpp @@ -15,7 +15,7 @@ public: RID(Object *p); - int32_t get_rid() const; + int32_t get_id() const; inline bool is_valid() const { // is_valid() is not available in the C API... diff --git a/src/core/RID.cpp b/src/core/RID.cpp index 7ca1e7a5..5391f6ee 100644 --- a/src/core/RID.cpp +++ b/src/core/RID.cpp @@ -14,7 +14,7 @@ RID::RID(Object *p) { godot::api->godot_rid_new_with_resource(&_godot_rid, (const godot_object *)p); } -int32_t RID::get_rid() const { +int32_t RID::get_id() const { return godot::api->godot_rid_get_id(&_godot_rid); } From f71ccdfbcb4e87742c7dc4999649068781d22183 Mon Sep 17 00:00:00 2001 From: proxemy <33573115+proxemy@users.noreply.github.com> Date: Thu, 27 Aug 2020 19:46:03 +0200 Subject: [PATCH 19/19] Bugfix. Project generation now respects the given 'headers_dir' start parameter. --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index b63ee57d..1d0ea9ed 100644 --- a/SConstruct +++ b/SConstruct @@ -361,7 +361,7 @@ json_api_file = '' if 'custom_api_file' in env: json_api_file = env['custom_api_file'] else: - json_api_file = os.path.join(os.getcwd(), 'godot_headers', 'api.json') + json_api_file = os.path.join(os.getcwd(), env['headers_dir'], 'api.json') if env['generate_bindings']: # Actually create the bindings here