From eb4ecf357283d99a960658b98ef98924b5b607e3 Mon Sep 17 00:00:00 2001
From: Dmitry Stepanov <d1maxa@yandex.ru>
Date: Mon, 21 Apr 2025 21:49:10 +0300
Subject: [PATCH] working vector flattened structure

- all that was needed is a version field, not guessing by the content
---
 fyrox-core/src/visitor/impls.rs | 43 ++++++++++++++++++++++++++-------
 fyrox-core/src/visitor/mod.rs   |  8 ------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/fyrox-core/src/visitor/impls.rs b/fyrox-core/src/visitor/impls.rs
index c97fd2c0a..578007504 100644
--- a/fyrox-core/src/visitor/impls.rs
+++ b/fyrox-core/src/visitor/impls.rs
@@ -141,25 +141,50 @@ where
     T: Default + Visit + 'static,
 {
     fn visit(&mut self, name: &str, visitor: &mut Visitor) -> VisitResult {
+        const VERSION_VERBOSE: u32 = 0;
+        const VERSION_CURRENT: u32 = 1;
+
         let mut region = visitor.enter_region(name)?;
 
         let mut len = self.len() as u32;
         len.visit("Length", &mut region)?;
 
+        let mut version = VERSION_CURRENT;
+        if region.is_reading() && version.visit("Version", &mut region).is_err() {
+            version = VERSION_VERBOSE;
+        } else {
+            version.visit("Version", &mut region)?;
+        }
+
+        fn make_name(i: usize) -> String {
+            format!("Item{i}")
+        }
+
         if region.reading {
             self.clear();
-            for index in 0..len {
-                let region_name = format!("Item{index}");
-                let mut region = region.enter_region(region_name.as_str())?;
-                let mut object = T::default();
-                object.visit("ItemData", &mut region)?;
-                self.push(object);
+            for index in 0..len as usize {
+                // Backward compatibility with the previous version (verbose, non-flat).
+                if version == VERSION_VERBOSE {
+                    if let Ok(mut item_region) = region.enter_region(&make_name(index)) {
+                        let mut object = T::default();
+                        object.visit("ItemData", &mut item_region)?;
+                        self.push(object);
+                        continue;
+                    }
+                } else if version == VERSION_CURRENT {
+                    // Try to read the new (flattened) version.
+                    let mut object = T::default();
+                    object.visit(&make_name(index), &mut region)?;
+                    self.push(object);
+                } else {
+                    return Err(VisitError::User(format!(
+                        "Unknown vector version {version}!"
+                    )));
+                }
             }
         } else {
             for (index, item) in self.iter_mut().enumerate() {
-                let region_name = format!("Item{index}");
-                let mut region = region.enter_region(region_name.as_str())?;
-                item.visit("ItemData", &mut region)?;
+                item.visit(&make_name(index), &mut region)?;
             }
         }
 
diff --git a/fyrox-core/src/visitor/mod.rs b/fyrox-core/src/visitor/mod.rs
index 0bc968d29..78858dc01 100644
--- a/fyrox-core/src/visitor/mod.rs
+++ b/fyrox-core/src/visitor/mod.rs
@@ -464,14 +464,6 @@ impl Visitor {
         self.nodes.borrow_mut(self.current_node)
     }
 
-    fn current_node_ref(&self) -> &VisitorNode {
-        self.nodes.borrow(self.current_node)
-    }
-
-    fn node_ref(&self, handle: Handle<VisitorNode>) -> &VisitorNode {
-        &self.nodes[handle]
-    }
-
     /// If [Visitor::is_reading], find a node with the given name that is a child of the current
     /// node, and return a Visitor for the found node. Return an error if no node with that name exists.
     ///