Skip to content

Commit

Permalink
Bump egui to 0.30 and glow to 0.16
Browse files Browse the repository at this point in the history
  • Loading branch information
Masterchef365 authored and asny committed Jan 3, 2025
1 parent 8121e1d commit 2683e0f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ egui-gui = ["egui_glow", "egui", "getrandom"] # Additional GUI features
text = ["swash", "lyon"] # Text mesh generation features

[dependencies]
glow = "0.14"
glow = "0.16"
cgmath = "0.18"
three-d-asset = "0.9"
thiserror = "2"
open-enum = "0.5"
winit = {version = "0.28", optional = true}
egui = { version = "0.29", optional = true }
egui_glow = { version = "0.29", optional = true }
egui = { version = "0.30", optional = true }
egui_glow = { version = "0.30", optional = true }
getrandom = { version = "0.2", features = ["js"], optional = true }
swash = { version = "0.1", optional = true }
lyon = { version = "1", optional = true }
Expand Down Expand Up @@ -198,4 +198,4 @@ required-features = ["headless"]

[[example]]
name = "logo"
path = "examples/logo/src/main.rs"
path = "examples/logo/src/main.rs"
4 changes: 2 additions & 2 deletions src/core/render_target.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ impl<'a> RenderTarget<'a> {
scissor_box.height as i32,
format,
data_type,
crate::context::PixelPackData::Slice(&mut bytes),
crate::context::PixelPackData::Slice(Some(&mut bytes)),
);
}
let mut pixels = from_byte_slice(&bytes).to_vec();
Expand Down Expand Up @@ -225,7 +225,7 @@ impl<'a> RenderTarget<'a> {
scissor_box.height as i32,
crate::context::DEPTH_COMPONENT,
crate::context::FLOAT,
crate::context::PixelPackData::Slice(&mut pixels),
crate::context::PixelPackData::Slice(Some(&mut pixels)),
);
}
from_byte_slice(&pixels).to_vec()
Expand Down
2 changes: 1 addition & 1 deletion src/core/texture/texture2d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ impl Texture2D {
self.height as i32,
format_from_data_type::<T>(),
T::data_type(),
crate::context::PixelUnpackData::Slice(to_byte_slice(&data)),
crate::context::PixelUnpackData::Slice(Some(to_byte_slice(&data))),
);
}
self.generate_mip_maps();
Expand Down
2 changes: 1 addition & 1 deletion src/core/texture/texture2d_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ impl Texture2DArray {
1,
format_from_data_type::<T>(),
T::data_type(),
crate::context::PixelUnpackData::Slice(to_byte_slice(&data)),
crate::context::PixelUnpackData::Slice(Some(to_byte_slice(&data))),
);
}
self.generate_mip_maps();
Expand Down
2 changes: 1 addition & 1 deletion src/core/texture/texture3d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ impl Texture3D {
self.depth as i32,
format_from_data_type::<T>(),
T::data_type(),
crate::context::PixelUnpackData::Slice(to_byte_slice(data)),
crate::context::PixelUnpackData::Slice(Some(to_byte_slice(data))),
);
}
self.generate_mip_maps();
Expand Down
2 changes: 1 addition & 1 deletion src/core/texture/texture_cube_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ impl TextureCubeMap {
self.height as i32,
format_from_data_type::<T>(),
T::data_type(),
crate::context::PixelUnpackData::Slice(to_byte_slice(data)),
crate::context::PixelUnpackData::Slice(Some(to_byte_slice(data))),
);
}
}
Expand Down

0 comments on commit 2683e0f

Please sign in to comment.