Initial implementation of imgui support
This commit is contained in:
parent
1a200e62ef
commit
3fd5b09a94
6 changed files with 95 additions and 4 deletions
|
|
@ -44,7 +44,11 @@ impl System for RenderingTestSystem {
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
fn update(&mut self, ctx: &mut SystemContext) {}
|
fn update(&mut self, ctx: &mut SystemContext) {
|
||||||
|
// if let Some(mut debug_ui) = ctx.platform_context.imgui_ui.as_ref().map(|ui| ui.borrow_mut()) {
|
||||||
|
// debug_ui.text("Hello World!");
|
||||||
|
// }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
|
|
|
||||||
|
|
@ -14,3 +14,6 @@ raidillon_assets = { path = "../asset" }
|
||||||
raidillon_ecs = { path = "../ecs" }
|
raidillon_ecs = { path = "../ecs" }
|
||||||
winit = "0.30.12"
|
winit = "0.30.12"
|
||||||
indexmap = "2.10.0"
|
indexmap = "2.10.0"
|
||||||
|
imgui = "0.12.0"
|
||||||
|
imgui-winit-support = "0.13.0"
|
||||||
|
imgui-glium-renderer = "0.13.0"
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,6 @@ pub mod gltf_loader;
|
||||||
pub mod system;
|
pub mod system;
|
||||||
mod render;
|
mod render;
|
||||||
|
|
||||||
pub use assets::{GliumAssetManager};
|
pub use assets::GliumAssetManager;
|
||||||
pub use platform::GliumPlatform;
|
pub use platform::GliumPlatform;
|
||||||
pub use system::RenderingSystem;
|
pub use system::RenderingSystem;
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ use winit::event::{Event, WindowEvent};
|
||||||
use raidillon_assets::{ModelManager, ModelManagerRef};
|
use raidillon_assets::{ModelManager, ModelManagerRef};
|
||||||
use raidillon_core::Engine;
|
use raidillon_core::Engine;
|
||||||
use crate::{GliumAssetManager};
|
use crate::{GliumAssetManager};
|
||||||
|
use crate::render::debug_ui::ImguiBridge;
|
||||||
use crate::render::BasicMeshRenderingSystem;
|
use crate::render::BasicMeshRenderingSystem;
|
||||||
|
|
||||||
pub const MESH_RENDERER: &str = "mesh_renderer";
|
pub const MESH_RENDERER: &str = "mesh_renderer";
|
||||||
|
|
@ -25,6 +26,7 @@ pub struct GliumPlatform {
|
||||||
rendering_system_manager: RenderingSystemManager,
|
rendering_system_manager: RenderingSystemManager,
|
||||||
asset_manager: ModelManagerRef,
|
asset_manager: ModelManagerRef,
|
||||||
engine: Engine,
|
engine: Engine,
|
||||||
|
imgui_bridge: ImguiBridge,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Platform for GliumPlatform {
|
impl Platform for GliumPlatform {
|
||||||
|
|
@ -47,13 +49,16 @@ impl Platform for GliumPlatform {
|
||||||
Box::new(BasicMeshRenderingSystem::initialize(&display))
|
Box::new(BasicMeshRenderingSystem::initialize(&display))
|
||||||
);
|
);
|
||||||
|
|
||||||
|
let imgui_bridge = ImguiBridge::new(&display, &window).unwrap();
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
event_loop,
|
event_loop,
|
||||||
window,
|
window,
|
||||||
display,
|
display,
|
||||||
rendering_system_manager,
|
rendering_system_manager,
|
||||||
asset_manager,
|
asset_manager,
|
||||||
engine
|
engine,
|
||||||
|
imgui_bridge,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
77
glium_platform/src/render/debug_ui.rs
Normal file
77
glium_platform/src/render/debug_ui.rs
Normal file
|
|
@ -0,0 +1,77 @@
|
||||||
|
use std::cell::RefCell;
|
||||||
|
use std::rc::Rc;
|
||||||
|
use std::time::Instant;
|
||||||
|
use glium::Display;
|
||||||
|
use glium::glutin::surface::WindowSurface;
|
||||||
|
use imgui::{Context as ImguiContext};
|
||||||
|
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 crate::RenderingSystem;
|
||||||
|
use crate::system::RenderingContext;
|
||||||
|
use glium::Frame;
|
||||||
|
|
||||||
|
pub struct ImguiBridge {
|
||||||
|
imgui: ImguiContext,
|
||||||
|
platform: WinitPlatform,
|
||||||
|
renderer: ImguiGliumRenderer,
|
||||||
|
}
|
||||||
|
|
||||||
|
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),
|
||||||
|
{
|
||||||
|
let ui = self.imgui.frame();
|
||||||
|
|
||||||
|
build_ui(&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!()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn initialize(display: &Display<WindowSurface>) -> Self
|
||||||
|
where
|
||||||
|
Self: Sized,
|
||||||
|
{
|
||||||
|
todo!()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,2 +1,4 @@
|
||||||
mod basic;
|
mod basic;
|
||||||
|
pub mod debug_ui;
|
||||||
|
|
||||||
pub use basic::BasicMeshRenderingSystem;
|
pub use basic::BasicMeshRenderingSystem;
|
||||||
Loading…
Add table
Add a link
Reference in a new issue