From e5e255cbd3a07ee526e31ae211a9b0d6b4dbe061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Tue, 1 Dec 2020 13:58:58 +0100 Subject: [PATCH] move anim code from voxygen/src/anim to voxygen/anim --- Cargo.toml | 2 +- voxygen/Cargo.toml | 2 +- voxygen/{src => }/anim/Cargo.toml | 2 +- voxygen/{src => }/anim/src/biped_large/alpha.rs | 0 voxygen/{src => }/anim/src/biped_large/beam.rs | 0 voxygen/{src => }/anim/src/biped_large/beta.rs | 0 voxygen/{src => }/anim/src/biped_large/charge.rs | 0 voxygen/{src => }/anim/src/biped_large/dash.rs | 0 voxygen/{src => }/anim/src/biped_large/equip.rs | 0 voxygen/{src => }/anim/src/biped_large/idle.rs | 0 voxygen/{src => }/anim/src/biped_large/jump.rs | 0 voxygen/{src => }/anim/src/biped_large/leapmelee.rs | 0 voxygen/{src => }/anim/src/biped_large/mod.rs | 0 voxygen/{src => }/anim/src/biped_large/run.rs | 0 voxygen/{src => }/anim/src/biped_large/shockwave.rs | 0 voxygen/{src => }/anim/src/biped_large/shoot.rs | 0 voxygen/{src => }/anim/src/biped_large/spin.rs | 0 voxygen/{src => }/anim/src/biped_large/spinmelee.rs | 0 voxygen/{src => }/anim/src/biped_large/wield.rs | 0 voxygen/{src => }/anim/src/bird_medium/feed.rs | 0 voxygen/{src => }/anim/src/bird_medium/fly.rs | 0 voxygen/{src => }/anim/src/bird_medium/idle.rs | 0 voxygen/{src => }/anim/src/bird_medium/mod.rs | 0 voxygen/{src => }/anim/src/bird_medium/run.rs | 0 voxygen/{src => }/anim/src/bird_small/idle.rs | 0 voxygen/{src => }/anim/src/bird_small/jump.rs | 0 voxygen/{src => }/anim/src/bird_small/mod.rs | 0 voxygen/{src => }/anim/src/bird_small/run.rs | 0 voxygen/{src => }/anim/src/character/alpha.rs | 0 voxygen/{src => }/anim/src/character/beam.rs | 0 voxygen/{src => }/anim/src/character/beta.rs | 0 voxygen/{src => }/anim/src/character/block.rs | 0 voxygen/{src => }/anim/src/character/charge.rs | 0 voxygen/{src => }/anim/src/character/chargeswing.rs | 0 voxygen/{src => }/anim/src/character/climb.rs | 0 voxygen/{src => }/anim/src/character/dance.rs | 0 voxygen/{src => }/anim/src/character/dash.rs | 0 voxygen/{src => }/anim/src/character/equip.rs | 0 voxygen/{src => }/anim/src/character/glidewield.rs | 0 voxygen/{src => }/anim/src/character/gliding.rs | 0 voxygen/{src => }/anim/src/character/idle.rs | 0 voxygen/{src => }/anim/src/character/jump.rs | 0 voxygen/{src => }/anim/src/character/leapmelee.rs | 0 voxygen/{src => }/anim/src/character/mod.rs | 0 voxygen/{src => }/anim/src/character/repeater.rs | 0 voxygen/{src => }/anim/src/character/roll.rs | 0 voxygen/{src => }/anim/src/character/run.rs | 0 voxygen/{src => }/anim/src/character/shockwave.rs | 0 voxygen/{src => }/anim/src/character/shoot.rs | 0 voxygen/{src => }/anim/src/character/sit.rs | 0 voxygen/{src => }/anim/src/character/sneak.rs | 0 voxygen/{src => }/anim/src/character/spin.rs | 0 voxygen/{src => }/anim/src/character/spinmelee.rs | 0 voxygen/{src => }/anim/src/character/stand.rs | 0 voxygen/{src => }/anim/src/character/swim.rs | 0 voxygen/{src => }/anim/src/character/swimwield.rs | 0 voxygen/{src => }/anim/src/character/wield.rs | 0 voxygen/{src => }/anim/src/dragon/fly.rs | 0 voxygen/{src => }/anim/src/dragon/idle.rs | 0 voxygen/{src => }/anim/src/dragon/mod.rs | 0 voxygen/{src => }/anim/src/dragon/run.rs | 0 voxygen/{src => }/anim/src/dyn_lib.rs | 12 ++++++------ voxygen/{src => }/anim/src/fish_medium/idle.rs | 0 voxygen/{src => }/anim/src/fish_medium/jump.rs | 0 voxygen/{src => }/anim/src/fish_medium/mod.rs | 0 voxygen/{src => }/anim/src/fish_medium/run.rs | 0 voxygen/{src => }/anim/src/fish_small/idle.rs | 0 voxygen/{src => }/anim/src/fish_small/jump.rs | 0 voxygen/{src => }/anim/src/fish_small/mod.rs | 0 voxygen/{src => }/anim/src/fish_small/run.rs | 0 voxygen/{src => }/anim/src/fixture/mod.rs | 0 voxygen/{src => }/anim/src/golem/alpha.rs | 0 voxygen/{src => }/anim/src/golem/idle.rs | 0 voxygen/{src => }/anim/src/golem/jump.rs | 0 voxygen/{src => }/anim/src/golem/mod.rs | 0 voxygen/{src => }/anim/src/golem/run.rs | 0 voxygen/{src => }/anim/src/golem/shockwave.rs | 0 voxygen/{src => }/anim/src/lib.rs | 0 voxygen/{src => }/anim/src/object/mod.rs | 0 voxygen/{src => }/anim/src/quadruped_low/alpha.rs | 0 voxygen/{src => }/anim/src/quadruped_low/beta.rs | 0 voxygen/{src => }/anim/src/quadruped_low/breathe.rs | 0 voxygen/{src => }/anim/src/quadruped_low/dash.rs | 0 voxygen/{src => }/anim/src/quadruped_low/idle.rs | 0 voxygen/{src => }/anim/src/quadruped_low/jump.rs | 0 voxygen/{src => }/anim/src/quadruped_low/mod.rs | 0 voxygen/{src => }/anim/src/quadruped_low/run.rs | 0 voxygen/{src => }/anim/src/quadruped_low/shoot.rs | 0 voxygen/{src => }/anim/src/quadruped_low/tailwhip.rs | 0 voxygen/{src => }/anim/src/quadruped_medium/alpha.rs | 0 voxygen/{src => }/anim/src/quadruped_medium/beta.rs | 0 voxygen/{src => }/anim/src/quadruped_medium/dash.rs | 0 voxygen/{src => }/anim/src/quadruped_medium/feed.rs | 0 voxygen/{src => }/anim/src/quadruped_medium/hoof.rs | 0 voxygen/{src => }/anim/src/quadruped_medium/idle.rs | 0 voxygen/{src => }/anim/src/quadruped_medium/jump.rs | 0 .../{src => }/anim/src/quadruped_medium/leapmelee.rs | 0 voxygen/{src => }/anim/src/quadruped_medium/mod.rs | 0 voxygen/{src => }/anim/src/quadruped_medium/run.rs | 0 voxygen/{src => }/anim/src/quadruped_small/alpha.rs | 0 voxygen/{src => }/anim/src/quadruped_small/feed.rs | 0 voxygen/{src => }/anim/src/quadruped_small/idle.rs | 0 voxygen/{src => }/anim/src/quadruped_small/jump.rs | 0 voxygen/{src => }/anim/src/quadruped_small/mod.rs | 0 voxygen/{src => }/anim/src/quadruped_small/run.rs | 0 voxygen/{src => }/anim/src/theropod/alpha.rs | 0 voxygen/{src => }/anim/src/theropod/beta.rs | 0 voxygen/{src => }/anim/src/theropod/idle.rs | 0 voxygen/{src => }/anim/src/theropod/jump.rs | 0 voxygen/{src => }/anim/src/theropod/mod.rs | 0 voxygen/{src => }/anim/src/theropod/run.rs | 0 voxygen/{src => }/anim/src/vek.rs | 0 112 files changed, 9 insertions(+), 9 deletions(-) rename voxygen/{src => }/anim/Cargo.toml (92%) rename voxygen/{src => }/anim/src/biped_large/alpha.rs (100%) rename voxygen/{src => }/anim/src/biped_large/beam.rs (100%) rename voxygen/{src => }/anim/src/biped_large/beta.rs (100%) rename voxygen/{src => }/anim/src/biped_large/charge.rs (100%) rename voxygen/{src => }/anim/src/biped_large/dash.rs (100%) rename voxygen/{src => }/anim/src/biped_large/equip.rs (100%) rename voxygen/{src => }/anim/src/biped_large/idle.rs (100%) rename voxygen/{src => }/anim/src/biped_large/jump.rs (100%) rename voxygen/{src => }/anim/src/biped_large/leapmelee.rs (100%) rename voxygen/{src => }/anim/src/biped_large/mod.rs (100%) rename voxygen/{src => }/anim/src/biped_large/run.rs (100%) rename voxygen/{src => }/anim/src/biped_large/shockwave.rs (100%) rename voxygen/{src => }/anim/src/biped_large/shoot.rs (100%) rename voxygen/{src => }/anim/src/biped_large/spin.rs (100%) rename voxygen/{src => }/anim/src/biped_large/spinmelee.rs (100%) rename voxygen/{src => }/anim/src/biped_large/wield.rs (100%) rename voxygen/{src => }/anim/src/bird_medium/feed.rs (100%) rename voxygen/{src => }/anim/src/bird_medium/fly.rs (100%) rename voxygen/{src => }/anim/src/bird_medium/idle.rs (100%) rename voxygen/{src => }/anim/src/bird_medium/mod.rs (100%) rename voxygen/{src => }/anim/src/bird_medium/run.rs (100%) rename voxygen/{src => }/anim/src/bird_small/idle.rs (100%) rename voxygen/{src => }/anim/src/bird_small/jump.rs (100%) rename voxygen/{src => }/anim/src/bird_small/mod.rs (100%) rename voxygen/{src => }/anim/src/bird_small/run.rs (100%) rename voxygen/{src => }/anim/src/character/alpha.rs (100%) rename voxygen/{src => }/anim/src/character/beam.rs (100%) rename voxygen/{src => }/anim/src/character/beta.rs (100%) rename voxygen/{src => }/anim/src/character/block.rs (100%) rename voxygen/{src => }/anim/src/character/charge.rs (100%) rename voxygen/{src => }/anim/src/character/chargeswing.rs (100%) rename voxygen/{src => }/anim/src/character/climb.rs (100%) rename voxygen/{src => }/anim/src/character/dance.rs (100%) rename voxygen/{src => }/anim/src/character/dash.rs (100%) rename voxygen/{src => }/anim/src/character/equip.rs (100%) rename voxygen/{src => }/anim/src/character/glidewield.rs (100%) rename voxygen/{src => }/anim/src/character/gliding.rs (100%) rename voxygen/{src => }/anim/src/character/idle.rs (100%) rename voxygen/{src => }/anim/src/character/jump.rs (100%) rename voxygen/{src => }/anim/src/character/leapmelee.rs (100%) rename voxygen/{src => }/anim/src/character/mod.rs (100%) rename voxygen/{src => }/anim/src/character/repeater.rs (100%) rename voxygen/{src => }/anim/src/character/roll.rs (100%) rename voxygen/{src => }/anim/src/character/run.rs (100%) rename voxygen/{src => }/anim/src/character/shockwave.rs (100%) rename voxygen/{src => }/anim/src/character/shoot.rs (100%) rename voxygen/{src => }/anim/src/character/sit.rs (100%) rename voxygen/{src => }/anim/src/character/sneak.rs (100%) rename voxygen/{src => }/anim/src/character/spin.rs (100%) rename voxygen/{src => }/anim/src/character/spinmelee.rs (100%) rename voxygen/{src => }/anim/src/character/stand.rs (100%) rename voxygen/{src => }/anim/src/character/swim.rs (100%) rename voxygen/{src => }/anim/src/character/swimwield.rs (100%) rename voxygen/{src => }/anim/src/character/wield.rs (100%) rename voxygen/{src => }/anim/src/dragon/fly.rs (100%) rename voxygen/{src => }/anim/src/dragon/idle.rs (100%) rename voxygen/{src => }/anim/src/dragon/mod.rs (100%) rename voxygen/{src => }/anim/src/dragon/run.rs (100%) rename voxygen/{src => }/anim/src/dyn_lib.rs (94%) rename voxygen/{src => }/anim/src/fish_medium/idle.rs (100%) rename voxygen/{src => }/anim/src/fish_medium/jump.rs (100%) rename voxygen/{src => }/anim/src/fish_medium/mod.rs (100%) rename voxygen/{src => }/anim/src/fish_medium/run.rs (100%) rename voxygen/{src => }/anim/src/fish_small/idle.rs (100%) rename voxygen/{src => }/anim/src/fish_small/jump.rs (100%) rename voxygen/{src => }/anim/src/fish_small/mod.rs (100%) rename voxygen/{src => }/anim/src/fish_small/run.rs (100%) rename voxygen/{src => }/anim/src/fixture/mod.rs (100%) rename voxygen/{src => }/anim/src/golem/alpha.rs (100%) rename voxygen/{src => }/anim/src/golem/idle.rs (100%) rename voxygen/{src => }/anim/src/golem/jump.rs (100%) rename voxygen/{src => }/anim/src/golem/mod.rs (100%) rename voxygen/{src => }/anim/src/golem/run.rs (100%) rename voxygen/{src => }/anim/src/golem/shockwave.rs (100%) rename voxygen/{src => }/anim/src/lib.rs (100%) rename voxygen/{src => }/anim/src/object/mod.rs (100%) rename voxygen/{src => }/anim/src/quadruped_low/alpha.rs (100%) rename voxygen/{src => }/anim/src/quadruped_low/beta.rs (100%) rename voxygen/{src => }/anim/src/quadruped_low/breathe.rs (100%) rename voxygen/{src => }/anim/src/quadruped_low/dash.rs (100%) rename voxygen/{src => }/anim/src/quadruped_low/idle.rs (100%) rename voxygen/{src => }/anim/src/quadruped_low/jump.rs (100%) rename voxygen/{src => }/anim/src/quadruped_low/mod.rs (100%) rename voxygen/{src => }/anim/src/quadruped_low/run.rs (100%) rename voxygen/{src => }/anim/src/quadruped_low/shoot.rs (100%) rename voxygen/{src => }/anim/src/quadruped_low/tailwhip.rs (100%) rename voxygen/{src => }/anim/src/quadruped_medium/alpha.rs (100%) rename voxygen/{src => }/anim/src/quadruped_medium/beta.rs (100%) rename voxygen/{src => }/anim/src/quadruped_medium/dash.rs (100%) rename voxygen/{src => }/anim/src/quadruped_medium/feed.rs (100%) rename voxygen/{src => }/anim/src/quadruped_medium/hoof.rs (100%) rename voxygen/{src => }/anim/src/quadruped_medium/idle.rs (100%) rename voxygen/{src => }/anim/src/quadruped_medium/jump.rs (100%) rename voxygen/{src => }/anim/src/quadruped_medium/leapmelee.rs (100%) rename voxygen/{src => }/anim/src/quadruped_medium/mod.rs (100%) rename voxygen/{src => }/anim/src/quadruped_medium/run.rs (100%) rename voxygen/{src => }/anim/src/quadruped_small/alpha.rs (100%) rename voxygen/{src => }/anim/src/quadruped_small/feed.rs (100%) rename voxygen/{src => }/anim/src/quadruped_small/idle.rs (100%) rename voxygen/{src => }/anim/src/quadruped_small/jump.rs (100%) rename voxygen/{src => }/anim/src/quadruped_small/mod.rs (100%) rename voxygen/{src => }/anim/src/quadruped_small/run.rs (100%) rename voxygen/{src => }/anim/src/theropod/alpha.rs (100%) rename voxygen/{src => }/anim/src/theropod/beta.rs (100%) rename voxygen/{src => }/anim/src/theropod/idle.rs (100%) rename voxygen/{src => }/anim/src/theropod/jump.rs (100%) rename voxygen/{src => }/anim/src/theropod/mod.rs (100%) rename voxygen/{src => }/anim/src/theropod/run.rs (100%) rename voxygen/{src => }/anim/src/vek.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 2c2721a2f2..ffc7fd45a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,9 +8,9 @@ members = [ "server", "server-cli", "voxygen", + "voxygen/anim", "world", "network", - "voxygen/src/anim", "tools" ] diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index 2c7683a4e0..61bfd0ad0f 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -22,7 +22,7 @@ default = ["gl", "singleplayer", "native-dialog", "simd"] client = {package = "veloren-client", path = "../client"} common = {package = "veloren-common", path = "../common"} -anim = {package = "veloren-voxygen-anim", path = "src/anim", default-features = false} +anim = {package = "veloren-voxygen-anim", path = "anim", default-features = false} # Graphics gfx = "0.18.2" diff --git a/voxygen/src/anim/Cargo.toml b/voxygen/anim/Cargo.toml similarity index 92% rename from voxygen/src/anim/Cargo.toml rename to voxygen/anim/Cargo.toml index ffe8612887..f9b6a2f829 100644 --- a/voxygen/src/anim/Cargo.toml +++ b/voxygen/anim/Cargo.toml @@ -18,7 +18,7 @@ simd = ["vek/platform_intrinsics"] default = ["be-dyn-lib", "simd"] [dependencies] -common = {package = "veloren-common", path = "../../../common"} +common = {package = "veloren-common", path = "../../common"} find_folder = {version = "0.3.0", optional = true} inline_tweak = "1.0.2" lazy_static = {version = "1.4.0", optional = true} diff --git a/voxygen/src/anim/src/biped_large/alpha.rs b/voxygen/anim/src/biped_large/alpha.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/alpha.rs rename to voxygen/anim/src/biped_large/alpha.rs diff --git a/voxygen/src/anim/src/biped_large/beam.rs b/voxygen/anim/src/biped_large/beam.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/beam.rs rename to voxygen/anim/src/biped_large/beam.rs diff --git a/voxygen/src/anim/src/biped_large/beta.rs b/voxygen/anim/src/biped_large/beta.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/beta.rs rename to voxygen/anim/src/biped_large/beta.rs diff --git a/voxygen/src/anim/src/biped_large/charge.rs b/voxygen/anim/src/biped_large/charge.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/charge.rs rename to voxygen/anim/src/biped_large/charge.rs diff --git a/voxygen/src/anim/src/biped_large/dash.rs b/voxygen/anim/src/biped_large/dash.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/dash.rs rename to voxygen/anim/src/biped_large/dash.rs diff --git a/voxygen/src/anim/src/biped_large/equip.rs b/voxygen/anim/src/biped_large/equip.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/equip.rs rename to voxygen/anim/src/biped_large/equip.rs diff --git a/voxygen/src/anim/src/biped_large/idle.rs b/voxygen/anim/src/biped_large/idle.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/idle.rs rename to voxygen/anim/src/biped_large/idle.rs diff --git a/voxygen/src/anim/src/biped_large/jump.rs b/voxygen/anim/src/biped_large/jump.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/jump.rs rename to voxygen/anim/src/biped_large/jump.rs diff --git a/voxygen/src/anim/src/biped_large/leapmelee.rs b/voxygen/anim/src/biped_large/leapmelee.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/leapmelee.rs rename to voxygen/anim/src/biped_large/leapmelee.rs diff --git a/voxygen/src/anim/src/biped_large/mod.rs b/voxygen/anim/src/biped_large/mod.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/mod.rs rename to voxygen/anim/src/biped_large/mod.rs diff --git a/voxygen/src/anim/src/biped_large/run.rs b/voxygen/anim/src/biped_large/run.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/run.rs rename to voxygen/anim/src/biped_large/run.rs diff --git a/voxygen/src/anim/src/biped_large/shockwave.rs b/voxygen/anim/src/biped_large/shockwave.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/shockwave.rs rename to voxygen/anim/src/biped_large/shockwave.rs diff --git a/voxygen/src/anim/src/biped_large/shoot.rs b/voxygen/anim/src/biped_large/shoot.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/shoot.rs rename to voxygen/anim/src/biped_large/shoot.rs diff --git a/voxygen/src/anim/src/biped_large/spin.rs b/voxygen/anim/src/biped_large/spin.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/spin.rs rename to voxygen/anim/src/biped_large/spin.rs diff --git a/voxygen/src/anim/src/biped_large/spinmelee.rs b/voxygen/anim/src/biped_large/spinmelee.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/spinmelee.rs rename to voxygen/anim/src/biped_large/spinmelee.rs diff --git a/voxygen/src/anim/src/biped_large/wield.rs b/voxygen/anim/src/biped_large/wield.rs similarity index 100% rename from voxygen/src/anim/src/biped_large/wield.rs rename to voxygen/anim/src/biped_large/wield.rs diff --git a/voxygen/src/anim/src/bird_medium/feed.rs b/voxygen/anim/src/bird_medium/feed.rs similarity index 100% rename from voxygen/src/anim/src/bird_medium/feed.rs rename to voxygen/anim/src/bird_medium/feed.rs diff --git a/voxygen/src/anim/src/bird_medium/fly.rs b/voxygen/anim/src/bird_medium/fly.rs similarity index 100% rename from voxygen/src/anim/src/bird_medium/fly.rs rename to voxygen/anim/src/bird_medium/fly.rs diff --git a/voxygen/src/anim/src/bird_medium/idle.rs b/voxygen/anim/src/bird_medium/idle.rs similarity index 100% rename from voxygen/src/anim/src/bird_medium/idle.rs rename to voxygen/anim/src/bird_medium/idle.rs diff --git a/voxygen/src/anim/src/bird_medium/mod.rs b/voxygen/anim/src/bird_medium/mod.rs similarity index 100% rename from voxygen/src/anim/src/bird_medium/mod.rs rename to voxygen/anim/src/bird_medium/mod.rs diff --git a/voxygen/src/anim/src/bird_medium/run.rs b/voxygen/anim/src/bird_medium/run.rs similarity index 100% rename from voxygen/src/anim/src/bird_medium/run.rs rename to voxygen/anim/src/bird_medium/run.rs diff --git a/voxygen/src/anim/src/bird_small/idle.rs b/voxygen/anim/src/bird_small/idle.rs similarity index 100% rename from voxygen/src/anim/src/bird_small/idle.rs rename to voxygen/anim/src/bird_small/idle.rs diff --git a/voxygen/src/anim/src/bird_small/jump.rs b/voxygen/anim/src/bird_small/jump.rs similarity index 100% rename from voxygen/src/anim/src/bird_small/jump.rs rename to voxygen/anim/src/bird_small/jump.rs diff --git a/voxygen/src/anim/src/bird_small/mod.rs b/voxygen/anim/src/bird_small/mod.rs similarity index 100% rename from voxygen/src/anim/src/bird_small/mod.rs rename to voxygen/anim/src/bird_small/mod.rs diff --git a/voxygen/src/anim/src/bird_small/run.rs b/voxygen/anim/src/bird_small/run.rs similarity index 100% rename from voxygen/src/anim/src/bird_small/run.rs rename to voxygen/anim/src/bird_small/run.rs diff --git a/voxygen/src/anim/src/character/alpha.rs b/voxygen/anim/src/character/alpha.rs similarity index 100% rename from voxygen/src/anim/src/character/alpha.rs rename to voxygen/anim/src/character/alpha.rs diff --git a/voxygen/src/anim/src/character/beam.rs b/voxygen/anim/src/character/beam.rs similarity index 100% rename from voxygen/src/anim/src/character/beam.rs rename to voxygen/anim/src/character/beam.rs diff --git a/voxygen/src/anim/src/character/beta.rs b/voxygen/anim/src/character/beta.rs similarity index 100% rename from voxygen/src/anim/src/character/beta.rs rename to voxygen/anim/src/character/beta.rs diff --git a/voxygen/src/anim/src/character/block.rs b/voxygen/anim/src/character/block.rs similarity index 100% rename from voxygen/src/anim/src/character/block.rs rename to voxygen/anim/src/character/block.rs diff --git a/voxygen/src/anim/src/character/charge.rs b/voxygen/anim/src/character/charge.rs similarity index 100% rename from voxygen/src/anim/src/character/charge.rs rename to voxygen/anim/src/character/charge.rs diff --git a/voxygen/src/anim/src/character/chargeswing.rs b/voxygen/anim/src/character/chargeswing.rs similarity index 100% rename from voxygen/src/anim/src/character/chargeswing.rs rename to voxygen/anim/src/character/chargeswing.rs diff --git a/voxygen/src/anim/src/character/climb.rs b/voxygen/anim/src/character/climb.rs similarity index 100% rename from voxygen/src/anim/src/character/climb.rs rename to voxygen/anim/src/character/climb.rs diff --git a/voxygen/src/anim/src/character/dance.rs b/voxygen/anim/src/character/dance.rs similarity index 100% rename from voxygen/src/anim/src/character/dance.rs rename to voxygen/anim/src/character/dance.rs diff --git a/voxygen/src/anim/src/character/dash.rs b/voxygen/anim/src/character/dash.rs similarity index 100% rename from voxygen/src/anim/src/character/dash.rs rename to voxygen/anim/src/character/dash.rs diff --git a/voxygen/src/anim/src/character/equip.rs b/voxygen/anim/src/character/equip.rs similarity index 100% rename from voxygen/src/anim/src/character/equip.rs rename to voxygen/anim/src/character/equip.rs diff --git a/voxygen/src/anim/src/character/glidewield.rs b/voxygen/anim/src/character/glidewield.rs similarity index 100% rename from voxygen/src/anim/src/character/glidewield.rs rename to voxygen/anim/src/character/glidewield.rs diff --git a/voxygen/src/anim/src/character/gliding.rs b/voxygen/anim/src/character/gliding.rs similarity index 100% rename from voxygen/src/anim/src/character/gliding.rs rename to voxygen/anim/src/character/gliding.rs diff --git a/voxygen/src/anim/src/character/idle.rs b/voxygen/anim/src/character/idle.rs similarity index 100% rename from voxygen/src/anim/src/character/idle.rs rename to voxygen/anim/src/character/idle.rs diff --git a/voxygen/src/anim/src/character/jump.rs b/voxygen/anim/src/character/jump.rs similarity index 100% rename from voxygen/src/anim/src/character/jump.rs rename to voxygen/anim/src/character/jump.rs diff --git a/voxygen/src/anim/src/character/leapmelee.rs b/voxygen/anim/src/character/leapmelee.rs similarity index 100% rename from voxygen/src/anim/src/character/leapmelee.rs rename to voxygen/anim/src/character/leapmelee.rs diff --git a/voxygen/src/anim/src/character/mod.rs b/voxygen/anim/src/character/mod.rs similarity index 100% rename from voxygen/src/anim/src/character/mod.rs rename to voxygen/anim/src/character/mod.rs diff --git a/voxygen/src/anim/src/character/repeater.rs b/voxygen/anim/src/character/repeater.rs similarity index 100% rename from voxygen/src/anim/src/character/repeater.rs rename to voxygen/anim/src/character/repeater.rs diff --git a/voxygen/src/anim/src/character/roll.rs b/voxygen/anim/src/character/roll.rs similarity index 100% rename from voxygen/src/anim/src/character/roll.rs rename to voxygen/anim/src/character/roll.rs diff --git a/voxygen/src/anim/src/character/run.rs b/voxygen/anim/src/character/run.rs similarity index 100% rename from voxygen/src/anim/src/character/run.rs rename to voxygen/anim/src/character/run.rs diff --git a/voxygen/src/anim/src/character/shockwave.rs b/voxygen/anim/src/character/shockwave.rs similarity index 100% rename from voxygen/src/anim/src/character/shockwave.rs rename to voxygen/anim/src/character/shockwave.rs diff --git a/voxygen/src/anim/src/character/shoot.rs b/voxygen/anim/src/character/shoot.rs similarity index 100% rename from voxygen/src/anim/src/character/shoot.rs rename to voxygen/anim/src/character/shoot.rs diff --git a/voxygen/src/anim/src/character/sit.rs b/voxygen/anim/src/character/sit.rs similarity index 100% rename from voxygen/src/anim/src/character/sit.rs rename to voxygen/anim/src/character/sit.rs diff --git a/voxygen/src/anim/src/character/sneak.rs b/voxygen/anim/src/character/sneak.rs similarity index 100% rename from voxygen/src/anim/src/character/sneak.rs rename to voxygen/anim/src/character/sneak.rs diff --git a/voxygen/src/anim/src/character/spin.rs b/voxygen/anim/src/character/spin.rs similarity index 100% rename from voxygen/src/anim/src/character/spin.rs rename to voxygen/anim/src/character/spin.rs diff --git a/voxygen/src/anim/src/character/spinmelee.rs b/voxygen/anim/src/character/spinmelee.rs similarity index 100% rename from voxygen/src/anim/src/character/spinmelee.rs rename to voxygen/anim/src/character/spinmelee.rs diff --git a/voxygen/src/anim/src/character/stand.rs b/voxygen/anim/src/character/stand.rs similarity index 100% rename from voxygen/src/anim/src/character/stand.rs rename to voxygen/anim/src/character/stand.rs diff --git a/voxygen/src/anim/src/character/swim.rs b/voxygen/anim/src/character/swim.rs similarity index 100% rename from voxygen/src/anim/src/character/swim.rs rename to voxygen/anim/src/character/swim.rs diff --git a/voxygen/src/anim/src/character/swimwield.rs b/voxygen/anim/src/character/swimwield.rs similarity index 100% rename from voxygen/src/anim/src/character/swimwield.rs rename to voxygen/anim/src/character/swimwield.rs diff --git a/voxygen/src/anim/src/character/wield.rs b/voxygen/anim/src/character/wield.rs similarity index 100% rename from voxygen/src/anim/src/character/wield.rs rename to voxygen/anim/src/character/wield.rs diff --git a/voxygen/src/anim/src/dragon/fly.rs b/voxygen/anim/src/dragon/fly.rs similarity index 100% rename from voxygen/src/anim/src/dragon/fly.rs rename to voxygen/anim/src/dragon/fly.rs diff --git a/voxygen/src/anim/src/dragon/idle.rs b/voxygen/anim/src/dragon/idle.rs similarity index 100% rename from voxygen/src/anim/src/dragon/idle.rs rename to voxygen/anim/src/dragon/idle.rs diff --git a/voxygen/src/anim/src/dragon/mod.rs b/voxygen/anim/src/dragon/mod.rs similarity index 100% rename from voxygen/src/anim/src/dragon/mod.rs rename to voxygen/anim/src/dragon/mod.rs diff --git a/voxygen/src/anim/src/dragon/run.rs b/voxygen/anim/src/dragon/run.rs similarity index 100% rename from voxygen/src/anim/src/dragon/run.rs rename to voxygen/anim/src/dragon/run.rs diff --git a/voxygen/src/anim/src/dyn_lib.rs b/voxygen/anim/src/dyn_lib.rs similarity index 94% rename from voxygen/src/anim/src/dyn_lib.rs rename to voxygen/anim/src/dyn_lib.rs index ecefbf358b..7f817f625f 100644 --- a/voxygen/src/anim/src/dyn_lib.rs +++ b/voxygen/anim/src/dyn_lib.rs @@ -75,9 +75,9 @@ impl LoadedLib { Ok(lib) => lib, Err(e) => panic!( "Tried to load dynamic library from {:?}, but it could not be found. The first \ - reason might be that you need to uncomment a line in \ - `voxygen/src/anim/Cargo.toml` to build the library required for hot reloading. \ - The second is we may require a special case for your OS so we can find it. {:?}", + reason might be that you need to uncomment a line in `voxygen/anim/Cargo.toml` \ + to build the library required for hot reloading. The second is we may require a \ + special case for your OS so we can find it. {:?}", lib_path, e ), }; @@ -129,7 +129,7 @@ impl LoadedLib { /// Initialise a watcher. /// /// The assumption is that this is run from the voxygen crate's root directory -/// as it will watch the relative path `src/anim` for any changes to `.rs` +/// as it will watch the relative path `anim` for any changes to `.rs` /// files. Upon noticing changes it will wait a moment and then recompile. pub fn init() { // Make sure first compile is done by accessing the lazy_static and then @@ -141,7 +141,7 @@ pub fn init() { // Start watcher let mut watcher = immediate_watcher(move |res| event_fn(res, &reload_send)).unwrap(); - watcher.watch("src/anim", RecursiveMode::Recursive).unwrap(); + watcher.watch("anim", RecursiveMode::Recursive).unwrap(); // Start reloader that watcher signals // "Debounces" events since I can't find the option to do this in the latest @@ -158,7 +158,7 @@ pub fn init() { info!( ?modified_paths, - "Hot reloading animations because files in `src/anim` modified." + "Hot reloading animations because files in `anim` modified." ); hotreload(); diff --git a/voxygen/src/anim/src/fish_medium/idle.rs b/voxygen/anim/src/fish_medium/idle.rs similarity index 100% rename from voxygen/src/anim/src/fish_medium/idle.rs rename to voxygen/anim/src/fish_medium/idle.rs diff --git a/voxygen/src/anim/src/fish_medium/jump.rs b/voxygen/anim/src/fish_medium/jump.rs similarity index 100% rename from voxygen/src/anim/src/fish_medium/jump.rs rename to voxygen/anim/src/fish_medium/jump.rs diff --git a/voxygen/src/anim/src/fish_medium/mod.rs b/voxygen/anim/src/fish_medium/mod.rs similarity index 100% rename from voxygen/src/anim/src/fish_medium/mod.rs rename to voxygen/anim/src/fish_medium/mod.rs diff --git a/voxygen/src/anim/src/fish_medium/run.rs b/voxygen/anim/src/fish_medium/run.rs similarity index 100% rename from voxygen/src/anim/src/fish_medium/run.rs rename to voxygen/anim/src/fish_medium/run.rs diff --git a/voxygen/src/anim/src/fish_small/idle.rs b/voxygen/anim/src/fish_small/idle.rs similarity index 100% rename from voxygen/src/anim/src/fish_small/idle.rs rename to voxygen/anim/src/fish_small/idle.rs diff --git a/voxygen/src/anim/src/fish_small/jump.rs b/voxygen/anim/src/fish_small/jump.rs similarity index 100% rename from voxygen/src/anim/src/fish_small/jump.rs rename to voxygen/anim/src/fish_small/jump.rs diff --git a/voxygen/src/anim/src/fish_small/mod.rs b/voxygen/anim/src/fish_small/mod.rs similarity index 100% rename from voxygen/src/anim/src/fish_small/mod.rs rename to voxygen/anim/src/fish_small/mod.rs diff --git a/voxygen/src/anim/src/fish_small/run.rs b/voxygen/anim/src/fish_small/run.rs similarity index 100% rename from voxygen/src/anim/src/fish_small/run.rs rename to voxygen/anim/src/fish_small/run.rs diff --git a/voxygen/src/anim/src/fixture/mod.rs b/voxygen/anim/src/fixture/mod.rs similarity index 100% rename from voxygen/src/anim/src/fixture/mod.rs rename to voxygen/anim/src/fixture/mod.rs diff --git a/voxygen/src/anim/src/golem/alpha.rs b/voxygen/anim/src/golem/alpha.rs similarity index 100% rename from voxygen/src/anim/src/golem/alpha.rs rename to voxygen/anim/src/golem/alpha.rs diff --git a/voxygen/src/anim/src/golem/idle.rs b/voxygen/anim/src/golem/idle.rs similarity index 100% rename from voxygen/src/anim/src/golem/idle.rs rename to voxygen/anim/src/golem/idle.rs diff --git a/voxygen/src/anim/src/golem/jump.rs b/voxygen/anim/src/golem/jump.rs similarity index 100% rename from voxygen/src/anim/src/golem/jump.rs rename to voxygen/anim/src/golem/jump.rs diff --git a/voxygen/src/anim/src/golem/mod.rs b/voxygen/anim/src/golem/mod.rs similarity index 100% rename from voxygen/src/anim/src/golem/mod.rs rename to voxygen/anim/src/golem/mod.rs diff --git a/voxygen/src/anim/src/golem/run.rs b/voxygen/anim/src/golem/run.rs similarity index 100% rename from voxygen/src/anim/src/golem/run.rs rename to voxygen/anim/src/golem/run.rs diff --git a/voxygen/src/anim/src/golem/shockwave.rs b/voxygen/anim/src/golem/shockwave.rs similarity index 100% rename from voxygen/src/anim/src/golem/shockwave.rs rename to voxygen/anim/src/golem/shockwave.rs diff --git a/voxygen/src/anim/src/lib.rs b/voxygen/anim/src/lib.rs similarity index 100% rename from voxygen/src/anim/src/lib.rs rename to voxygen/anim/src/lib.rs diff --git a/voxygen/src/anim/src/object/mod.rs b/voxygen/anim/src/object/mod.rs similarity index 100% rename from voxygen/src/anim/src/object/mod.rs rename to voxygen/anim/src/object/mod.rs diff --git a/voxygen/src/anim/src/quadruped_low/alpha.rs b/voxygen/anim/src/quadruped_low/alpha.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_low/alpha.rs rename to voxygen/anim/src/quadruped_low/alpha.rs diff --git a/voxygen/src/anim/src/quadruped_low/beta.rs b/voxygen/anim/src/quadruped_low/beta.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_low/beta.rs rename to voxygen/anim/src/quadruped_low/beta.rs diff --git a/voxygen/src/anim/src/quadruped_low/breathe.rs b/voxygen/anim/src/quadruped_low/breathe.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_low/breathe.rs rename to voxygen/anim/src/quadruped_low/breathe.rs diff --git a/voxygen/src/anim/src/quadruped_low/dash.rs b/voxygen/anim/src/quadruped_low/dash.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_low/dash.rs rename to voxygen/anim/src/quadruped_low/dash.rs diff --git a/voxygen/src/anim/src/quadruped_low/idle.rs b/voxygen/anim/src/quadruped_low/idle.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_low/idle.rs rename to voxygen/anim/src/quadruped_low/idle.rs diff --git a/voxygen/src/anim/src/quadruped_low/jump.rs b/voxygen/anim/src/quadruped_low/jump.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_low/jump.rs rename to voxygen/anim/src/quadruped_low/jump.rs diff --git a/voxygen/src/anim/src/quadruped_low/mod.rs b/voxygen/anim/src/quadruped_low/mod.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_low/mod.rs rename to voxygen/anim/src/quadruped_low/mod.rs diff --git a/voxygen/src/anim/src/quadruped_low/run.rs b/voxygen/anim/src/quadruped_low/run.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_low/run.rs rename to voxygen/anim/src/quadruped_low/run.rs diff --git a/voxygen/src/anim/src/quadruped_low/shoot.rs b/voxygen/anim/src/quadruped_low/shoot.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_low/shoot.rs rename to voxygen/anim/src/quadruped_low/shoot.rs diff --git a/voxygen/src/anim/src/quadruped_low/tailwhip.rs b/voxygen/anim/src/quadruped_low/tailwhip.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_low/tailwhip.rs rename to voxygen/anim/src/quadruped_low/tailwhip.rs diff --git a/voxygen/src/anim/src/quadruped_medium/alpha.rs b/voxygen/anim/src/quadruped_medium/alpha.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_medium/alpha.rs rename to voxygen/anim/src/quadruped_medium/alpha.rs diff --git a/voxygen/src/anim/src/quadruped_medium/beta.rs b/voxygen/anim/src/quadruped_medium/beta.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_medium/beta.rs rename to voxygen/anim/src/quadruped_medium/beta.rs diff --git a/voxygen/src/anim/src/quadruped_medium/dash.rs b/voxygen/anim/src/quadruped_medium/dash.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_medium/dash.rs rename to voxygen/anim/src/quadruped_medium/dash.rs diff --git a/voxygen/src/anim/src/quadruped_medium/feed.rs b/voxygen/anim/src/quadruped_medium/feed.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_medium/feed.rs rename to voxygen/anim/src/quadruped_medium/feed.rs diff --git a/voxygen/src/anim/src/quadruped_medium/hoof.rs b/voxygen/anim/src/quadruped_medium/hoof.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_medium/hoof.rs rename to voxygen/anim/src/quadruped_medium/hoof.rs diff --git a/voxygen/src/anim/src/quadruped_medium/idle.rs b/voxygen/anim/src/quadruped_medium/idle.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_medium/idle.rs rename to voxygen/anim/src/quadruped_medium/idle.rs diff --git a/voxygen/src/anim/src/quadruped_medium/jump.rs b/voxygen/anim/src/quadruped_medium/jump.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_medium/jump.rs rename to voxygen/anim/src/quadruped_medium/jump.rs diff --git a/voxygen/src/anim/src/quadruped_medium/leapmelee.rs b/voxygen/anim/src/quadruped_medium/leapmelee.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_medium/leapmelee.rs rename to voxygen/anim/src/quadruped_medium/leapmelee.rs diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/anim/src/quadruped_medium/mod.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_medium/mod.rs rename to voxygen/anim/src/quadruped_medium/mod.rs diff --git a/voxygen/src/anim/src/quadruped_medium/run.rs b/voxygen/anim/src/quadruped_medium/run.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_medium/run.rs rename to voxygen/anim/src/quadruped_medium/run.rs diff --git a/voxygen/src/anim/src/quadruped_small/alpha.rs b/voxygen/anim/src/quadruped_small/alpha.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_small/alpha.rs rename to voxygen/anim/src/quadruped_small/alpha.rs diff --git a/voxygen/src/anim/src/quadruped_small/feed.rs b/voxygen/anim/src/quadruped_small/feed.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_small/feed.rs rename to voxygen/anim/src/quadruped_small/feed.rs diff --git a/voxygen/src/anim/src/quadruped_small/idle.rs b/voxygen/anim/src/quadruped_small/idle.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_small/idle.rs rename to voxygen/anim/src/quadruped_small/idle.rs diff --git a/voxygen/src/anim/src/quadruped_small/jump.rs b/voxygen/anim/src/quadruped_small/jump.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_small/jump.rs rename to voxygen/anim/src/quadruped_small/jump.rs diff --git a/voxygen/src/anim/src/quadruped_small/mod.rs b/voxygen/anim/src/quadruped_small/mod.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_small/mod.rs rename to voxygen/anim/src/quadruped_small/mod.rs diff --git a/voxygen/src/anim/src/quadruped_small/run.rs b/voxygen/anim/src/quadruped_small/run.rs similarity index 100% rename from voxygen/src/anim/src/quadruped_small/run.rs rename to voxygen/anim/src/quadruped_small/run.rs diff --git a/voxygen/src/anim/src/theropod/alpha.rs b/voxygen/anim/src/theropod/alpha.rs similarity index 100% rename from voxygen/src/anim/src/theropod/alpha.rs rename to voxygen/anim/src/theropod/alpha.rs diff --git a/voxygen/src/anim/src/theropod/beta.rs b/voxygen/anim/src/theropod/beta.rs similarity index 100% rename from voxygen/src/anim/src/theropod/beta.rs rename to voxygen/anim/src/theropod/beta.rs diff --git a/voxygen/src/anim/src/theropod/idle.rs b/voxygen/anim/src/theropod/idle.rs similarity index 100% rename from voxygen/src/anim/src/theropod/idle.rs rename to voxygen/anim/src/theropod/idle.rs diff --git a/voxygen/src/anim/src/theropod/jump.rs b/voxygen/anim/src/theropod/jump.rs similarity index 100% rename from voxygen/src/anim/src/theropod/jump.rs rename to voxygen/anim/src/theropod/jump.rs diff --git a/voxygen/src/anim/src/theropod/mod.rs b/voxygen/anim/src/theropod/mod.rs similarity index 100% rename from voxygen/src/anim/src/theropod/mod.rs rename to voxygen/anim/src/theropod/mod.rs diff --git a/voxygen/src/anim/src/theropod/run.rs b/voxygen/anim/src/theropod/run.rs similarity index 100% rename from voxygen/src/anim/src/theropod/run.rs rename to voxygen/anim/src/theropod/run.rs diff --git a/voxygen/src/anim/src/vek.rs b/voxygen/anim/src/vek.rs similarity index 100% rename from voxygen/src/anim/src/vek.rs rename to voxygen/anim/src/vek.rs