reparenting checks and conn owned objects

3 files changed, 82 insertions, 15 deletions

diff --git a/shared/src/helper.rs b/shared/src/helper.rs
index 14fb2bd..3ae7c37 100644
--- a/shared/src/helper.rs
+++ b/shared/src/helper.rs
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-use crate::packets::{Data, Object, Resource};
+use crate::packets::{Data, Message, Object, Resource};
 use anyhow::Result;
 use glam::{Affine3A, Vec2, Vec3, Vec3A};
 use std::{
@@ -304,6 +304,21 @@ impl ReadWrite for Data {
         Ok(Self(buf))
     }
 }
+impl ReadWrite for Message {
+    fn write(&self, w: &mut dyn Write) -> Result<()> {
+        w.write_all(&(self.0.len() as u32).to_be_bytes())?;
+        w.write_all(&self.0.as_bytes())?;
+        Ok(())
+    }
+    fn read(r: &mut dyn Read) -> Result<Self> {
+        let mut size = [0; { size_of::<u32>() }];
+        r.read_exact(&mut size)?;
+        let size = u32::from_be_bytes(size);
+        let mut buf = vec![0; size as usize];
+        r.read_exact(&mut buf)?;
+        Ok(Self(String::from_utf8_lossy_owned(buf)))
+    }
+}
 impl<T> ReadWrite for Resource<T> {
     fn write(&self, w: &mut dyn Write) -> Result<()> {
         w.write_all(&self.0)?;
diff --git a/shared/src/lib.rs b/shared/src/lib.rs
index 2c26486..e5cf666 100644
--- a/shared/src/lib.rs
+++ b/shared/src/lib.rs
@@ -14,7 +14,12 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#![feature(iter_array_chunks, array_try_map, debug_closure_helpers)]
+#![feature(
+    iter_array_chunks,
+    array_try_map,
+    debug_closure_helpers,
+    string_from_utf8_lossy_owned
+)]
 
 pub mod helper;
 pub mod packets;
diff --git a/shared/src/tree.rs b/shared/src/tree.rs
index 2de02d0..a0bbf43 100644
--- a/shared/src/tree.rs
+++ b/shared/src/tree.rs
@@ -19,6 +19,7 @@ use crate::{
     resources::Prefab,
 };
 use glam::Vec3A;
+use log::warn;
 use std::collections::{BTreeSet, HashMap};
 
 pub struct SceneTree {
@@ -43,21 +44,10 @@ impl SceneTree {
     pub fn packet(&mut self, p: &Packet) {
         match p {
             Packet::Add(object, res) => {
-                self.objects.insert(*object, ObjectData {
-                    parent: Object(0),
-                    pos: Vec3A::ZERO,
-                    rot: Vec3A::ZERO,
-                    pose: Vec::new(),
-                    res: res.clone(),
-                    children: BTreeSet::new(),
-                });
+                self.add(*object, res.to_owned());
             }
             Packet::Remove(object) => {
-                if let Some(o) = self.objects.remove(&object) {
-                    for c in o.children {
-                        self.reparent(o.parent, c);
-                    }
-                }
+                self.remove_reparent(*object, &mut ());
             }
             Packet::Position(object, pos, rot) => {
                 if let Some(o) = self.objects.get_mut(&object) {
@@ -77,8 +67,36 @@ impl SceneTree {
         }
     }
 
+    pub fn add(&mut self, object: Object, res: Resource<Prefab>) {
+        self.objects.insert(object, ObjectData {
+            parent: Object(0),
+            pos: Vec3A::ZERO,
+            rot: Vec3A::ZERO,
+            pose: Vec::new(),
+            res: res.clone(),
+            children: BTreeSet::new(),
+        });
+    }
+
     pub fn reparent(&mut self, parent: Object, child: Object) {
+        fn check_parent_loop(tree: &SceneTree, o: Object, test: Object) -> bool {
+            if o == test {
+                true
+            } else {
+                let parent = tree.objects[&o].parent;
+                if parent == o {
+                    false
+                } else {
+                    check_parent_loop(tree, parent, test)
+                }
+            }
+        }
         if !self.objects.contains_key(&parent) || !self.objects.contains_key(&child) {
+            warn!("reparent of missing objects");
+            return;
+        }
+        if check_parent_loop(&self, parent, child) {
+            warn!("cyclic parenting prevented");
             return;
         }
         if let Some(co) = self.objects.get(&child) {
@@ -94,6 +112,23 @@ impl SceneTree {
             co.parent = parent;
         }
     }
+    pub fn remove_reparent(&mut self, object: Object, ps: &mut dyn PacketSink) {
+        if let Some(o) = self.objects.remove(&object) {
+            for c in o.children {
+                self.reparent(o.parent, c);
+                ps.push(Packet::Parent(o.parent, c));
+            }
+            ps.push(Packet::Remove(object));
+        }
+    }
+    pub fn remove_recursive(&mut self, object: Object, ps: &mut dyn PacketSink) {
+        if let Some(o) = self.objects.remove(&object) {
+            for c in o.children {
+                self.remove_recursive(c, ps);
+            }
+            ps.push(Packet::Remove(object));
+        }
+    }
 
     pub fn prime_client(&self) -> impl Iterator<Item = Packet> {
         self.objects
@@ -114,3 +149,15 @@ impl SceneTree {
             .flatten()
     }
 }
+
+pub trait PacketSink {
+    fn push(&mut self, p: Packet);
+}
+impl PacketSink for Vec<Packet> {
+    fn push(&mut self, p: Packet) {
+        Vec::push(self, p);
+    }
+}
+impl PacketSink for () {
+    fn push(&mut self, _: Packet) {}
+}