Skip to content

Commit 0ce3c7c

Browse files
committed
restructure ui and update dependencies
1 parent 346a78d commit 0ce3c7c

11 files changed

Lines changed: 706 additions & 503 deletions

File tree

Cargo.lock

Lines changed: 416 additions & 304 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,14 @@ quick-protobuf = "0.8"
4343
serde = { version = "1", features = ["derive"] }
4444
ureq = "2"
4545
varint = "0.9"
46-
wgpu = { version = "22", features = ["glsl"] }
47-
glyphon = { version = "0.6" }
46+
wgpu = { version = "24", features = ["glsl"] }
47+
glyphon = { version = "0.8" }
4848
winit = "0.30"
49-
egui = "0.29"
50-
egui_wgpu_backend = "0.31"
51-
egui_winit_platform = "0.24"
52-
egui_demo_lib = "0.29"
49+
egui = "0.31"
50+
egui_wgpu_backend = "0.34"
51+
egui_winit_platform = "0.26"
52+
egui_demo_lib = "0.31"
53+
egui_tiles = "0.12.0"
5354

5455
[dev-dependencies]
5556
insta = "1"

src/bin/drawing/painter.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl Painter {
5656
pub fn init(window: Arc<Window>, size: PhysicalSize<u32>, app_state: &AppState) -> Self {
5757
let factor = window.scale_factor();
5858

59-
let instance = wgpu::Instance::new(InstanceDescriptor::default());
59+
let instance = wgpu::Instance::new(&InstanceDescriptor::default());
6060
let surface = instance.create_surface(window.clone()).unwrap();
6161

6262
let adapter = block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
@@ -288,7 +288,7 @@ impl Painter {
288288
layout: Some(&pipeline_layout),
289289
vertex: VertexState {
290290
module: vs_module,
291-
entry_point: "main",
291+
entry_point: Some("main"),
292292
buffers: &[VertexBufferLayout {
293293
array_stride: std::mem::size_of::<Vertex>() as u64,
294294
step_mode: VertexStepMode::Vertex,
@@ -314,7 +314,7 @@ impl Painter {
314314
},
315315
fragment: Some(FragmentState {
316316
module: fs_module,
317-
entry_point: "main",
317+
entry_point: Some("main"),
318318
targets: &[Some(ColorTargetState {
319319
format: TextureFormat::Bgra8Unorm,
320320
blend: Some(BlendState {

0 commit comments

Comments
 (0)