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

This commit is contained in:
Marcel Märtens 2020-12-01 13:58:58 +01:00
parent e06dd3fe7e
commit e5e255cbd3
112 changed files with 9 additions and 9 deletions

View File

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

View File

@ -22,7 +22,7 @@ default = ["gl", "singleplayer", "native-dialog", "simd"]
client = {package = "veloren-client", path = "../client"} client = {package = "veloren-client", path = "../client"}
common = {package = "veloren-common", path = "../common"} 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 # Graphics
gfx = "0.18.2" gfx = "0.18.2"

View File

@ -18,7 +18,7 @@ simd = ["vek/platform_intrinsics"]
default = ["be-dyn-lib", "simd"] default = ["be-dyn-lib", "simd"]
[dependencies] [dependencies]
common = {package = "veloren-common", path = "../../../common"} common = {package = "veloren-common", path = "../../common"}
find_folder = {version = "0.3.0", optional = true} find_folder = {version = "0.3.0", optional = true}
inline_tweak = "1.0.2" inline_tweak = "1.0.2"
lazy_static = {version = "1.4.0", optional = true} lazy_static = {version = "1.4.0", optional = true}

View File

@ -75,9 +75,9 @@ impl LoadedLib {
Ok(lib) => lib, Ok(lib) => lib,
Err(e) => panic!( Err(e) => panic!(
"Tried to load dynamic library from {:?}, but it could not be found. The first \ "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 \ reason might be that you need to uncomment a line in `voxygen/anim/Cargo.toml` \
`voxygen/src/anim/Cargo.toml` to build the library required for hot reloading. \ to build the library required for hot reloading. The second is we may require a \
The second is we may require a special case for your OS so we can find it. {:?}", special case for your OS so we can find it. {:?}",
lib_path, e lib_path, e
), ),
}; };
@ -129,7 +129,7 @@ impl LoadedLib {
/// Initialise a watcher. /// Initialise a watcher.
/// ///
/// The assumption is that this is run from the voxygen crate's root directory /// 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. /// files. Upon noticing changes it will wait a moment and then recompile.
pub fn init() { pub fn init() {
// Make sure first compile is done by accessing the lazy_static and then // Make sure first compile is done by accessing the lazy_static and then
@ -141,7 +141,7 @@ pub fn init() {
// Start watcher // Start watcher
let mut watcher = immediate_watcher(move |res| event_fn(res, &reload_send)).unwrap(); 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 // Start reloader that watcher signals
// "Debounces" events since I can't find the option to do this in the latest // "Debounces" events since I can't find the option to do this in the latest
@ -158,7 +158,7 @@ pub fn init() {
info!( info!(
?modified_paths, ?modified_paths,
"Hot reloading animations because files in `src/anim` modified." "Hot reloading animations because files in `anim` modified."
); );
hotreload(); hotreload();

Some files were not shown because too many files have changed in this diff Show More