Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

move ship_manifest to common assets until its properly included in servers ECS and pushed to clients

Browse Source
This commit is contained in:
Marcel Märtens 2021-11-15 09:00:12 +01:00
parent dd52695917
commit d24b904563
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
assets/server/manifests/ship_manifest.ron → assets/common/tmp_manifests/ship_manifest.ron
View File

4
common/src/comp/body/ship.rs
View File

@ -202,7 +202,7 @@ pub mod figuredata {
_: &str, _: &str,
) -> Result<Self, assets::Error> { ) -> Result<Self, assets::Error> {
let manifest: AssetHandle<Ron<ShipCentralSpec>> = let manifest: AssetHandle<Ron<ShipCentralSpec>> =
AssetExt::load("server.manifests.ship_manifest")?; AssetExt::load("common.tmp_manifests.ship_manifest")?;
let mut colliders = HashMap::new(); let mut colliders = HashMap::new();
for (_, spec) in (manifest.read().0).0.iter() { for (_, spec) in (manifest.read().0).0.iter() {
for bone in [&spec.bone0, &spec.bone1, &spec.bone2].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 // 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 // (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) // like a hard problem if they're not the same manifest)
pub static ref VOXEL_COLLIDER_MANIFEST: AssetHandle<ShipSpec> = AssetExt::load_expect("server.manifests.ship_manifest"); pub static ref VOXEL_COLLIDER_MANIFEST: AssetHandle<ShipSpec> = AssetExt::load_expect("common.tmp_manifests.ship_manifest");
} }
#[test] #[test]