reo/raidillon
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip: Changes of the week

Browse source 
- Move engine to a different crate
- Add engine trait
- Refactor the rest of the codebase to work with these changes
- Add debug ui buffer, use it to finish imgui support
This commit is contained in:
reo 2025-09-07 17:00:04 +03:00
parent 3fd5b09a94
commit 15122b8ebd
20 changed files with 344 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

2
glium_platform/src/render/basic.rs
View file

@ -20,7 +20,7 @@ pub struct BasicMeshRenderingSystem {
}
impl RenderingSystem for BasicMeshRenderingSystem {
fn initialize(display: &Display<WindowSurface>) -> Self {
fn initialize(display: &Display<WindowSurface>, _window: &glium::winit::window::Window) -> Self {
const VERT_SRC: &str = include_shader!("gl_textured.vert");
const FRAG_SRC: &str = include_shader!("gl_textured.frag");

60
glium_platform/src/render/debug_ui.rs
View file

@ -1,5 +1,6 @@
use std::cell::RefCell;
use std::rc::Rc;
use std::sync::Arc;
use std::time::Instant;
use glium::Display;
use glium::glutin::surface::WindowSurface;
@ -8,10 +9,11 @@ use imgui_winit_support::{HiDpiMode, WinitPlatform};
use imgui_glium_renderer::Renderer as ImguiGliumRenderer;
use winit::raw_window_handle::DisplayHandle;
use winit::window::Window;
use anyhow::Result;
use anyhow::{Result};
use crate::RenderingSystem;
use crate::system::RenderingContext;
use glium::Frame;
use raidillon_core::DebugUIBuffer;
pub struct ImguiBridge {
imgui: ImguiContext,
@ -20,21 +22,6 @@ pub struct ImguiBridge {
}
impl ImguiBridge {
pub fn new(display: &Display<WindowSurface>, window: &Window) -> Result<Self> {
let mut imgui = ImguiContext::create();
imgui.set_ini_filename(None);
let mut platform = WinitPlatform::new(&mut imgui);
platform.attach_window(imgui.io_mut(), window, HiDpiMode::Default);
imgui.fonts().add_font(&[imgui::FontSource::DefaultFontData { config: None }]);
let renderer = ImguiGliumRenderer::new(&mut imgui, display)?;
Ok(Self {
imgui,
platform,
renderer,
})
}
pub fn render<F>(&mut self, target: &mut Frame, window: &Window, build_ui: F)
where
F: FnOnce(&imgui::Ui),
@ -52,26 +39,43 @@ impl ImguiBridge {
.expect("imgui rendering failed");
}
pub fn initialize_frame(&mut self) -> &mut imgui::Ui {
self.imgui.frame()
}
pub fn finish_frame(&mut self, target: &mut Frame, window: &Window, ui: imgui::Ui) {
self.platform.prepare_render(&ui, window);
let draw_data = self.imgui.render();
self.renderer.render(target, draw_data).expect("imgui rendering failed");
}
// pub fn initialize_frame(&mut self) -> &mut imgui::Ui {
// self.imgui.frame()
// }
//
// pub fn finish_frame(&mut self, target: &mut Frame, window: &Window, ui: imgui::Ui) {
// self.platform.prepare_render(&ui, window);
// let draw_data = self.imgui.render();
// self.renderer.render(target, draw_data).expect("imgui rendering failed");
// }
}
impl RenderingSystem for ImguiBridge {
fn render(&mut self, ctx: &mut RenderingContext) {
todo!()
let mut ui = self.imgui.frame();
ctx.debug_ui_buffer.borrow_mut().write_buffer(&mut ui);
self.platform.prepare_render(&ui, ctx.window);
let draw_data = self.imgui.render();
self.renderer.render(ctx.target, draw_data).expect("imgui rendering failed");
}
fn initialize(display: &Display<WindowSurface>) -> Self
fn initialize(display: &Display<WindowSurface>, window: &glium::winit::window::Window) -> Self
where
Self: Sized,
{
todo!()
let mut imgui = ImguiContext::create();
imgui.set_ini_filename(None);
let mut platform = WinitPlatform::new(&mut imgui);
platform.attach_window(imgui.io_mut(), window, HiDpiMode::Default);
imgui.fonts().add_font(&[imgui::FontSource::DefaultFontData { config: None }]);
let renderer = ImguiGliumRenderer::new(&mut imgui, display).unwrap();
Self {
imgui,
platform,
renderer,
}
}
}