Skip to content
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
128 changes: 75 additions & 53 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version = "0.1.0"
edition = "2021"

[workspace.dependencies]
godot = { version = "0.3", features = ["experimental-threads"] }
godot = { version = "0.3.2", features = ["experimental-threads"] }
godot-cell = "0.3"
godot-bindings = "0.3"
itertools = "0.10"
Expand Down
4 changes: 2 additions & 2 deletions derive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ fn rust_to_variant_type(ty: &syn::Type) -> Result<TokenStream, TokenStream> {
use #godot_types::sys::GodotFfi;
use #godot_types::meta::GodotType;

<<#path as #godot_types::meta::GodotConvert>::Via as GodotType>::Ffi::VARIANT_TYPE
<<#path as #godot_types::meta::GodotConvert>::Via as GodotType>::Ffi::VARIANT_TYPE.variant_as_nil()
}
}),
T::Verbatim(_) => Err(syn::Error::new(
Expand All @@ -206,7 +206,7 @@ fn rust_to_variant_type(ty: &syn::Type) -> Result<TokenStream, TokenStream> {
use #godot_types::sys::GodotFfi;
use #godot_types::meta::GodotType;

<<#tuple as #godot_types::meta::GodotConvert>::Via as GodotType>::Ffi::VARIANT_TYPE
<<#tuple as #godot_types::meta::GodotConvert>::Via as GodotType>::Ffi::VARIANT_TYPE.variant_as_nil()
}
})
}
Expand Down
4 changes: 3 additions & 1 deletion rust-script/src/interface/export.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ where

impl<T: ArrayElement + GodotScriptExport + GodotType> GodotScriptExport for Array<T> {
fn hint_string(custom_hint: Option<PropertyHint>, custom_string: Option<String>) -> String {
let element_type = <<T as GodotType>::Ffi as GodotFfi>::VARIANT_TYPE.ord();
let element_type = <<T as GodotType>::Ffi as GodotFfi>::VARIANT_TYPE
.variant_as_nil()
.ord();
let element_hint = <T as GodotScriptExport>::hint(custom_hint).ord();
let element_hint_string = <T as GodotScriptExport>::hint_string(custom_hint, custom_string);

Expand Down
2 changes: 1 addition & 1 deletion rust-script/src/interface/signals.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ macro_rules! signal_argument_desc {
($name:literal, $type:ty) => {
RustScriptPropDesc {
name: $name,
ty: <<<$type as GodotConvert>::Via as GodotType>::Ffi as godot::sys::GodotFfi>::VARIANT_TYPE,
ty: <<<$type as GodotConvert>::Via as GodotType>::Ffi as godot::sys::GodotFfi>::VARIANT_TYPE.variant_as_nil(),
class_name: <<$type as GodotConvert>::Via as GodotType>::class_name(),
exported: false,
hint: PropertyHint::NONE,
Expand Down
Loading