Merge branch 'master' into astolfo-feature/builtin-quaternion

Author: RealAstolfo

.github/workflows/full-ci.yml

@@ -14,7 +14,8 @@ on:
       - trying
 
 env:
-  GDEXT_FEATURES: '--features godot-core/convenience'
+  GDEXT_FEATURES: ''
+#  GDEXT_FEATURES: '--features crate/feature'
 #  GDEXT_CRATE_ARGS: '-p godot-codegen -p godot-ffi -p godot-core -p godot-macros -p godot'
 
 defaults:

.github/workflows/minimal-ci.yml

@@ -14,7 +14,8 @@ on:
       - master
 
 env:
-  GDEXT_FEATURES: '--features godot-core/convenience'
+  GDEXT_FEATURES: ''
+#  GDEXT_FEATURES: '--features crate/feature'
 #  GDEXT_CRATE_ARGS: '-p godot-codegen -p godot-ffi -p godot-core -p godot-macros -p godot'
 
 defaults:

check.sh

@@ -67,7 +67,8 @@ function findGodot() {
     fi
 }
 
-features="--features godot-core/convenience"
+#features="--features crate/feature"
+features=""
 cmds=()
 
 for arg in "${args[@]}"; do

examples/dodge-the-creeps/rust/Cargo.toml

@@ -8,5 +8,5 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-godot = { path = "../../../godot", default-features = false, features = ["formatted", "convenience"] }
+godot = { path = "../../../godot", default-features = false, features = ["formatted"] }
 rand = "0.8"

godot-codegen/input/gdextension_interface.h

@@ -37,7 +37,6 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <stdio.h>
 
 #ifndef __cplusplus
 typedef uint32_t char32_t;
@@ -415,9 +414,12 @@ typedef struct {
 	void *(*mem_realloc)(void *p_ptr, size_t p_bytes);
 	void (*mem_free)(void *p_ptr);
 
-	void (*print_error)(const char *p_description, const char *p_function, const char *p_file, int32_t p_line);
-	void (*print_warning)(const char *p_description, const char *p_function, const char *p_file, int32_t p_line);
-	void (*print_script_error)(const char *p_description, const char *p_function, const char *p_file, int32_t p_line);
+	void (*print_error)(const char *p_description, const char *p_function, const char *p_file, int32_t p_line, GDExtensionBool p_editor_notify);
+	void (*print_error_with_message)(const char *p_description, const char *p_message, const char *p_function, const char *p_file, int32_t p_line, GDExtensionBool p_editor_notify);
+	void (*print_warning)(const char *p_description, const char *p_function, const char *p_file, int32_t p_line, GDExtensionBool p_editor_notify);
+	void (*print_warning_with_message)(const char *p_description, const char *p_message, const char *p_function, const char *p_file, int32_t p_line, GDExtensionBool p_editor_notify);
+	void (*print_script_error)(const char *p_description, const char *p_function, const char *p_file, int32_t p_line, GDExtensionBool p_editor_notify);
+	void (*print_script_error_with_message)(const char *p_description, const char *p_message, const char *p_function, const char *p_file, int32_t p_line, GDExtensionBool p_editor_notify);
 
 	uint64_t (*get_native_struct_size)(GDExtensionConstStringNamePtr p_name);
 
@@ -552,7 +554,7 @@ typedef struct {
 	GDExtensionVariantPtr (*array_operator_index)(GDExtensionTypePtr p_self, GDExtensionInt p_index); // p_self should be an Array ptr
 	GDExtensionVariantPtr (*array_operator_index_const)(GDExtensionConstTypePtr p_self, GDExtensionInt p_index); // p_self should be an Array ptr
 	void (*array_ref)(GDExtensionTypePtr p_self, GDExtensionConstTypePtr p_from); // p_self should be an Array ptr
-	void (*array_set_typed)(GDExtensionTypePtr p_self, uint32_t p_type, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstVariantPtr p_script); // p_self should be an Array ptr
+	void (*array_set_typed)(GDExtensionTypePtr p_self, GDExtensionVariantType p_type, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstVariantPtr p_script); // p_self should be an Array ptr
 
 	/* Dictionary functions */
 

godot-codegen/src/api_parser.rs

@@ -172,7 +172,7 @@ pub struct ClassMethod {
     pub name: String,
     pub is_const: bool,
     pub is_vararg: bool,
-    //pub is_static: bool,
+    pub is_static: bool,
     pub is_virtual: bool,
     pub hash: Option<i64>,
     pub return_value: Option<MethodReturn>,

godot-codegen/src/class_generator.rs

@@ -282,6 +282,7 @@ fn make_builtin_class(
 
     let methods = make_builtin_methods(&class.methods, class_name, type_info, ctx);
     let enums = make_enums(&class_enums, class_name, ctx);
+    let special_constructors = make_special_builtin_methods(class_name, ctx);
 
     // mod re_export needed, because class should not appear inside the file module, and we can't re-export private struct as pub
     let tokens = quote! {
@@ -303,7 +304,7 @@ fn make_builtin_class(
                     sys_ptr: outer.sys(),
                 }
             }
-
+            #special_constructors
             #methods
         }
 
@@ -426,6 +427,24 @@ fn make_enums(enums: &Option<Vec<Enum>>, _class_name: &TyName, _ctx: &Context) -
     }
 }
 
+/// Depending on the built-in class, adds custom constructors and methods.
+fn make_special_builtin_methods(class_name: &TyName, _ctx: &Context) -> TokenStream {
+    if class_name.godot_ty == "Array" {
+        quote! {
+            pub fn from_outer_typed<T>(outer: &TypedArray<T>) -> Self
+                where T: crate::builtin::meta::VariantMetadata
+            {
+                Self {
+                    _outer_lifetime: std::marker::PhantomData,
+                    sys_ptr: outer.sys(),
+                }
+            }
+        }
+    } else {
+        TokenStream::new()
+    }
+}
+
 #[cfg(not(feature = "codegen-full"))]
 fn is_type_excluded(ty: &str, ctx: &mut Context) -> bool {
     let is_class_excluded = |class: &str| !crate::SELECTED_CLASSES.contains(&class);
@@ -510,20 +529,21 @@ fn make_method_definition(
     /*if method.map_args(|args| args.is_empty()) {
         // Getters (i.e. 0 arguments) will be stripped of their `get_` prefix, to conform to Rust convention
         if let Some(remainder) = method_name.strip_prefix("get_") {
-            // Do not apply for get_16 etc
-            // TODO also not for get_u16 etc, in StreamPeer
+            // TODO Do not apply for FileAccess::get_16, StreamPeer::get_u16, etc
             if !remainder.chars().nth(0).unwrap().is_ascii_digit() {
                 method_name = remainder;
             }
         }
     }*/
 
     let method_name_str = special_cases::maybe_renamed(class_name, &method.name);
-    let receiver = if method.is_const {
-        quote! { &self, }
-    } else {
-        quote! { &mut self, }
-    };
+
+    let (receiver, receiver_arg) = make_receiver(
+        method.is_static,
+        method.is_const,
+        quote! { self.object_ptr },
+    );
+
     let hash = method.hash;
     let is_varcall = method.is_vararg;
 
@@ -546,10 +566,10 @@ fn make_method_definition(
         let __call_fn = sys::interface_fn!(#function_provider);
     };
     let varcall_invocation = quote! {
-        __call_fn(__method_bind, self.object_ptr, __args_ptr, __args.len() as i64, return_ptr, std::ptr::addr_of_mut!(__err));
+        __call_fn(__method_bind, #receiver_arg, __args_ptr, __args.len() as i64, return_ptr, std::ptr::addr_of_mut!(__err));
     };
     let ptrcall_invocation = quote! {
-        __call_fn(__method_bind, self.object_ptr, __args_ptr, return_ptr);
+        __call_fn(__method_bind, #receiver_arg, __args_ptr, return_ptr);
     };
 
     make_function_definition(
@@ -579,11 +599,8 @@ fn make_builtin_method_definition(
 
     let method_name_str = &method.name;
 
-    let receiver = if method.is_const {
-        quote! { &self, }
-    } else {
-        quote! { &mut self, }
-    };
+    let (receiver, receiver_arg) =
+        make_receiver(method.is_static, method.is_const, quote! { self.sys_ptr });
 
     let return_value = method.return_type.as_deref().map(MethodReturn::from_type);
     let hash = method.hash;
@@ -602,7 +619,7 @@ fn make_builtin_method_definition(
         let __call_fn = __call_fn.unwrap_unchecked();
     };
     let ptrcall_invocation = quote! {
-        __call_fn(self.sys_ptr, __args_ptr, return_ptr, __args.len() as i32);
+        __call_fn(#receiver_arg, __args_ptr, return_ptr, __args.len() as i32);
     };
 
     make_function_definition(
@@ -746,6 +763,28 @@ fn make_function_definition(
     }
 }
 
+fn make_receiver(
+    is_static: bool,
+    is_const: bool,
+    receiver_arg: TokenStream,
+) -> (TokenStream, TokenStream) {
+    let receiver = if is_static {
+        quote! {}
+    } else if is_const {
+        quote! { &self, }
+    } else {
+        quote! { &mut self, }
+    };
+
+    let receiver_arg = if is_static {
+        quote! { std::ptr::null_mut() }
+    } else {
+        receiver_arg
+    };
+
+    (receiver, receiver_arg)
+}
+
 fn make_params(
     method_args: &Option<Vec<MethodArg>>,
     is_varcall: bool,

godot-codegen/src/godot_version.rs

@@ -30,7 +30,7 @@ pub fn parse_godot_version(version_str: &str) -> Result<GodotVersion, Box<dyn Er
     let regex = Regex::new(
         //  major  minor     [patch]                                              official|custom_build|gentoo
         //  v      v         v                                                    v
-        r#"(\d+)\.(\d+)(?:\.(\d+))?\.(alpha|beta|dev|stable)[0-9]*\.(?:mono\.)?(?:[a-z_]+\.([a-f0-9]+)|official)"#,
+        r#"(\d+)\.(\d+)(?:\.(\d+))?\.(alpha|beta|dev|rc|stable)[0-9]*\.(?:mono\.)?(?:[a-z_]+\.([a-f0-9]+)|official)"#,
     )?;
 
     let fail = || format!("Version substring cannot be parsed: `{version_str}`");
@@ -71,6 +71,7 @@ fn test_godot_versions() {
         ("4.0.dev.custom_build.e7e9e663b", 4, 0, 0, "dev", s("e7e9e663b")),
         ("4.0.alpha.custom_build.faddbcfc0", 4, 0, 0, "alpha", s("faddbcfc0")),
         ("4.0.beta8.mono.custom_build.b28ddd918", 4, 0, 0, "beta", s("b28ddd918")),
+        ("4.0.rc1.official.8843d9ad3", 4, 0, 0, "rc", s("8843d9ad3")),
     ];
 
     let bad_versions = [

godot-codegen/src/lib.rs

@@ -269,6 +269,9 @@ const SELECTED_CLASSES: &[&str] = &[
     "CollisionShape2D",
     "Control",
     "FileAccess",
+    "HTTPRequest",
+    "Image",
+    "ImageTextureLayered",
     "Input",
     "Label",
     "MainLoop",
@@ -289,6 +292,9 @@ const SELECTED_CLASSES: &[&str] = &[
     "SceneTree",
     "Sprite2D",
     "SpriteFrames",
+    "Texture",
+    "Texture2DArray",
+    "TextureLayered",
     "Time",
     "Timer",
 ];

godot-core/Cargo.toml

@@ -12,7 +12,6 @@ default = []
 trace = []
 codegen-fmt = ["godot-ffi/codegen-fmt"]
 codegen-full = ["godot-codegen/codegen-full"]
-convenience = []
 
 [dependencies]
 godot-ffi = { path = "../godot-ffi" }