From d24b90456359394aea879e48465d9c3c793b77d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Mon, 15 Nov 2021 09:00:12 +0100 Subject: [PATCH 1/2] move ship_manifest to common assets until its properly included in servers ECS and pushed to clients --- .../manifests => common/tmp_manifests}/ship_manifest.ron | 0 common/src/comp/body/ship.rs | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename assets/{server/manifests => common/tmp_manifests}/ship_manifest.ron (100%) diff --git a/assets/server/manifests/ship_manifest.ron b/assets/common/tmp_manifests/ship_manifest.ron similarity index 100% rename from assets/server/manifests/ship_manifest.ron rename to assets/common/tmp_manifests/ship_manifest.ron diff --git a/common/src/comp/body/ship.rs b/common/src/comp/body/ship.rs index ca94fb2c89..d8c3512adb 100644 --- a/common/src/comp/body/ship.rs +++ b/common/src/comp/body/ship.rs @@ -202,7 +202,7 @@ pub mod figuredata { _: &str, ) -> Result { let manifest: AssetHandle> = - AssetExt::load("server.manifests.ship_manifest")?; + AssetExt::load("common.tmp_manifests.ship_manifest")?; let mut colliders = HashMap::new(); for (_, spec) in (manifest.read().0).0.iter() { for bone in [&spec.bone0, &spec.bone1, &spec.bone2].iter() { @@ -238,7 +238,7 @@ pub mod figuredata { // TODO: Load this from the ECS as a resource, and maybe make it more general than ships // (although figuring out how to keep the figure bones in sync with the terrain offsets seems // like a hard problem if they're not the same manifest) - pub static ref VOXEL_COLLIDER_MANIFEST: AssetHandle = AssetExt::load_expect("server.manifests.ship_manifest"); + pub static ref VOXEL_COLLIDER_MANIFEST: AssetHandle = AssetExt::load_expect("common.tmp_manifests.ship_manifest"); } #[test] From cd516d09125725e8bde99b95800005b2b92eb85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Mon, 15 Nov 2021 09:47:38 +0100 Subject: [PATCH 2/2] name it just manifests rather then tmp_manifests --- assets/common/{tmp_manifests => manifests}/ship_manifest.ron | 0 common/src/comp/body/ship.rs | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename assets/common/{tmp_manifests => manifests}/ship_manifest.ron (100%) diff --git a/assets/common/tmp_manifests/ship_manifest.ron b/assets/common/manifests/ship_manifest.ron similarity index 100% rename from assets/common/tmp_manifests/ship_manifest.ron rename to assets/common/manifests/ship_manifest.ron diff --git a/common/src/comp/body/ship.rs b/common/src/comp/body/ship.rs index d8c3512adb..2d6f6d8fdd 100644 --- a/common/src/comp/body/ship.rs +++ b/common/src/comp/body/ship.rs @@ -202,7 +202,7 @@ pub mod figuredata { _: &str, ) -> Result { let manifest: AssetHandle> = - AssetExt::load("common.tmp_manifests.ship_manifest")?; + AssetExt::load("common.manifests.ship_manifest")?; let mut colliders = HashMap::new(); for (_, spec) in (manifest.read().0).0.iter() { for bone in [&spec.bone0, &spec.bone1, &spec.bone2].iter() { @@ -238,7 +238,7 @@ pub mod figuredata { // TODO: Load this from the ECS as a resource, and maybe make it more general than ships // (although figuring out how to keep the figure bones in sync with the terrain offsets seems // like a hard problem if they're not the same manifest) - pub static ref VOXEL_COLLIDER_MANIFEST: AssetHandle = AssetExt::load_expect("common.tmp_manifests.ship_manifest"); + pub static ref VOXEL_COLLIDER_MANIFEST: AssetHandle = AssetExt::load_expect("common.manifests.ship_manifest"); } #[test]