Merge branch 'xMAC94x/veloren_anim_move' into 'master'

move anim code from voxygen/src/anim to voxygen/anim

See merge request veloren/veloren!1585

Cargo.toml

@@ -9,9 +9,9 @@ members = [
 	"server",
 	"server-cli",
 	"voxygen",
+	"voxygen/anim",
 	"world",
 	"network",
-    "voxygen/src/anim",
 	"tools"
 ]
 

voxygen/Cargo.toml

@@ -23,7 +23,7 @@ client = {package = "veloren-client", path = "../client"}
 common = {package = "veloren-common", path = "../common"}
 common_sys = {package = "veloren_common_sys", path = "../common/sys"}
 
-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"

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}

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();