Split ToVariant and FromVariant traits

bindings_generator/src/special_methods.rs

@@ -103,6 +103,8 @@ unsafe impl GodotObject for {name} {{
 
 impl ToVariant for {name} {{
     fn to_variant(&self) -> Variant {{ Variant::from_object(self) }}
+}}
+impl FromVariant for {name} {{
     fn from_variant(variant: &Variant) -> Option<Self> {{ variant.try_to_object::<Self>() }}
 }}"#,
         name = class.name,

gdnative-core/src/byte_array.rs

@@ -1,6 +1,7 @@
 use crate::get_api;
 use crate::sys;
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 use crate::VariantArray;
 
@@ -110,6 +111,9 @@ impl ToVariant for ByteArray {
     fn to_variant(&self) -> Variant {
         Variant::from_byte_array(self)
     }
+}
+
+impl FromVariant for ByteArray {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_byte_array()
     }

gdnative-core/src/color_array.rs

@@ -2,6 +2,7 @@ use crate::get_api;
 use crate::sys;
 use crate::Color;
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 use crate::VariantArray;
 
@@ -114,6 +115,9 @@ impl ToVariant for ColorArray {
     fn to_variant(&self) -> Variant {
         Variant::from_color_array(self)
     }
+}
+
+impl FromVariant for ColorArray {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_color_array()
     }

gdnative-core/src/dictionary.rs

@@ -2,6 +2,7 @@ use crate::get_api;
 use crate::sys;
 use crate::GodotString;
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 use crate::VariantArray;
 use std::fmt;
@@ -126,6 +127,9 @@ impl ToVariant for Dictionary {
     fn to_variant(&self) -> Variant {
         Variant::from_dictionary(self)
     }
+}
+
+impl FromVariant for Dictionary {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_dictionary()
     }

gdnative-core/src/float32_array.rs

@@ -1,6 +1,7 @@
 use crate::get_api;
 use crate::sys;
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 use crate::VariantArray;
 
@@ -110,6 +111,9 @@ impl ToVariant for Float32Array {
     fn to_variant(&self) -> Variant {
         Variant::from_float32_array(self)
     }
+}
+
+impl FromVariant for Float32Array {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_float32_array()
     }

gdnative-core/src/init.rs

@@ -25,6 +25,7 @@ use super::*;
 use crate::get_api;
 use crate::NativeClass;
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 use libc;
 use std::ffi::CString;
@@ -280,7 +281,7 @@ impl<C: NativeClass> ClassBuilder<C> {
 
     pub fn add_property<T, S, G>(&self, property: Property<T, S, G>)
     where
-        T: ToVariant,
+        T: ToVariant + FromVariant,
         S: PropertySetter<C, T>,
         G: PropertyGetter<C, T>,
     {
@@ -482,7 +483,7 @@ pub struct Signal<'l> {
     pub args: &'l [SignalArgument<'l>],
 }
 
-pub unsafe trait PropertySetter<C: NativeClass, T: ToVariant> {
+pub unsafe trait PropertySetter<C: NativeClass, T: FromVariant> {
     unsafe fn as_godot_function(self) -> sys::godot_property_set_func;
 }
 
@@ -508,7 +509,7 @@ extern "C" fn empty_getter(
 
 extern "C" fn empty_free_func(_data: *mut libc::c_void) {}
 
-unsafe impl<C: NativeClass, T: ToVariant> PropertySetter<C, T> for () {
+unsafe impl<C: NativeClass, T: FromVariant> PropertySetter<C, T> for () {
     unsafe fn as_godot_function(self) -> sys::godot_property_set_func {
         let mut set = sys::godot_property_set_func::default();
         set.set_func = Some(empty_setter);
@@ -529,7 +530,7 @@ unsafe impl<C: NativeClass, T: ToVariant> PropertyGetter<C, T> for () {
 unsafe impl<F, C, T> PropertySetter<C, T> for F
 where
     C: NativeClass,
-    T: ToVariant,
+    T: FromVariant,
     F: Fn(&mut C, T),
 {
     unsafe fn as_godot_function(self) -> sys::godot_property_set_func {
@@ -545,7 +546,7 @@ where
             val: *mut sys::godot_variant,
         ) where
             C: NativeClass,
-            T: ToVariant,
+            T: FromVariant,
             F: Fn(&mut C, T),
         {
             unsafe {

gdnative-core/src/int32_array.rs

@@ -1,6 +1,7 @@
 use crate::get_api;
 use crate::sys;
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 use crate::VariantArray;
 
@@ -110,6 +111,9 @@ impl ToVariant for Int32Array {
     fn to_variant(&self) -> Variant {
         Variant::from_int32_array(self)
     }
+}
+
+impl FromVariant for Int32Array {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_int32_array()
     }

gdnative-core/src/macros.rs

@@ -408,7 +408,7 @@ macro_rules! godot_wrap_method {
                 let mut offset = 0;
                 $(
                     let _variant: &$crate::Variant = ::std::mem::transmute(&mut *(*args).offset(offset));
-                    let $pname = if let Some(val) = <$pty as $crate::ToVariant>::from_variant(_variant) {
+                    let $pname = if let Some(val) = <$pty as $crate::FromVariant>::from_variant(_variant) {
                         val
                     } else {
                         godot_error!("Incorrect argument type {:?} for argument {}",

gdnative-core/src/node_path.rs

@@ -2,6 +2,7 @@ use crate::get_api;
 use crate::sys;
 use crate::GodotString;
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 use std::fmt;
 
@@ -148,6 +149,9 @@ impl ToVariant for NodePath {
     fn to_variant(&self) -> Variant {
         Variant::from_node_path(self)
     }
+}
+
+impl FromVariant for NodePath {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_node_path()
     }

gdnative-core/src/string.rs

@@ -1,6 +1,7 @@
 use crate::get_api;
 use crate::sys;
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 
 use std::cmp::Ordering;
@@ -204,6 +205,9 @@ impl ToVariant for GodotString {
     fn to_variant(&self) -> Variant {
         Variant::from_godot_string(self)
     }
+}
+
+impl FromVariant for GodotString {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_godot_string()
     }

gdnative-core/src/string_array.rs

@@ -2,6 +2,7 @@ use crate::get_api;
 use crate::sys;
 use crate::GodotString;
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 use crate::VariantArray;
 
@@ -111,6 +112,9 @@ impl ToVariant for StringArray {
     fn to_variant(&self) -> Variant {
         Variant::from_string_array(self)
     }
+}
+
+impl FromVariant for StringArray {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_string_array()
     }

gdnative-core/src/variant.rs

@@ -690,17 +690,23 @@ godot_test!(
     }
 );
 
-/// Types that can be converted to and from a `Variant`.
-pub trait ToVariant: Sized {
+/// Types that can be converted to a `Variant`.
+pub trait ToVariant {
     fn to_variant(&self) -> Variant;
+}
+
+/// Types that can be converted from a `Variant`.
+pub trait FromVariant: Sized {
     fn from_variant(variant: &Variant) -> Option<Self>;
 }
 
 impl ToVariant for () {
     fn to_variant(&self) -> Variant {
         Variant::new()
     }
+}
 
+impl FromVariant for () {
     fn from_variant(variant: &Variant) -> Option<Self> {
         if variant.get_type() == VariantType::Nil {
             Some(())
@@ -720,7 +726,9 @@ macro_rules! impl_to_variant_for_int {
                     Variant(ret)
                 }
             }
+        }
 
+        impl FromVariant for $ty {
             fn from_variant(variant: &Variant) -> Option<Self> {
                 unsafe {
                     let api = get_api();
@@ -752,7 +760,9 @@ macro_rules! godot_uint_impl {
                     Variant(ret)
                 }
             }
+        }
 
+        impl FromVariant for $ty {
             fn from_variant(variant: &Variant) -> Option<Self> {
                 unsafe {
                     let api = get_api();
@@ -782,7 +792,9 @@ impl ToVariant for f32 {
             Variant(ret)
         }
     }
+}
 
+impl FromVariant for f32 {
     fn from_variant(variant: &Variant) -> Option<Self> {
         unsafe {
             let api = get_api();
@@ -805,7 +817,9 @@ impl ToVariant for f64 {
             Variant(ret)
         }
     }
+}
 
+impl FromVariant for f64 {
     fn from_variant(variant: &Variant) -> Option<Self> {
         unsafe {
             let api = get_api();
@@ -824,7 +838,9 @@ impl ToVariant for String {
     fn to_variant(&self) -> Variant {
         Variant::from_str(&self)
     }
+}
 
+impl FromVariant for String {
     fn from_variant(variant: &Variant) -> Option<Self> {
         unsafe {
             let api = get_api();
@@ -850,7 +866,9 @@ impl ToVariant for bool {
     fn to_variant(&self) -> Variant {
         Variant::from_bool(*self)
     }
+}
 
+impl FromVariant for bool {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_bool()
     }
@@ -860,7 +878,9 @@ impl ToVariant for Variant {
     fn to_variant(&self) -> Variant {
         self.clone()
     }
+}
 
+impl FromVariant for Variant {
     fn from_variant(variant: &Variant) -> Option<Self> {
         Some(variant.clone())
     }

gdnative-core/src/variant_array.rs

@@ -1,6 +1,7 @@
 use crate::get_api;
 use crate::sys;
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 
 /// A reference-counted `Variant` vector. Godot's generic array data type.
@@ -176,6 +177,9 @@ impl ToVariant for VariantArray {
     fn to_variant(&self) -> Variant {
         Variant::from_array(self)
     }
+}
+
+impl FromVariant for VariantArray {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_array()
     }

gdnative-core/src/vector2.rs

@@ -1,12 +1,15 @@
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 use crate::Vector2;
 
 impl ToVariant for Vector2 {
     fn to_variant(&self) -> Variant {
         Variant::from_vector2(self)
     }
+}
 
+impl FromVariant for Vector2 {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_vector2()
     }

gdnative-core/src/vector2_array.rs

@@ -1,6 +1,7 @@
 use crate::get_api;
 use crate::sys;
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 use crate::VariantArray;
 use crate::Vector2;
@@ -114,6 +115,9 @@ impl ToVariant for Vector2Array {
     fn to_variant(&self) -> Variant {
         Variant::from_vector2_array(self)
     }
+}
+
+impl FromVariant for Vector2Array {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_vector2_array()
     }

gdnative-core/src/vector3.rs

@@ -1,12 +1,15 @@
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 use crate::Vector3;
 
 impl ToVariant for Vector3 {
     fn to_variant(&self) -> Variant {
         Variant::from_vector3(self)
     }
+}
 
+impl FromVariant for Vector3 {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_vector3()
     }

gdnative-core/src/vector3_array.rs

@@ -1,6 +1,7 @@
 use crate::get_api;
 use crate::sys;
 use crate::ToVariant;
+use crate::FromVariant;
 use crate::Variant;
 use crate::VariantArray;
 use crate::Vector3;
@@ -114,6 +115,9 @@ impl ToVariant for Vector3Array {
     fn to_variant(&self) -> Variant {
         Variant::from_vector3_array(self)
     }
+}
+
+impl FromVariant for Vector3Array {
     fn from_variant(variant: &Variant) -> Option<Self> {
         variant.try_to_vector3_array()
     }