Merge branch 'main' into update-version

studio/src/ui/inspector.rs

@@ -17,6 +17,7 @@ use space_editor::{
 };
 use wasm_bindgen::prelude::*;
 
+use crate::material::short_material::ShortMaterial;
 use crate::{
     interaction::Selection,
     wasm::{self, StaticBuffer, WasmMessageBuffer},
@@ -91,7 +92,6 @@ impl Plugin for InspectorPlugin {
                     .chain()
                     .before(space_editor::space_prefab::sub_scene::prepare_auto_scene),
             );
-            app.add_systems(PostUpdate, apply_short_materials);
 
             app.world.resource_mut::<InspectGetters>().getters.insert(
                 StandardMaterial::get_type_registration()
@@ -139,25 +139,6 @@ fn create_short_materials(
     }
 }
 
-fn apply_short_materials(
-    mut commands: Commands,
-    q_mats: Query<(Entity, &Handle<StandardMaterial>, &ShortMaterial)>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-) {
-    for (entity, handle, short) in q_mats.iter() {
-        let Some(material) = materials.get_mut(handle) else {
-            continue;
-        };
-
-        material.base_color = short.base_color;
-        material.perceptual_roughness = short.perceptual_roughness;
-        material.metallic = short.metallic;
-        material.reflectance = short.reflectance;
-
-        commands.entity(entity).remove::<ShortMaterial>();
-    }
-}
-
 #[derive(Resource, Default)]
 struct InspectGetters {
     getters: HashMap<
@@ -588,26 +569,6 @@ fn auto_serialize_asset<T: Asset + Reflect + GetTypeRegistration>(
     ev_update_description.send(UpdateEntityDescription);
 }
 
-#[derive(Reflect, Default, Clone, Component)]
-#[reflect(Default, Component)]
-struct ShortMaterial {
-    pub base_color: Color,
-    pub perceptual_roughness: f32,
-    pub metallic: f32,
-    pub reflectance: f32,
-}
-
-impl ShortMaterial {
-    pub fn new(material: &StandardMaterial) -> Self {
-        Self {
-            base_color: material.base_color,
-            perceptual_roughness: material.perceptual_roughness,
-            metallic: material.metallic,
-            reflectance: material.reflectance,
-        }
-    }
-}
-
 fn serialize_standart_materal(
     r_selection: Option<Res<Selection>>,
     q_m: Query<&Handle<StandardMaterial>>,