From 8d66064dd8cd2fa150d561c7e36d7c6fbe59d01f Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Sun, 29 Sep 2024 15:03:50 -0700 Subject: [PATCH] Rename NannouMesh -> NannouTransient. --- bevy_nannou_draw/src/render.rs | 10 +++++----- nannou/src/app.rs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bevy_nannou_draw/src/render.rs b/bevy_nannou_draw/src/render.rs index 00e8b3bfc..b133f1c88 100644 --- a/bevy_nannou_draw/src/render.rs +++ b/bevy_nannou_draw/src/render.rs @@ -97,7 +97,7 @@ impl Plugin for NannouRenderPlugin { app.add_systems(Startup, setup_default_texture) .add_plugins(( ExtractComponentPlugin::::default(), - ExtractComponentPlugin::::default(), + ExtractComponentPlugin::::default(), ExtractComponentPlugin::::default(), ExtractComponentPlugin::::default(), ExtractComponentPlugin::::default(), @@ -656,7 +656,7 @@ fn update_draw_mesh( Visibility::default(), InheritedVisibility::default(), ViewVisibility::default(), - NannouMesh, + NannouTransient, NoFrustumCulling, DrawIndex(idx), window_layers.clone(), @@ -693,7 +693,7 @@ fn update_draw_mesh( Visibility::default(), InheritedVisibility::default(), ViewVisibility::default(), - NannouMesh, + NannouTransient, NoFrustumCulling, DrawIndex(idx), window_layers.clone(), @@ -715,7 +715,7 @@ fn update_draw_mesh( InheritedVisibility::default(), ViewVisibility::default(), ShaderModelMesh, - NannouMesh, + NannouTransient, NoFrustumCulling, DrawIndex(idx), window_layers.clone(), @@ -744,7 +744,7 @@ fn check_and_despawn_empty_mesh(meshes: &mut ResMut>, mesh: &mut Ha pub struct DrawIndex(pub usize); #[derive(Component, ExtractComponent, Clone)] -pub struct NannouMesh; +pub struct NannouTransient; #[derive(Component, ExtractComponent, Clone)] pub struct ShaderModelMesh; diff --git a/nannou/src/app.rs b/nannou/src/app.rs index 6a38eefee..95a14716f 100644 --- a/nannou/src/app.rs +++ b/nannou/src/app.rs @@ -40,7 +40,7 @@ use bevy_inspector_egui::DefaultInspectorConfigPlugin; use crate::frame::{Frame, FramePlugin}; use crate::prelude::bevy_ecs::system::SystemState; use crate::prelude::bevy_reflect::DynamicTyped; -use crate::prelude::render::{NannouMesh, NannouShaderModelPlugin, ShaderModel}; +use crate::prelude::render::{NannouTransient, NannouShaderModelPlugin, ShaderModel}; use crate::render::{ compute::{Compute, ComputeModel, ComputePlugin, ComputeShaderHandle, ComputeState}, NannouRenderNode, RenderApp, RenderPlugin, @@ -1075,7 +1075,7 @@ where fn first( mut commands: Commands, bg_color_q: Query>, - meshes_q: Query>, + meshes_q: Query>, ) where M: 'static + Send + Sync, {