From 6e1c95c4d122f14ca6c3eef88fe187b19131d479 Mon Sep 17 00:00:00 2001 From: David Chavez Date: Mon, 3 Jul 2023 13:20:24 +0200 Subject: [PATCH] Update to fast3d 0.3.0 --- Cargo.toml | 13 ++++++------- src/gui/gui_glium.rs | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b12729f..12177d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,12 +44,11 @@ glutin = { version = "0.29.1", optional = true } wgpu = { version = "0.16", optional = true } spin_sleep = "1.1.1" arie = "0.2.0" -fast3d = { version = "0.2.0", default-features = false } -fast3d-glium-renderer = { version = "0.2.0", optional = true } -fast3d-wgpu-renderer = { version = "0.2.0", optional = true } +fast3d = { version = "0.3.0", default-features = false } +fast3d-glium-renderer = { version = "0.3.0", optional = true } +fast3d-wgpu-renderer = { version = "0.3.0", optional = true } [patch.crates-io] -glium = { git = "https://github.com/retrofoundry/glium", branch = "helix" } -fast3d = { git = "https://github.com/retrofoundry/fast3d-rs", rev = "a22c54f4" } # remove once we have our glium fix upstreamed -fast3d-glium-renderer = { git = "https://github.com/retrofoundry/fast3d-rs", rev = "a22c54f4" } # remove once we have our glium fix upstreamed -fast3d-wgpu-renderer = { git = "https://github.com/retrofoundry/fast3d-rs", rev = "a22c54f4" } # remove once we have our glium fix upstreamed +#fast3d = { path = "../../fast3d-rs/fast3d" } +#fast3d-glium-renderer = { path = "../../fast3d-rs/fast3d-glium-renderer" } +#fast3d-wgpu-renderer = { path = "../../fast3d-rs/fast3d-wgpu-renderer" } diff --git a/src/gui/gui_glium.rs b/src/gui/gui_glium.rs index a43fe74..e60b7cf 100644 --- a/src/gui/gui_glium.rs +++ b/src/gui/gui_glium.rs @@ -297,6 +297,7 @@ impl<'a> Gui<'a> { draw_call.projection_matrix, &draw_call.fog, &draw_call.vbo.vbo, + draw_call.vbo.num_tris, &draw_call.uniforms, ); }