Upgraded to latest godot-core version

Cargo.toml

@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [lib]
-crate-type = ["cdylib"]  # Compile this crate to a dynamic C library.
+crate-type = ["cdylib"] # Compile this crate to a dynamic C library.
 
 [dependencies]
 # godot = { git = "https://github.com/godot-rust/gdext", branch="master" }
-godot = { git = "https://github.com/godot-rust/gdext", rev="8d93420" }
+godot = { git = "https://github.com/godot-rust/gdext", rev = "fe5b02b" }

squiggles_core.gdextension

@@ -1,6 +1,6 @@
 [configuration]
 entry_symbol = "gdext_rust_init"
-compatibility_minimum = 4.2
+compatibility_minimum = 4.3
 reloadable = true
 
 

src/editor/editor_plugin.rs

@@ -10,7 +10,6 @@ use crate::scene::serialization::SquigglesSerialized;
 #[class(tool, editor_plugin, init, base=EditorPlugin)]
 struct SquigglesCoreEditorUtils {
     tool_items: Option<Gd<PopupMenu>>,
-    #[base]
     base: Base<EditorPlugin>,
 }
 

src/scene/camera.rs

@@ -11,7 +11,6 @@ pub const CAMERA_BRAIN_GROUP: &str = "camera_brain";
 pub struct CameraBrain3D {
     cam_buffer: Vec<Gd<VirtualCamera3D>>,
     last_cam: bool,
-    #[base]
     base: Base<Camera3D>,
 }
 
@@ -82,7 +81,6 @@ pub struct VirtualCamera3D {
     #[export]
     push_on_ready: bool,
 
-    #[base]
     base: Base<Marker3D>,
 }
 

src/scene/dialog/core_dialog.rs

@@ -26,7 +26,7 @@ pub struct CoreDialog {
     pub event_bus: Option<Gd<DialogEvents>>,
     pub gui: Option<Gd<DialogGUI>>,
     pub blackboard: Blackboard,
-    #[base]
+
     base: Base<Object>,
 }
 

src/scene/dialog/dialog_builder.rs

@@ -4,7 +4,7 @@ use godot::prelude::*;
 #[class(init, base=Object)]
 pub struct DialogBuilder {
     nodes: Array<Dictionary>,
-    #[base]
+
     node: Base<Object>,
 }
 #[godot_api]

src/scene/dialog/dialog_events.rs

@@ -3,7 +3,6 @@ use godot::prelude::*;
 #[derive(GodotClass)]
 #[class(init, base=Node)]
 pub struct DialogEvents {
-    #[base]
     node: Base<Node>,
 }
 

src/scene/dialog/dialog_gui.rs

@@ -41,7 +41,7 @@ pub struct DialogGUI {
     options_root: Option<Gd<Control>>,
     current_index: usize,
     state: DialogState,
-    #[base]
+
     base: Base<CanvasLayer>,
 }
 
@@ -143,7 +143,7 @@ impl DialogGUI {
         }
         rich_text.set_use_bbcode(true);
         rich_text.set_text("[wave] Hello World! [/wave]".to_godot());
-        rich_text.set_v_size_flags(SizeFlags::SIZE_EXPAND_FILL);
+        rich_text.set_v_size_flags(SizeFlags::EXPAND_FILL);
 
         let font_size = settings.bind().dialog_font_size as i32;
         rich_text.add_theme_font_size_override(StringName::from("normal_font_size"), font_size);
@@ -169,7 +169,7 @@ impl DialogGUI {
         margin.add_theme_constant_override(StringName::from("margin_left"), margin_lr.0);
         margin.add_theme_constant_override(StringName::from("margin_right"), margin_lr.1);
         margin.add_theme_constant_override(StringName::from("margin_bottom"), BOTTOM_MARGIN);
-        margin.set_anchors_and_offsets_preset(LayoutPreset::PRESET_BOTTOM_WIDE);
+        margin.set_anchors_and_offsets_preset(LayoutPreset::BOTTOM_WIDE);
         margin.force_update_transform();
         /*
         	*/
@@ -252,7 +252,7 @@ impl DialogGUI {
                         },
                     ),
                 )
-                .flags(ConnectFlags::CONNECT_DEFERRED.ord() as u32)
+                .flags(ConnectFlags::DEFERRED.ord() as u32)
                 .done();
             if is_first {
                 button.grab_focus();
@@ -261,10 +261,10 @@ impl DialogGUI {
         }
         let align = self.get_settings().bind().choice_buttons_align.clone();
         root.set_anchors_and_offsets_preset(match align {
-            DialogAlign::Left => LayoutPreset::PRESET_CENTER_LEFT,
-            DialogAlign::Right => LayoutPreset::PRESET_CENTER_RIGHT,
-            DialogAlign::Center => LayoutPreset::PRESET_CENTER,
-            DialogAlign::FullWide => LayoutPreset::PRESET_VCENTER_WIDE,
+            DialogAlign::Left => LayoutPreset::CENTER_LEFT,
+            DialogAlign::Right => LayoutPreset::CENTER_RIGHT,
+            DialogAlign::Center => LayoutPreset::CENTER,
+            DialogAlign::FullWide => LayoutPreset::VCENTER_WIDE,
         });
     }
 

src/scene/dialog/dialog_settings.rs

@@ -1,7 +1,7 @@
 use godot::{engine::LabelSettings, prelude::*};
 
-#[repr(u32)]
-#[derive(Var, Default, Export, Clone)]
+#[derive(Var, Default, Export, Clone, GodotConvert)]
+#[godot(via=i64)]
 pub enum DialogAlign {
     Left = 0,
     Right = 1,
@@ -21,8 +21,8 @@ impl DialogAlign {
     }
 }
 
-#[repr(i32)]
-#[derive(Var, Default, Export, Clone)]
+#[derive(Var, Default, Export, Clone, GodotConvert)]
+#[godot(via = i32)]
 pub enum EEaseType {
     #[default]
     In = 0,
@@ -31,8 +31,8 @@ pub enum EEaseType {
     OutIn = 3,
 }
 
-#[repr(i32)]
-#[derive(Var, Default, Export, Clone)]
+#[derive(Var, Default, Export, Clone, GodotConvert)]
+#[godot(via=i32)]
 pub enum ETransType {
     #[default]
     Linear = 0,
@@ -77,20 +77,14 @@ pub struct DialogSettings {
 
     #[export]
     pub anim_hide_trans: ETransType,
-
     #[export]
     pub anim_hide_duration: f32,
-
     #[export]
     pub auto_focus_choice_buttons: bool,
-
     #[export]
     pub choice_buttons_align: DialogAlign,
-
     #[export]
     pub words_per_minute: f32,
-
-    #[base]
     base: Base<Resource>,
 }
 

src/scene/game_globals.rs

@@ -38,7 +38,7 @@ fn get_setting_name(name: &str) -> GString {
 pub struct CoreGlobals {
     #[var]
     config: Gd<SquigglesCoreConfig>,
-    #[base]
+
     base: Base<Object>,
 }
 

src/scene/game_settings/audio.rs

@@ -8,7 +8,7 @@ pub struct GameAudioSettings {
     audio_db_limit: f32,
     #[export]
     audio_bus_volumes: PackedFloat32Array,
-    #[base]
+
     base: Base<Resource>,
 }
 

src/scene/game_settings/controls.rs

@@ -11,8 +11,8 @@ use godot::{
 
 use crate::scene::serialization::{SaveDataBuilder, SquigglesSerialized};
 
-#[repr(i32)]
-#[derive(Var, PartialEq, PartialOrd, Eq, Ord)]
+#[derive(Var, PartialEq, PartialOrd, Eq, Ord, GodotConvert)]
+#[godot(via=i32)]
 enum MappingsStyle {
     All = 0,
     AllCustom = 1,
@@ -29,8 +29,8 @@ impl MappingsStyle {
     }
 }
 
-#[repr(i32)]
-#[derive(Var, PartialEq, PartialOrd, Eq, Ord)]
+#[derive(Var, PartialEq, PartialOrd, Eq, Ord, GodotConvert)]
+#[godot(via = i32)]
 enum HandledInputEvents {
     JoypadButton = 0,
     JoypadMotion = 1,
@@ -82,7 +82,6 @@ pub struct GameControlsSettings {
     // internal
     base_mappings: MappingStorage,
     mapping_overrides: MappingStorage,
-    #[base]
     base: Base<Resource>,
 }
 #[godot_api]

src/scene/game_settings/gameplay.rs

@@ -9,7 +9,7 @@ pub struct GameGameplaySettings {
     options_number: Array<Gd<GameplayOptionNumber>>,
     #[export]
     options_string: Array<Gd<GameplayOptionString>>,
-    #[base]
+
     base: Base<Resource>,
 }
 
@@ -82,7 +82,7 @@ pub struct GameplayOptionBool {
     option_key: GString,
     #[export]
     value: bool,
-    #[base]
+
     node: Base<Resource>,
 }
 
@@ -107,7 +107,7 @@ pub struct GameplayOptionNumber {
     allow_greater: bool,
     #[export]
     allow_lesser: bool,
-    #[base]
+
     node: Base<Resource>,
 }
 
@@ -126,7 +126,7 @@ pub struct GameplayOptionString {
     treat_as_enum: bool,
     #[export]
     enum_values: PackedStringArray,
-    #[base]
+
     node: Base<Resource>,
 }
 

src/scene/game_settings/graphics.rs

@@ -30,7 +30,7 @@ pub struct GameGraphicsSettings {
     window_fullscreen_mode: i32,
     #[export(enum=(Standard=0, FSR10=1, FSR22=2))]
     scaling_algorithm: i32,
-    #[base]
+
     base: Base<Resource>,
 }
 
@@ -48,8 +48,8 @@ impl IResource for GameGraphicsSettings {
             value_contrast: 1.0,
             value_saturation: 1.0,
             value_exposure: 1.0,
-            scaling_algorithm: Scaling3DMode::SCALING_3D_MODE_BILINEAR.ord(),
-            window_fullscreen_mode: WindowMode::WINDOW_MODE_MAXIMIZED.ord(),
+            scaling_algorithm: Scaling3DMode::BILINEAR.ord(),
+            window_fullscreen_mode: WindowMode::MAXIMIZED.ord(),
         }
     }
 }
@@ -69,14 +69,14 @@ impl GameGraphicsSettings {
 
         // == window mode
         DisplayServer::singleton().window_set_mode(match self.window_fullscreen_mode {
-            0 => WindowMode::WINDOW_MODE_WINDOWED,
-            1 => WindowMode::WINDOW_MODE_MINIMIZED,
-            2 => WindowMode::WINDOW_MODE_MAXIMIZED,
-            3 => WindowMode::WINDOW_MODE_FULLSCREEN,
-            4 => WindowMode::WINDOW_MODE_EXCLUSIVE_FULLSCREEN,
+            0 => WindowMode::WINDOWED,
+            1 => WindowMode::MINIMIZED,
+            2 => WindowMode::MAXIMIZED,
+            3 => WindowMode::FULLSCREEN,
+            4 => WindowMode::EXCLUSIVE_FULLSCREEN,
             _ => {
 				godot_warn!("CoreGlobals/config/graphics:window_fullscreen_mode = {}. This is outside of the allowed bounds. Don't frickin do that!?", self.window_fullscreen_mode);
-				WindowMode::WINDOW_MODE_WINDOWED},
+				WindowMode::WINDOWED},
     	    }
 		);
 

src/scene/game_settings/mod.rs

@@ -34,7 +34,6 @@ pub struct SquigglesCoreConfig {
     pub user_mods: Option<Gd<UserModifications>>,
 
     //
-    #[base]
     base: Base<Resource>,
 }
 #[godot_api]

src/scene/game_settings/user_mods.rs

@@ -4,8 +4,8 @@ use godot::{
     engine::{DirAccess, Engine, ProjectSettings},
     prelude::*,
 };
-#[repr(i32)]
-#[derive(Debug, Var, Export, Default, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Var, Export, Default, PartialEq, Eq, PartialOrd, Ord, GodotConvert)]
+#[godot(via=i32)]
 pub enum ModLoadingType {
     #[default]
     Disabled = 0,
@@ -22,8 +22,6 @@ pub struct UserModifications {
     allow_mods_override_files: bool,
     #[export]
     loading_type: ModLoadingType,
-
-    #[base]
     base: Base<Resource>,
 }
 

src/scene/godot_replacements/custom_world_environment.rs

@@ -10,7 +10,7 @@ use crate::scene::game_globals::CoreGlobals;
 struct WorldEnvironmentSettingsCompliant {
     #[export]
     force_override: bool,
-    #[base]
+
     base: Base<WorldEnvironment>,
 }
 
@@ -61,9 +61,9 @@ impl WorldEnvironmentSettingsCompliant {
         env.set_tonemap_exposure(gfx.get_value_exposure());
         if let Some(mut viewport) = self.base().get_viewport() {
             viewport.set_scaling_3d_mode(match gfx.get_scaling_algorithm() {
-                0 => Scaling3DMode::SCALING_3D_MODE_BILINEAR,
-                1 => Scaling3DMode::SCALING_3D_MODE_FSR,
-                2 => Scaling3DMode::SCALING_3D_MODE_FSR2,
+                0 => Scaling3DMode::BILINEAR,
+                1 => Scaling3DMode::FSR,
+                2 => Scaling3DMode::FSR2,
                 _ => unreachable!(),
             })
         }

src/scene/input/input_axis_allocator.rs

@@ -76,7 +76,7 @@ pub struct InputAxisAllocatorResource {
     event_up: StringName,
     #[export]
     event_down: StringName,
-    #[base]
+
     node: Base<Resource>,
 }
 
@@ -94,7 +94,6 @@ pub struct InputAxisAllocator {
 
     value: Vector2,
 
-    #[base]
     node: Base<Node>,
 }