From 02d65e6b7ce7a0e6bae054bd321c68dda1cb0de3 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 7 Jan 2025 22:56:34 +0100
Subject: static typing for resources

---
 shared/src/tree.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'shared/src/tree.rs')

diff --git a/shared/src/tree.rs b/shared/src/tree.rs
index e2c8250..9337cfb 100644
--- a/shared/src/tree.rs
+++ b/shared/src/tree.rs
@@ -14,7 +14,10 @@
     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::{Object, Packet, Resource};
+use crate::{
+    packets::{Object, Packet, Resource},
+    resources::Prefab,
+};
 use glam::Vec3A;
 use std::collections::HashMap;
 
@@ -26,7 +29,7 @@ pub struct ObjectData {
     pub rot: Vec3A,
     pub parent: Object,
     pub pose: Vec<f32>,
-    pub res: Resource,
+    pub res: Resource<Prefab>,
 }
 impl Default for SceneTree {
     fn default() -> Self {
@@ -44,7 +47,7 @@ impl SceneTree {
                     pos: Vec3A::ZERO,
                     rot: Vec3A::ZERO,
                     pose: Vec::new(),
-                    res: *res,
+                    res: res.clone(),
                 });
             }
             Packet::Remove(object) => {
@@ -75,7 +78,7 @@ impl SceneTree {
             .iter()
             .map(|(object, data)| {
                 [
-                    Packet::Add(*object, data.res),
+                    Packet::Add(*object, data.res.clone()),
                     Packet::Parent(*object, data.parent),
                     Packet::Position(*object, data.pos, data.rot),
                     Packet::Pose(*object, data.pose.clone()),
-- 
cgit v1.2.3-70-g09d2