update GDNative headers and API bindings, add associated constants

bindings_generator/src/api.rs

@@ -9,7 +9,7 @@ pub struct Api {
 impl Api {
     pub fn new() -> Self {
         let mut api = Api {
-            classes: serde_json::from_slice(get_api_json())
+            classes: serde_json::from_str(get_api_json())
                 .expect("Failed to parse the API description"),
             api_underscore: Default::default(),
         };
@@ -72,6 +72,7 @@ pub struct GodotClass {
 
     pub methods: Vec<GodotMethod>,
     pub enums: Vec<Enum>,
+    pub constants: HashMap<ConstantName, ConstantValue>,
 }
 
 impl GodotClass {
@@ -84,6 +85,9 @@ impl GodotClass {
     }
 }
 
+pub type ConstantName = String;
+pub type ConstantValue = i64;
+
 #[derive(Deserialize, Debug)]
 pub struct Enum {
     pub name: String,
@@ -301,10 +305,6 @@ impl Ty {
     }
 }
 
-pub fn get_api_json() -> &'static [u8] {
-    include_bytes!("../api.json")
-}
-
-pub fn get_namespaces_json() -> &'static [u8] {
-    include_bytes!("../namespaces.json")
+pub fn get_api_json() -> &'static str {
+    include_str!("../api.json")
 }

bindings_generator/src/classes.rs

@@ -23,6 +23,53 @@ pub struct {name} {{
     Ok(())
 }
 
+pub fn generate_class_constants(output: &mut impl Write, class: &GodotClass) -> GeneratorResult {
+    if class.constants.is_empty() {
+        return Ok(());
+    }
+
+    writeln!(output, "/// Constants")?;
+    writeln!(output, "#[allow(non_upper_case_globals)]")?;
+    writeln!(output, "impl {} {{", class.name)?;
+
+    for (name, value) in &class.constants {
+        writeln!(
+            output,
+            "    pub const {name}: i64 = {value};",
+            name = name,
+            value = value,
+        )?;
+    }
+
+    writeln!(output, "}}")?;
+    Ok(())
+}
+
+#[derive(Copy, Clone, PartialEq)]
+struct EnumReference<'a> {
+    class: &'a str,
+    enum_name: &'a str,
+    enum_variant: &'a str,
+}
+
+const ENUM_VARIANTS_TO_SKIP: &[EnumReference<'static>] = &[
+    EnumReference {
+        class: "MultiplayerAPI",
+        enum_name: "RPCMode",
+        enum_variant: "RPC_MODE_SLAVE",
+    },
+    EnumReference {
+        class: "MultiplayerAPI",
+        enum_name: "RPCMode",
+        enum_variant: "RPC_MODE_SYNC",
+    },
+    EnumReference {
+        class: "TextureLayered",
+        enum_name: "Flags",
+        enum_variant: "FLAGS_DEFAULT",
+    },
+];
+
 pub fn generate_enum(output: &mut impl Write, class: &GodotClass, e: &Enum) -> GeneratorResult {
     // TODO: check whether the start of the variant name is
     // equal to the end of the enum name and if so don't repeat it
@@ -43,6 +90,16 @@ pub enum {class_name}{enum_name} {{"#,
 
     for &(key, val) in &values {
         // Use lowercase to test because of different CamelCase conventions (Msaa/MSAA, etc.).
+        let enum_ref = EnumReference {
+            class: class.name.as_str(),
+            enum_name: e.name.as_str(),
+            enum_variant: key.as_str(),
+        };
+
+        if ENUM_VARIANTS_TO_SKIP.contains(&enum_ref) {
+            continue;
+        }
+
         let enum_name_without_mode = if e.name.ends_with("Mode") {
             e.name[0..(e.name.len() - 4)].to_lowercase()
         } else {

bindings_generator/src/lib.rs

@@ -100,6 +100,8 @@ fn generate_class_bindings(
             generate_enum(output_types_impls, class, e)?;
         }
 
+        generate_class_constants(output_types_impls, class)?;
+
         writeln!(output_types_impls, "impl {} {{", class.name)?;
 
         if class.singleton {

examples/hello_world/Main.tscn

@@ -9,4 +9,3 @@ library = ExtResource( 1 )
 
 [node name="Node" type="Node"]
 script = SubResource( 1 )
-

examples/hello_world/default_env.tres

@@ -12,4 +12,3 @@ sun_energy = 16.0
 [resource]
 background_mode = 2
 background_sky = SubResource( 1 )
-

examples/scene_create/src/lib.rs

@@ -75,7 +75,7 @@ impl SceneCreate {
 
                 // You need to parent the new scene under some node if you want it in the scene.
                 //   We parent it under ourselves.
-                owner.add_child(Some(spatial.to_object()), false);
+                owner.add_child(Some(spatial.to_node()), false);
                 self.children_spawned += 1;
             }
             Err(err) => godot_print!("Could not instance Child : {:?}", err),

gdnative-core/src/generated.rs

@@ -4,6 +4,7 @@
 use super::*;
 use crate::get_api;
 use crate::sys;
+use crate::sys::GodotApi;
 
 use libc;
 use std::ops::*;

gdnative-core/src/lib.rs

@@ -47,7 +47,6 @@ mod free_on_drop;
 mod generated;
 pub mod init;
 mod int32_array;
-mod internal;
 mod node_path;
 #[doc(hidden)]
 pub mod object;
@@ -72,7 +71,6 @@ pub use crate::free_on_drop::*;
 pub use crate::generated::*;
 pub use crate::geom::*;
 pub use crate::int32_array::*;
-pub use crate::internal::*;
 pub use crate::node_path::*;
 pub use crate::object::GodotObject;
 pub use crate::object::Instanciable;
@@ -89,6 +87,8 @@ pub use crate::vector2_array::*;
 pub use crate::vector3::*;
 pub use crate::vector3_array::*;
 
+pub use sys::GodotApi;
+
 use std::mem;
 
 #[doc(hidden)]

gdnative-sys/Cargo.toml

@@ -15,3 +15,5 @@ libc = "0.2"
 
 [build-dependencies]
 bindgen = "0.51.0"
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }