Support OnEditor in scripts

Author: TitanNano

derive/src/enums.rs

@@ -136,6 +136,16 @@ pub fn script_enum_derive(input: proc_macro::TokenStream) -> proc_macro::TokenSt
             }
         }
 
+        impl #godot_types::prelude::Var for #enum_ident {
+            fn get_property(&self) -> Self::Via {
+                self.into()
+            }
+
+            fn set_property(&mut self, value: Self::Via) {
+                *self = #godot_types::meta::FromGodot::try_from_godot(value).unwrap();
+            }
+        }
+
         #derive_export
     };
 

derive/src/lib.rs

@@ -279,7 +279,7 @@ fn derive_get_field_dispatch(field: &SpannedValue<FieldOpts>) -> TokenStream {
 
     quote_spanned! {field.ty.span()=>
         #[allow(clippy::needless_borrow)]
-        #field_name => Some(#godot_types::prelude::ToGodot::to_variant(&#accessor)),
+        #field_name => Some(#godot_types::prelude::ToGodot::to_variant(&::godot_rust_script::GetScriptProperty::get_property(&#accessor))),
     }
 }
 
@@ -313,7 +313,9 @@ fn derive_set_field_dispatch(field: &SpannedValue<FieldOpts>) -> TokenStream {
 
     let assignment = match opts.set {
         Some(setter) => quote_spanned!(setter.span()=> #setter(self, local_value)),
-        None => quote_spanned!(field.ty.span() => self.#field_ident = local_value),
+        None => {
+            quote_spanned!(field.ty.span() => ::godot_rust_script::SetScriptProperty::set_property(&mut self.#field_ident, local_value))
+        }
     };
 
     quote! {

rust-script/src/interface.rs

@@ -135,6 +135,20 @@ impl<T: GodotScript> ToGodot for RsRef<T> {
     }
 }
 
+impl<'v, T: GodotScript> ::godot::prelude::Var for RsRef<T>
+where
+    Self: GodotConvert<Via = <Self as ToGodot>::ToVia<'v>>,
+    Self: 'v,
+{
+    fn get_property(&self) -> Self::Via {
+        <Self as ToGodot>::to_godot(&self)
+    }
+
+    fn set_property(&mut self, value: Self::Via) {
+        <Self as FromGodot>::from_godot(value);
+    }
+}
+
 #[derive(thiserror::Error, Debug)]
 pub enum GodotScriptCastError {
     #[error("Object has no script attached!")]
@@ -196,6 +210,42 @@ impl<T: GodotScript, B: Inherits<T::Base> + Inherits<Object>> CastToScript<T> fo
     }
 }
 
+/// Script property access indirection
+///
+/// gdext uses this kind of indirection to allow conversion of the actual property value into a godot compatible type when accessing the
+/// property from the engine. This Trait separates the `::godot::prelude::Var` trait into it's get and set components for more granular
+/// requirements on the property types.
+pub trait GetScriptProperty: GodotConvert {
+    fn get_property(&self) -> Self::Via;
+}
+
+/// Script property write indirection
+///
+/// gdext uses this kind of indirection to allow conversion of the actual property value from a godot compatible type when setting the
+/// property from the engine. This Trait separates the `::godot::prelude::Var` trait into it's get and set components for more granular
+/// requirements on the property types.
+pub trait SetScriptProperty: GodotConvert {
+    fn set_property(&mut self, value: Self::Via);
+}
+
+impl<T> GetScriptProperty for T
+where
+    T: godot::prelude::Var,
+{
+    fn get_property(&self) -> Self::Via {
+        T::get_property(self)
+    }
+}
+
+impl<T> SetScriptProperty for T
+where
+    T: godot::prelude::Var,
+{
+    fn set_property(&mut self, value: Self::Via) {
+        T::set_property(self, value);
+    }
+}
+
 #[macro_export]
 macro_rules! define_script_root {
     () => {

rust-script/src/interface/export.rs

@@ -15,14 +15,16 @@ use godot::builtin::{
 };
 use godot::classes::{Node, Resource};
 use godot::global::PropertyHint;
-use godot::meta::{ArrayElement, FromGodot, GodotConvert, GodotType, ToGodot};
-use godot::obj::{EngineEnum, Gd};
+use godot::meta::{ArrayElement, GodotConvert, GodotType};
+use godot::obj::{EngineEnum, Gd, OnEditor};
 use godot::prelude::GodotClass;
 use godot::sys::GodotFfi;
 
+use crate::{GetScriptProperty, SetScriptProperty};
+
 use super::{GodotScript, RsRef};
 
-pub trait GodotScriptExport: GodotConvert + FromGodot + ToGodot {
+pub trait GodotScriptExport: GodotConvert + GetScriptProperty + SetScriptProperty {
     fn hint_string(custom_hint: Option<PropertyHint>, custom_string: Option<String>) -> String;
 
     fn hint(custom: Option<PropertyHint>) -> PropertyHint;
@@ -78,11 +80,7 @@ impl<T: GodotScript> GodotScriptExport for RsRef<T> {
 
 impl<T: GodotScriptExport> GodotScriptExport for Option<T>
 where
-    for<'v> T: 'v,
-    for<'v> <<T as ToGodot>::ToVia<'v> as GodotType>::Ffi: godot::sys::GodotNullableFfi,
-    for<'f> <<T as GodotConvert>::Via as GodotType>::ToFfi<'f>: godot::sys::GodotNullableFfi,
-    <<T as GodotConvert>::Via as GodotType>::Ffi: godot::sys::GodotNullableFfi,
-    for<'v, 'f> <<T as ToGodot>::ToVia<'v> as GodotType>::ToFfi<'f>: godot::sys::GodotNullableFfi,
+    Self: GodotConvert,
 {
     fn hint_string(custom_hint: Option<PropertyHint>, custom_string: Option<String>) -> String {
         T::hint_string(custom_hint, custom_string)
@@ -113,6 +111,19 @@ impl<T: ArrayElement + GodotScriptExport + GodotType> GodotScriptExport for Arra
     }
 }
 
+impl<T: GodotScriptExport> GodotScriptExport for OnEditor<T>
+where
+    Self: GodotConvert,
+{
+    fn hint_string(custom_hint: Option<PropertyHint>, custom_string: Option<String>) -> String {
+        T::hint_string(custom_hint, custom_string)
+    }
+
+    fn hint(custom: Option<PropertyHint>) -> PropertyHint {
+        T::hint(custom)
+    }
+}
+
 macro_rules! default_export {
     ($ty:ty) => {
         impl GodotScriptExport for $ty {

rust-script/src/interface/signals.rs

@@ -17,6 +17,8 @@ use godot::obj::{Gd, GodotClass};
 use crate::static_script_registry::RustScriptPropDesc;
 use crate::{GodotScript, RsRef};
 
+use super::GetScriptProperty;
+
 pub trait SignalArguments {
     const COUNT: u8;
 
@@ -220,3 +222,9 @@ impl<T: SignalArguments> ToGodot for ScriptSignal<T> {
         godot::builtin::Signal::from_object_signal(&self.host, self.name)
     }
 }
+
+impl<T: SignalArguments> GetScriptProperty for ScriptSignal<T> {
+    fn get_property(&self) -> Self::Via {
+        self.to_godot()
+    }
+}

rust-script/tests/script_derive.rs

@@ -6,7 +6,7 @@
 
 use godot::builtin::{Array, GString};
 use godot::classes::{Node, Node3D};
-use godot::obj::{Gd, NewAlloc};
+use godot::obj::{Gd, NewAlloc, OnEditor};
 use godot_rust_script::{
     godot_script_impl, CastToScript, Context, GodotScript, GodotScriptEnum, RsRef, ScriptSignal,
 };
@@ -48,6 +48,9 @@ struct TestScript {
     #[export(ty = "Decal")]
     pub node_prop_2: Option<Gd<Node3D>>,
 
+    #[export(ty = "Decal")]
+    pub node_prop_3: OnEditor<Gd<Node3D>>,
+
     #[export]
     pub node_array: Array<Gd<Node3D>>,
 
@@ -57,6 +60,9 @@ struct TestScript {
     #[export]
     pub custom_enum: ScriptEnum,
 
+    #[export]
+    pub script_ref: RsRef<TestScript>,
+
     base: Gd<<Self as GodotScript>::Base>,
 }