From bcc91b3db8cd50795c21860cd7797581199d5589 Mon Sep 17 00:00:00 2001 From: HampusM Date: Wed, 19 Aug 2026 22:34:34 +0200 Subject: refactor(engine): move default shader bindings system to main_render_pass mod --- engine/src/rendering/shader.rs | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'engine/src/rendering/shader.rs') diff --git a/engine/src/rendering/shader.rs b/engine/src/rendering/shader.rs index 6f50a79..12fc9c1 100644 --- a/engine/src/rendering/shader.rs +++ b/engine/src/rendering/shader.rs @@ -31,25 +31,18 @@ use crate::asset::{ }; use crate::builder; use crate::ecs::pair::ChildOf; -use crate::ecs::phase::{Phase, POST_UPDATE as POST_UPDATE_PHASE}; +use crate::ecs::phase::Phase; use crate::ecs::sole::Single; -use crate::ecs::{declare_entity, pair, Component, Sole}; +use crate::ecs::{declare_entity, pair, Sole}; use crate::mesh::vertex_buffer::VertexLabel; pub mod cursor; -pub mod default; pub const STD_VERTEX_INPUT_SEMANTIC_NAME_POSITION: &str = "STD_POSITION"; pub const STD_VERTEX_INPUT_SEMANTIC_NAME_NORMAL: &str = "STD_NORMAL"; pub const STD_VERTEX_INPUT_SEMANTIC_NAME_UV: &str = "STD_UV"; pub const STD_VERTEX_INPUT_SEMANTIC_NAME_COLOR: &str = "STD_COLOR"; -#[derive(Debug, Clone, Component)] -pub struct Shader -{ - pub asset_handle: AssetHandle, -} - /// Shader module. #[derive(Debug)] pub struct ModuleSource @@ -1319,13 +1312,6 @@ pub(super) fn prepare(collector: &mut crate::ecs::extension::Collector<'_>) collector.add_system(*INIT_PHASE, initialize); collector.add_system(*IMPORT_SHADERS_PHASE, load_modules); - - collector.add_system(*INIT_PHASE, crate::rendering::shader::default::initialize); - - collector.add_system( - *POST_UPDATE_PHASE, - crate::rendering::shader::default::enqueue_set_shader_bindings, - ); } fn initialize(mut assets: Single) -> Result<(), crate::Error> -- cgit v1.2.3-18-g5258