Update examples (single exported class, different element types, no icon)

Author: Bromeon

examples/property-export/Main.tscn

@@ -1,35 +1,20 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://property_export_library.gdnlib" type="GDNativeLibrary" id=1]
 
 [sub_resource type="NativeScript" id=1]
-resource_name = "ExampleHashMapProperty"
-class_name = "ExampleHashMapProperty"
-library = ExtResource( 1 )
-
-[sub_resource type="NativeScript" id=2]
-resource_name = "ExampleHashSetProperty"
-class_name = "ExampleHashSetProperty"
-library = ExtResource( 1 )
-
-[sub_resource type="NativeScript" id=3]
-resource_name = "ExampleVecProperty"
-class_name = "ExampleVecProperty"
+resource_name = "PropertyExport"
+class_name = "PropertyExport"
 library = ExtResource( 1 )
 
 [node name="Node" type="Node"]
 
-[node name="HashMap" type="Node" parent="."]
+[node name="PropertyExport" type="Node" parent="."]
 script = SubResource( 1 )
-players = {
-0: "Player0",
-1: "Player1"
+name_vec = [ "Godot", "Godette", "Go ." ]
+color_map = {
+"blue": Color( 0.184314, 0.160784, 0.8, 1 ),
+"green": Color( 0.0941176, 0.447059, 0.192157, 1 ),
+"teal": Color( 0.0941176, 0.423529, 0.564706, 1 )
 }
-
-[node name="HashSet" type="Node" parent="."]
-script = SubResource( 2 )
-players = [ "Player0", "Player0", "Player1" ]
-
-[node name="Vec" type="Node" parent="."]
-script = SubResource( 3 )
-players = [ "Player0", "Player1" ]
+id_set = [ 21, 77, 8, 90 ]

examples/property-export/icon.png

@@ -16,7 +16,6 @@ _global_script_class_icons={
 
 config/name="Godot Rust - Property Export"
 run/main_scene="res://Main.tscn"
-config/icon="res://icon.png"
 
 [rendering]
 

examples/property-export/icon.png.import

@@ -1,90 +1,51 @@
-use gdnative::api::*;
 use gdnative::prelude::*;
 
 use std::collections::{HashMap, HashSet};
 
-// HashMap
 #[derive(NativeClass, Default)]
 #[inherit(Node)]
-pub struct ExampleHashMapProperty {
+pub struct PropertyExport {
     #[property]
-    players: HashMap<i64, String>,
-}
-
-impl ExampleHashMapProperty {
-    fn new(_owner: &Node) -> Self {
-        Self::default()
-    }
-}
+    name_vec: Vec<String>,
 
-#[methods]
-impl ExampleHashMapProperty {
-    #[export]
-    fn _ready(&self, _owner: &Node) {
-        godot_print!("HashMap:");
-        for (id, name) in &self.players {
-            godot_print!("Hello, {} - {}!", id, name);
-        }
-    }
-}
+    #[property]
+    color_map: HashMap<GodotString, Color>,
 
-// HashSet
-#[derive(NativeClass, Default)]
-#[inherit(Node)]
-pub struct ExampleHashSetProperty {
     #[property]
-    players: HashSet<String>,
+    id_set: HashSet<i64>,
 }
 
-impl ExampleHashSetProperty {
-    fn new(_owner: &Node) -> Self {
+#[methods]
+impl PropertyExport {
+    fn new(_base: &Node) -> Self {
         Self::default()
     }
-}
 
-#[methods]
-impl ExampleHashSetProperty {
     #[export]
-    fn _ready(&self, _owner: &Node) {
-        godot_print!("HashSet:");
-        for name in &self.players {
-            godot_print!("Hello, {}!", name);
+    fn _ready(&self, base: &Node) {
+        godot_print!("Vec (name):");
+        for name in &self.name_vec {
+            godot_print!("* {}", name);
         }
-    }
-}
-
-// Vec
-#[derive(NativeClass, Default)]
-#[inherit(Node)]
-pub struct ExampleVecProperty {
-    #[property]
-    players: Vec<String>,
-}
 
-impl ExampleVecProperty {
-    fn new(_owner: &Node) -> Self {
-        Self::default()
-    }
-}
+        godot_print!("\nHashMap (string -> color):");
+        for (string, color) in &self.color_map {
+            godot_print!("* {} -> #{}", string, color.to_html(false));
+        }
 
-#[methods]
-impl ExampleVecProperty {
-    #[export]
-    fn _ready(&self, _owner: &Node) {
-        godot_print!("Vec:");
-        for name in &self.players {
-            godot_print!("Hello, {}!", name);
+        godot_print!("\nHashSet (ID):");
+        for id in &self.id_set {
+            godot_print!("* {}", id);
         }
+
+        // The program has printed the contents and fulfilled its purpose, quit
+        let scene_tree = base.get_tree().unwrap();
+        unsafe { scene_tree.assume_safe() }.quit(0);
     }
 }
 
-// Function that registers all exposed classes to Godot
 fn init(handle: InitHandle) {
-    // Register the new `HelloWorld` type we just declared.
-    handle.add_class::<ExampleHashMapProperty>();
-    handle.add_class::<ExampleHashSetProperty>();
-    handle.add_class::<ExampleVecProperty>();
+    handle.add_class::<PropertyExport>();
 }
 
-// Macro that creates the entry-points of the dynamic library.
 godot_init!(init);

examples/property-export/project.godot

@@ -1643,7 +1643,7 @@ impl<T: ToVariant> ToVariant for HashSet<T> {
     }
 }
 
-impl<T: Eq + std::hash::Hash + FromVariant> FromVariant for HashSet<T> {
+impl<T: FromVariant + Eq + Hash> FromVariant for HashSet<T> {
     #[inline]
     fn from_variant(variant: &Variant) -> Result<Self, FromVariantError> {
         let arr = VariantArray::from_variant(variant)?;