From 74b5af6b8bb03a3ba7f267698e250b9c26ce7f8c Mon Sep 17 00:00:00 2001
From: carrascomj <carrascomurielj@gmail.com>
Date: Mon, 30 Oct 2023 16:51:49 +0100
Subject: [PATCH] feat: pin commit of pancam and bevy_egui to a working state

---
 Cargo.lock | 69 ++++++------------------------------------------------
 Cargo.toml |  4 ++--
 2 files changed, 9 insertions(+), 64 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 92aeb67..16c6dea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -535,20 +535,10 @@ name = "bevy_egui"
 version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a73a93a8cf6b8c744281d1b88f5b0fa278d608e909af9bbf4eb491a7cb1ad2c"
-dependencies = [
- "bevy",
- "egui 0.22.0",
-]
-
-[[package]]
-name = "bevy_egui"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1c1f6ad293c60fd8559c4502cda5e832e92b0e0f3d994929b33f24d4352d70"
 dependencies = [
  "arboard",
  "bevy",
- "egui 0.23.0",
+ "egui",
  "thread_local",
  "webbrowser",
 ]
@@ -696,11 +686,10 @@ dependencies = [
 [[package]]
 name = "bevy_pancam"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f3862bc02d850b63ce59b91d451b8b0e620ca036adf8f73529ebaed198e7c9"
+source = "git+https://github.com/johanhelsing/bevy_pancam.git?rev=8b6263dcf634dfcc26954c5d712b88a6d7d43e29#8b6263dcf634dfcc26954c5d712b88a6d7d43e29"
 dependencies = [
  "bevy",
- "bevy_egui 0.21.0",
+ "bevy_egui",
 ]
 
 [[package]]
@@ -1444,15 +1433,6 @@ dependencies = [
  "bytemuck",
 ]
 
-[[package]]
-name = "ecolor"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "egui"
 version = "0.22.0"
@@ -1460,18 +1440,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3aef8ec3ae1b772f340170c65bf27d5b8c28f543a0116c844d2ac08d01123e7"
 dependencies = [
  "ahash 0.8.3",
- "epaint 0.22.0",
- "nohash-hasher",
-]
-
-[[package]]
-name = "egui"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7"
-dependencies = [
- "ahash 0.8.3",
- "epaint 0.23.0",
+ "epaint",
  "nohash-hasher",
 ]
 
@@ -1490,15 +1459,6 @@ dependencies = [
  "bytemuck",
 ]
 
-[[package]]
-name = "emath"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "encase"
 version = "0.6.1"
@@ -1541,23 +1501,8 @@ dependencies = [
  "ahash 0.8.3",
  "atomic_refcell",
  "bytemuck",
- "ecolor 0.22.0",
- "emath 0.22.0",
- "nohash-hasher",
- "parking_lot",
-]
-
-[[package]]
-name = "epaint"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e"
-dependencies = [
- "ab_glyph",
- "ahash 0.8.3",
- "bytemuck",
- "ecolor 0.23.0",
- "emath 0.23.0",
+ "ecolor",
+ "emath",
  "nohash-hasher",
  "parking_lot",
 ]
@@ -3149,7 +3094,7 @@ version = "0.8.0"
 dependencies = [
  "async-std",
  "bevy",
- "bevy_egui 0.22.0",
+ "bevy_egui",
  "bevy_pancam",
  "bevy_prototype_lyon",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 3e25a8a..1b96cd9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,8 +12,8 @@ readme = "README.md"
 
 [dependencies]
 bevy = {version="0.11", features = ["bevy_render", "bevy_core_pipeline", "bevy_asset", "bevy_sprite", "bevy_winit", "png", "x11", "bevy_ui", "tga", "bmp", "jpeg", "webgl2"], default-features=false }
-bevy_egui = "0.22"
-bevy_pancam = { version = "0.9.0", features = ["bevy_egui"] }
+bevy_egui = "0.21"
+bevy_pancam = { git = "https://github.com/johanhelsing/bevy_pancam.git", rev="8b6263dcf634dfcc26954c5d712b88a6d7d43e29", features = ["bevy_egui"] }
 bevy_prototype_lyon = "0.9.0"
 colorgrad = "0.6.2"
 itertools = "0.10.5"