From 6163ddbb68e95df2cb3d9bfb64f9703ea2f393be Mon Sep 17 00:00:00 2001
From: Ben Wallis <atomyc@gmail.com>
Date: Sun, 9 May 2021 21:55:29 +0100
Subject: [PATCH] Pulled library hot-reloading code into a separate crate and
 removed duplicated code from anim and egui crates

---
 Cargo.lock         | 94 ++++++++++++----------------------------------
 voxygen/src/lib.rs |  1 -
 2 files changed, 23 insertions(+), 72 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 23b5d5962f..b5c744bdbc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1457,7 +1457,7 @@ checksum = "f6aa6fec3ad8de51b5d7e2a11eb6cb0fd3533a7b817e5af54eda8e7fe53729bd"
 dependencies = [
  "bytemuck",
  "epi",
- "wgpu 0.8.0 (git+https://github.com/gfx-rs/wgpu-rs?rev=69be1ff88a073b3a7f9470044834e75c22f7b4ad)",
+ "wgpu",
 ]
 
 [[package]]
@@ -1962,7 +1962,7 @@ dependencies = [
  "libloading 0.7.0",
  "log",
  "parking_lot 0.11.1",
- "range-alloc 0.1.2 (git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521)",
+ "range-alloc",
  "raw-window-handle",
  "smallvec",
  "spirv_cross",
@@ -1984,7 +1984,7 @@ dependencies = [
  "gfx-hal",
  "log",
  "parking_lot 0.11.1",
- "range-alloc 0.1.2 (git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521)",
+ "range-alloc",
  "raw-window-handle",
  "smallvec",
  "spirv_cross",
@@ -2010,9 +2010,9 @@ dependencies = [
  "arrayvec",
  "bitflags",
  "fxhash",
- "gfx-auxil 0.9.0",
- "gfx-hal 0.8.0",
- "glow 0.9.0",
+ "gfx-auxil",
+ "gfx-hal",
+ "glow",
  "js-sys",
  "khronos-egl",
  "libloading 0.7.0",
@@ -2037,15 +2037,15 @@ dependencies = [
  "copyless",
  "foreign-types",
  "fxhash",
- "gfx-auxil 0.9.0",
- "gfx-hal 0.8.0",
+ "gfx-auxil",
+ "gfx-hal",
  "log",
  "metal",
  "naga",
  "objc",
  "parking_lot 0.11.1",
  "profiling",
- "range-alloc 0.1.2 (git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521)",
+ "range-alloc",
  "raw-window-handle",
  "spirv_cross",
  "storage-map",
@@ -4232,7 +4232,7 @@ dependencies = [
 [[package]]
 name = "range-alloc"
 version = "0.1.2"
-source = "git+https://github.com/gfx-rs/gfx?rev=32684a7da923cfd661fe4d3003f4275270e9c40d#32684a7da923cfd661fe4d3003f4275270e9c40d"
+source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
 
 [[package]]
 name = "raw-window-handle"
@@ -6140,7 +6140,7 @@ dependencies = [
  "veloren-voxygen-anim",
  "veloren-voxygen-egui",
  "veloren-world",
- "wgpu 0.8.0 (git+https://github.com/gfx-rs/wgpu-rs.git?rev=7486bdad64bb5d17b709ecccb41e063469efff88)",
+ "wgpu",
  "wgpu-profiler",
  "window_clipboard 0.2.0",
  "winit",
@@ -6736,25 +6736,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "wgpu"
-version = "0.8.0"
-source = "git+https://github.com/gfx-rs/wgpu-rs?rev=69be1ff88a073b3a7f9470044834e75c22f7b4ad#69be1ff88a073b3a7f9470044834e75c22f7b4ad"
-dependencies = [
- "arrayvec",
- "js-sys",
- "log",
- "naga 0.3.1",
- "parking_lot 0.11.1",
- "raw-window-handle",
- "smallvec",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "wgpu-core 0.8.0 (git+https://github.com/gfx-rs/wgpu?rev=e5ddb94be0221b0f53a8f43adfb15458daebfd7c)",
- "wgpu-types 0.8.0 (git+https://github.com/gfx-rs/wgpu?rev=e5ddb94be0221b0f53a8f43adfb15458daebfd7c)",
-]
-
 [[package]]
 name = "wgpu"
 version = "0.8.0"
@@ -6771,8 +6752,8 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "wgpu-core 0.8.0 (git+https://github.com/gfx-rs/wgpu?rev=53eab747a32414232be45d47cae8a43a369395d0)",
- "wgpu-types 0.8.0 (git+https://github.com/gfx-rs/wgpu?rev=53eab747a32414232be45d47cae8a43a369395d0)",
+ "wgpu-core",
+ "wgpu-types",
 ]
 
 [[package]]
@@ -6785,17 +6766,17 @@ dependencies = [
  "cfg_aliases",
  "copyless",
  "fxhash",
- "gfx-backend-dx11 0.8.0",
- "gfx-backend-dx12 0.8.0",
- "gfx-backend-empty 0.8.0",
- "gfx-backend-gl 0.8.1",
- "gfx-backend-metal 0.8.1",
- "gfx-backend-vulkan 0.8.0",
- "gfx-hal 0.8.0",
+ "gfx-backend-dx11",
+ "gfx-backend-dx12",
+ "gfx-backend-empty",
+ "gfx-backend-gl",
+ "gfx-backend-metal",
+ "gfx-backend-vulkan",
+ "gfx-hal",
  "gpu-alloc",
  "gpu-descriptor",
  "log",
- "naga 0.4.0",
+ "naga",
  "parking_lot 0.11.1",
  "profiling",
  "raw-window-handle",
@@ -6803,36 +6784,7 @@ dependencies = [
  "serde",
  "smallvec",
  "thiserror",
- "wgpu-types 0.8.0 (git+https://github.com/gfx-rs/wgpu?rev=53eab747a32414232be45d47cae8a43a369395d0)",
-]
-
-[[package]]
-name = "wgpu-core"
-version = "0.8.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=e5ddb94be0221b0f53a8f43adfb15458daebfd7c#e5ddb94be0221b0f53a8f43adfb15458daebfd7c"
-dependencies = [
- "arrayvec",
- "bitflags",
- "cfg_aliases",
- "copyless",
- "fxhash",
- "gfx-backend-dx11 0.7.0",
- "gfx-backend-dx12 0.7.0",
- "gfx-backend-empty 0.7.0",
- "gfx-backend-gl 0.7.0",
- "gfx-backend-metal 0.7.0",
- "gfx-backend-vulkan 0.7.0",
- "gfx-hal 0.7.0",
- "gpu-alloc",
- "gpu-descriptor",
- "log",
- "naga 0.3.1",
- "parking_lot 0.11.1",
- "profiling",
- "raw-window-handle",
- "smallvec",
- "thiserror",
- "wgpu-types 0.8.0 (git+https://github.com/gfx-rs/wgpu?rev=e5ddb94be0221b0f53a8f43adfb15458daebfd7c)",
+ "wgpu-types",
 ]
 
 [[package]]
@@ -6841,7 +6793,7 @@ version = "0.4.0"
 source = "git+https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8#b156eb145bc223386ef344860d9b33b3c181650c"
 dependencies = [
  "futures",
- "wgpu 0.8.0 (git+https://github.com/gfx-rs/wgpu-rs.git?rev=7486bdad64bb5d17b709ecccb41e063469efff88)",
+ "wgpu",
 ]
 
 [[package]]
diff --git a/voxygen/src/lib.rs b/voxygen/src/lib.rs
index d494ab25c8..0dd2c93492 100644
--- a/voxygen/src/lib.rs
+++ b/voxygen/src/lib.rs
@@ -44,7 +44,6 @@ use crate::{
     settings::Settings,
     ui::egui::EguiState,
     window::{Event, Window},
-    ui::egui::EguiState,
 };
 use common::clock::Clock;
 use common_base::span;