refactor(engine): rename rendering::SurfaceSpec to Surface

4 files changed, 22 insertions, 22 deletions

diff --git a/engine/src/rendering.rs b/engine/src/rendering.rs
index d41257c..57d9698 100644
--- a/engine/src/rendering.rs
+++ b/engine/src/rendering.rs
@@ -169,7 +169,7 @@ impl Default for GraphicsPropertiesBuilder
 }
 
 #[derive(Debug, Component)]
-pub struct SurfaceSpec
+pub struct Surface
 {
     pub id: SurfaceId,
 }
@@ -429,7 +429,7 @@ impl Default for CommandQueue
 
 #[tracing::instrument(skip_all)]
 fn enqueue_commands_from_render_passes(
-    window_surface_spec_query: Query<(&SurfaceSpec, With<Window>, With<TargetWindow>)>,
+    window_surface_query: Query<(&Surface, With<Window>, With<TargetWindow>)>,
     mut command_queue: Single<CommandQueue>,
     mut render_passes: Single<RenderPasses>,
     mut active_draw_props: Local<ActiveDrawProperties>,
@@ -473,8 +473,8 @@ fn enqueue_commands_from_render_passes(
 
     active_draw_props.draw_properties = last_render_pass_draw_props;
 
-    for (window_surface_spec,) in &window_surface_spec_query {
-        command_queue.push(Command::SwapBuffers(window_surface_spec.id));
+    for (window_surface,) in &window_surface_query {
+        command_queue.push(Command::SwapBuffers(window_surface.id));
     }
 }
 
@@ -495,7 +495,7 @@ fn handle_window_changed(
             continue;
         }
 
-        let Some(window_surface_spec) = window_ent.get::<SurfaceSpec>() else {
+        let Some(window_surface) = window_ent.get::<Surface>() else {
             continue;
         };
 
@@ -508,13 +508,13 @@ fn handle_window_changed(
         );
 
         command_queue.queue.push_front(Command::SetSurfaceSize(
-            window_surface_spec.id,
+            window_surface.id,
             evt_match.get_ent_target_comp().inner_size.clone(),
         ));
 
         command_queue
             .queue
-            .push_front(Command::MakeCurrent(window_surface_spec.id));
+            .push_front(Command::MakeCurrent(window_surface.id));
     }
 }
 
@@ -544,15 +544,15 @@ fn handle_window_removed(
             "Handling removal of window"
         );
 
-        let Some(window_surface_spec) = window_ent.get::<SurfaceSpec>() else {
+        let Some(window_surface) = window_ent.get::<Surface>() else {
             continue;
         };
 
-        actions.remove_comps::<(SurfaceSpec,)>(window_ent_id);
+        actions.remove_comps::<(Surface,)>(window_ent_id);
 
         command_queue
             .queue
-            .push_front(Command::RemoveSurface(window_surface_spec.id));
+            .push_front(Command::RemoveSurface(window_surface.id));
     }
 }
 
diff --git a/engine/src/rendering/backend/opengl.rs b/engine/src/rendering/backend/opengl.rs
index 6a8637b..33a1712 100644
--- a/engine/src/rendering/backend/opengl.rs
+++ b/engine/src/rendering/backend/opengl.rs
@@ -114,8 +114,8 @@ use crate::rendering::{
     DrawMeshOptions,
     DrawPropertiesUpdateFlags,
     GraphicsProperties,
+    Surface,
     SurfaceId,
-    SurfaceSpec,
     TargetWindow,
     POST_RENDER_PHASE,
     RENDER_PHASE,
@@ -286,7 +286,7 @@ fn init_window_graphics(
         &Window,
         &WindowGlConfig,
         With<TargetWindow>,
-        Without<SurfaceSpec>,
+        Without<Surface>,
     )>,
     windowing_context: Single<WindowingContext>,
     graphics_props: Single<GraphicsProperties>,
@@ -427,7 +427,7 @@ fn init_window_graphics(
 
         let surface_id = SurfaceId::new_unique();
 
-        actions.add_components(window_ent_id, (SurfaceSpec { id: surface_id },));
+        actions.add_components(window_ent_id, (Surface { id: surface_id },));
 
         graphics_ctx.surfaces.insert(
             surface_id,
diff --git a/engine/src/rendering/main_render_pass.rs b/engine/src/rendering/main_render_pass.rs
index 13bb4e4..21c0745 100644
--- a/engine/src/rendering/main_render_pass.rs
+++ b/engine/src/rendering/main_render_pass.rs
@@ -46,7 +46,7 @@ use crate::rendering::{
     MeshUsage,
     RenderPass,
     RenderPasses,
-    SurfaceSpec,
+    Surface,
     TargetWindow,
 };
 use crate::scene::{Active as ActiveScene, Scene};
@@ -101,7 +101,7 @@ pub fn add_main_render_pass(
         &ActiveCamera,
         Traverse<(With<Scene>, With<ActiveScene>), TraverseUp, ChildOf>,
     )>,
-    window_query: Query<(&Window, &SurfaceSpec, With<TargetWindow>)>,
+    window_query: Query<(&Window, &Surface, With<TargetWindow>)>,
     scene_query: Query<(
         Option<&EnvironmentalLighting>,
         Option<&SkyBox>,
@@ -165,10 +165,10 @@ pub fn add_main_render_pass(
         draw_properties: DrawProperties::default(),
     });
 
-    for (window, surface_spec) in &window_query {
+    for (window, window_surface) in &window_query {
         render_pass
             .commands
-            .push(Command::MakeCurrent(surface_spec.id));
+            .push(Command::MakeCurrent(window_surface.id));
 
         let default_texture_asset = assets
             .get_handle_to_loaded::<Texture>(TEXTURE_WHITE_1X1_ASSET_LABEL.clone())
diff --git a/engine/src/ui/dear_imgui.rs b/engine/src/ui/dear_imgui.rs
index 8f58ff6..e9fc5ff 100644
--- a/engine/src/ui/dear_imgui.rs
+++ b/engine/src/ui/dear_imgui.rs
@@ -70,8 +70,8 @@ use crate::rendering::{
     RenderPass,
     RenderPasses,
     ScissorBox,
+    Surface,
     SurfaceId,
-    SurfaceSpec,
     PRE_RENDER_PHASE,
 };
 use crate::texture::{Properties as TextureProperties, Tex2D, Texture};
@@ -238,7 +238,7 @@ fn handle_window_changed(
 }
 
 fn update(
-    target_window_query: Query<(&Window, &SurfaceSpec, With<TargetWindow>)>,
+    target_window_query: Query<(&Window, &Surface, With<TargetWindow>)>,
     mut context: Single<Context>,
     time: Single<Time>,
     mut assets: Single<Assets>,
@@ -261,7 +261,7 @@ fn update(
     let mouse = mouse.get()?;
     let mouse_buttons = mouse_buttons.get()?;
 
-    let Some((window, window_surface_spec)) = target_window_query.iter().next() else {
+    let Some((window, window_surface)) = target_window_query.iter().next() else {
         return Ok(());
     };
 
@@ -272,7 +272,7 @@ fn update(
             let Some((shader_asset, mesh_obj_id, mesh)) = initialize_context(
                 context,
                 &window,
-                window_surface_spec.id,
+                window_surface.id,
                 assets,
                 render_passes,
                 &shader_context,
@@ -302,7 +302,7 @@ fn update(
                 context,
                 render_passes,
                 shader_context,
-                window_surface_spec.id,
+                window_surface.id,
                 shader_asset.clone(),
                 mesh_obj_id,
                 &mut mesh,