summaryrefslogtreecommitdiff
path: root/engine/src/ui/imgui.rs
diff options
context:
space:
mode:
authorHampusM <hampus@hampusmat.com>2026-07-16 17:02:49 +0200
committerHampusM <hampus@hampusmat.com>2026-07-16 17:02:49 +0200
commit2ee2f0dfde751d9680748871644cdd21e2d95f22 (patch)
tree205da49372eb909ca4d39b927e4447f6bca59e8e /engine/src/ui/imgui.rs
parentb6b4e4a8d14a4fb91af5169a8d1957b23a387ada (diff)
feat(engine): replace Image::try_from_bytes fn with from_pixels fn
Diffstat (limited to 'engine/src/ui/imgui.rs')
-rw-r--r--engine/src/ui/imgui.rs20
1 files changed, 7 insertions, 13 deletions
diff --git a/engine/src/ui/imgui.rs b/engine/src/ui/imgui.rs
index bb13d8d..976d5ed 100644
--- a/engine/src/ui/imgui.rs
+++ b/engine/src/ui/imgui.rs
@@ -1,7 +1,6 @@
use std::path::{Path, PathBuf};
use std::sync::LazyLock;
-use dear_imgui_rs::texture::TextureFormat as ImguiTextureFormat;
use dear_imgui_rs::{
DrawCmd as ImguiDrawCmd,
Key as ImguiKey,
@@ -22,11 +21,7 @@ use ecs::{Component, Query, Sole};
use crate::asset::{Assets, Handle as AssetHandle, Label as AssetLabel};
use crate::data_types::dimens::Dimens;
use crate::delta_time::DeltaTime;
-use crate::image::{
- ColorType as ImageColorType,
- FromBytesError as ImageFromBytesError,
- Image,
-};
+use crate::image::Image;
use crate::input::keyboard::{Key, Keyboard};
use crate::input::mouse::{Button as MouseButton, Buttons as MouseButtons, Mouse};
use crate::mesh::vertex_buffer::{
@@ -713,10 +708,13 @@ fn calc_draw_cmd_scissor_box(
fn create_font_texture(
font_texture_data: &dear_imgui_rs::texture::TextureData,
-) -> Result<Texture, ImageFromBytesError>
+) -> Result<Texture, crate::image::PixelBufferLenIncorrectForSize>
{
Ok(Texture {
- image: Image::try_from_bytes(
+ image: Image::from_pixels(crate::image::PixelBuffer::<
+ crate::data_types::color::Rgba<u8>,
+ _,
+ >::new(
font_texture_data
.pixels()
.expect("Font texture data does not contain any pixels"),
@@ -728,11 +726,7 @@ fn create_font_texture(
"Font texture height value does not fit in 32-bit unsigned int",
),
},
- match font_texture_data.format() {
- ImguiTextureFormat::RGBA32 => ImageColorType::Rgba8,
- ImguiTextureFormat::Alpha8 => unimplemented!(),
- },
- )?,
+ ))?,
properties: TextureProperties::builder()
.minifying_filter(TextureFiltering::Linear)
.magnifying_filter(TextureFiltering::Linear)