From 23c49a0f5c908d9b2476c408f30b37118cd8e28f Mon Sep 17 00:00:00 2001 From: HampusM Date: Sun, 5 Jan 2025 22:10:00 +0100 Subject: chore(engine): make query component tuple type elems references --- engine/src/camera/fly.rs | 2 +- engine/src/renderer/opengl.rs | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/engine/src/camera/fly.rs b/engine/src/camera/fly.rs index b71f875..087f727 100644 --- a/engine/src/camera/fly.rs +++ b/engine/src/camera/fly.rs @@ -75,7 +75,7 @@ pub struct Options } fn update( - camera_query: Query<(Camera, Position, Fly, ActiveCamera)>, + camera_query: Query<(&mut Camera, &mut Position, &mut Fly, &ActiveCamera)>, keys: Single, cursor: Single, cursor_flags: Single, diff --git a/engine/src/renderer/opengl.rs b/engine/src/renderer/opengl.rs index 236465d..a41f61a 100644 --- a/engine/src/renderer/opengl.rs +++ b/engine/src/renderer/opengl.rs @@ -69,14 +69,14 @@ use crate::vector::{Vec2, Vec3}; use crate::vertex::{AttributeComponentType, Vertex}; use crate::window::Window; -type RenderableEntity = ( - Mesh, - Material, - Option, - Option, - Option, - Option, - Option, +type RenderableEntity<'a> = ( + &'a Mesh, + &'a Material, + &'a Option, + &'a Option, + &'a Option, + &'a Option, + &'a Option, ); #[derive(Debug, Default)] @@ -133,10 +133,10 @@ fn initialize(window: Single) #[allow(clippy::too_many_arguments)] fn render( - query: Query>>, - point_light_query: Query<(PointLight,)>, - directional_lights: Query<(DirectionalLight,)>, - camera_query: Query<(Camera, Position, ActiveCamera)>, + query: Query, Not>>, + point_light_query: Query<(&PointLight,)>, + directional_lights: Query<(&DirectionalLight,)>, + camera_query: Query<(&Camera, &Position, &ActiveCamera)>, window: Single, global_light: Single, mut gl_objects: Local, -- cgit v1.2.3-18-g5258