Update libs

hakolao · Apr 4, 2024 · 6150af6 · 6150af6
1 parent cd46ee5
commit 6150af6
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 25 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ egui_persistence = ["egui_gui", "egui_demo", "egui/persistence", "egui_demo_lib/
 trace = ["wgpu/trace"]
 
 [dependencies]
-indexmap = "2.1"
+indexmap = "2.2"
 pollster = "0.3"
 image = "0.24"
 bytemuck = { version = "1.14", features = ["derive"] }
@@ -27,17 +27,17 @@ flume = "0.11"
 log = "0.4"
 
 # Optional Egui
-egui = { git = "https://github.com/emilk/egui", rev = "3a8e2348a5d18262a714ccfbcba115176848475c", optional = true }
-egui-wgpu = { git = "https://github.com/emilk/egui", rev = "3a8e2348a5d18262a714ccfbcba115176848475c", optional = true }
-egui-winit = { git = "https://github.com/emilk/egui", rev = "3a8e2348a5d18262a714ccfbcba115176848475c", optional = true }
-egui_extras = { git = "https://github.com/emilk/egui", rev = "3a8e2348a5d18262a714ccfbcba115176848475c", optional = true }
-egui_demo_lib = { git = "https://github.com/emilk/egui", rev = "3a8e2348a5d18262a714ccfbcba115176848475c", optional = true }
-egui_plot = { git = "https://github.com/emilk/egui", rev = "3a8e2348a5d18262a714ccfbcba115176848475c", optional = true }
+egui = { version = "0.27", optional = true }
+egui-wgpu = { version = "0.27", optional = true }
+egui-winit = { version = "0.27", optional = true }
+egui_extras = { version = "0.27", optional = true }
+egui_demo_lib = { version = "0.27", optional = true }
+egui_plot = { version = "0.27", optional = true }
 
 [dev-dependencies]
-egui_demo_lib = { git = "https://github.com/emilk/egui", rev = "3a8e2348a5d18262a714ccfbcba115176848475c" }
+egui_demo_lib = { version = "0.27"}
 winit_input_helper = "0.15"
-rapier2d = { version = "0.17.2", features = ["default", "debug-render"] }
+rapier2d = { version = "0.18", features = ["default", "debug-render"] }
 
 [lints.clippy]
 blocks_in_conditions = "allow"

diff --git a/examples/egui_gui.rs b/examples/egui_gui.rs
@@ -1,6 +1,6 @@
 use egui::{FullOutput, ViewportId};
 use egui_demo_lib::DemoWindows;
-use egui_wgpu::renderer::ScreenDescriptor;
+use egui_wgpu::ScreenDescriptor;
 use egui_winit::EventResponse;
 use glass::{
     window::GlassWindow, Glass, GlassApp, GlassConfig, GlassContext, GlassError, RenderData,

diff --git a/examples/fluid_sim/app.rs b/examples/fluid_sim/app.rs
@@ -3,7 +3,6 @@ use glass::{
     egui::Color32,
     pipelines::QuadPipeline,
     texture::Texture,
-    wgpu,
     wgpu::{BlendState, ColorTargetState, ColorWrites, Extent3d, TextureFormat, TextureUsages},
     window::GlassWindow,
     winit::{

diff --git a/examples/fluid_sim/circle_pipeline.rs b/examples/fluid_sim/circle_pipeline.rs
@@ -1,12 +1,9 @@
 use std::borrow::Cow;
 
 use bytemuck::{Pod, Zeroable};
-use glass::{
-    wgpu,
-    wgpu::{
-        util::DeviceExt, BindGroup, Buffer, Device, PushConstantRange, RenderPass, RenderPipeline,
-        ShaderStages,
-    },
+use glass::wgpu::{
+    util::DeviceExt, BindGroup, Buffer, Device, PushConstantRange, RenderPass, RenderPipeline,
+    ShaderStages,
 };
 
 use crate::{

diff --git a/examples/fluid_sim/main.rs b/examples/fluid_sim/main.rs
@@ -10,7 +10,6 @@ mod timer;
 
 use glass::{
     device_context::DeviceConfig,
-    wgpu,
     wgpu::{Backends, Limits, PowerPreference, PresentMode},
     window::WindowConfig,
     Glass, GlassConfig, GlassError,

diff --git a/examples/fluid_sim/rectangle_pipeline.rs b/examples/fluid_sim/rectangle_pipeline.rs
@@ -1,12 +1,9 @@
 use std::borrow::Cow;
 
 use bytemuck::{Pod, Zeroable};
-use glass::{
-    wgpu,
-    wgpu::{
-        util::DeviceExt, BindGroup, Buffer, Device, PushConstantRange, RenderPass, RenderPipeline,
-        ShaderStages,
-    },
+use glass::wgpu::{
+    util::DeviceExt, BindGroup, Buffer, Device, PushConstantRange, RenderPass, RenderPipeline,
+    ShaderStages,
 };
 
 use crate::{

diff --git a/examples/fluid_sim/simple_vertex.rs b/examples/fluid_sim/simple_vertex.rs
@@ -1,5 +1,4 @@
 use bytemuck::{Pod, Zeroable};
-use glass::wgpu;
 
 /// A vertex with position
 #[repr(C)]

diff --git a/run_all_examples.ps1 b/run_all_examples.ps1
@@ -4,5 +4,6 @@ cargo run --example shader_with_includes
 cargo run --example quad
 cargo run --example multiple_windows
 cargo run --example game_of_life
+cargo run --example lines
 cargo run --example egui_gui --features "egui_gui egui_demo"
 cargo run --example fluid_sim --features "egui_gui"
diff --git a/run_all_examples.sh b/run_all_examples.sh
@@ -4,5 +4,6 @@ cargo run --example shader_with_includes
 cargo run --example quad
 cargo run --example multiple_windows
 cargo run --example game_of_life
+cargo run --example lines
 cargo run --example egui_gui --features "egui_gui egui_demo"
 cargo run --example fluid_sim --features "egui_gui"