Fix merge stomp.

Author: tychedelia

crates/processing_render/src/material/mod.rs

@@ -55,35 +55,42 @@ pub enum MaterialValue {
 
 pub fn create_pbr(
     mut commands: Commands,
-    mut materials: ResMut<Assets<StandardMaterial>>,
+    mut materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, ProcessingMaterial>>>,
 ) -> Entity {
-    let handle = materials.add(StandardMaterial {
-        unlit: false,
-        cull_mode: None,
-        ..default()
+    let handle = materials.add(ExtendedMaterial {
+        base: StandardMaterial {
+            unlit: false,
+            cull_mode: None,
+            ..default()
+        },
+        extension: ProcessingMaterial {
+            blend_state: None,
+        },
     });
     commands.spawn(UntypedMaterial(handle.untyped())).id()
 }
 
 pub fn set_property(
     In((entity, name, value)): In<(Entity, String, MaterialValue)>,
     material_handles: Query<&UntypedMaterial>,
-    mut standard_materials: ResMut<Assets<StandardMaterial>>,
+    mut extended_materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, ProcessingMaterial>>>,
     mut custom_materials: ResMut<Assets<custom::CustomMaterial>>,
 ) -> error::Result<()> {
     let untyped = material_handles
         .get(entity)
         .map_err(|_| ProcessingError::MaterialNotFound)?;
 
-    // Try StandardMaterial
-    if let Ok(handle) = untyped.0.clone().try_typed::<StandardMaterial>() {
-        let mut standard = standard_materials
+    if let Ok(handle) = untyped
+        .0
+        .clone()
+        .try_typed::<ExtendedMaterial<StandardMaterial, ProcessingMaterial>>()
+    {
+        let mut extended = extended_materials
             .get_mut(&handle)
             .ok_or(ProcessingError::MaterialNotFound)?;
-        return pbr::set_property(&mut standard, &name, &value);
+        return pbr::set_property(&mut extended.base, &name, &value);
     }
 
-    // Try CustomMaterial
     if let Ok(handle) = untyped.0.clone().try_typed::<custom::CustomMaterial>() {
         let mut mat = custom_materials
             .get_mut(&handle)
@@ -98,14 +105,18 @@ pub fn destroy(
     In(entity): In<Entity>,
     mut commands: Commands,
     material_handles: Query<&UntypedMaterial>,
-    mut standard_materials: ResMut<Assets<StandardMaterial>>,
+    mut extended_materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, ProcessingMaterial>>>,
     mut custom_materials: ResMut<Assets<custom::CustomMaterial>>,
 ) -> error::Result<()> {
     let untyped = material_handles
         .get(entity)
         .map_err(|_| ProcessingError::MaterialNotFound)?;
-    if let Ok(handle) = untyped.0.clone().try_typed::<StandardMaterial>() {
-        standard_materials.remove(&handle);
+    if let Ok(handle) = untyped
+        .0
+        .clone()
+        .try_typed::<ExtendedMaterial<StandardMaterial, ProcessingMaterial>>()
+    {
+        extended_materials.remove(&handle);
     }
     if let Ok(handle) = untyped.0.clone().try_typed::<custom::CustomMaterial>() {
         custom_materials.remove(&handle);