diff options
Diffstat (limited to 'engine/src/renderer')
| -rw-r--r-- | engine/src/renderer/opengl.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/engine/src/renderer/opengl.rs b/engine/src/renderer/opengl.rs index 2dd5467..a280073 100644 --- a/engine/src/renderer/opengl.rs +++ b/engine/src/renderer/opengl.rs @@ -8,7 +8,7 @@ use ecs::actions::Actions; use ecs::entity::obtainer::Obtainer as EntityObtainer; use ecs::event::component::{Changed, Removed}; use ecs::pair::{ChildOf, Pair, Wildcard}; -use ecs::phase::{Phase, START as START_PHASE}; +use ecs::phase::Phase; use ecs::query::term::Without; use ecs::sole::Single; use ecs::system::observer::Observe; @@ -156,8 +156,6 @@ impl ecs::extension::Extension for Extension collector.add_declared_entity(&RENDER_PHASE); collector.add_declared_entity(&POST_RENDER_PHASE); - collector.add_system(*START_PHASE, super::init); - collector.add_system(*RENDER_PHASE, super::enqueue_commands); collector.add_system(*RENDER_PHASE, handle_commands); @@ -893,13 +891,13 @@ fn handle_commands( ) .unwrap(); } - RendererCommand::CreateTexture(texture) => { + RendererCommand::CreateTexture(texture_asset) => { let Some(curr_gl_ctx) = &opt_curr_gl_ctx else { tracing::error!("No GL context is current"); continue; }; - let Some(texture_image) = assets.get(&texture.asset_handle) else { + let Some(texture) = assets.get(&texture_asset) else { tracing::error!("Texture asset is not loaded",); continue; }; @@ -907,8 +905,8 @@ fn handle_commands( if let Err(err) = create_texture_object( curr_gl_ctx, &mut renderer_object_store, - texture.asset_handle.id(), - texture_image, + texture_asset.id(), + &texture.image, &texture.properties, ) { tracing::error!("Failed to create texture object: {err}"); |