Remove _factor from StandardMaterial properties

crates/bevy_gltf/src/loader.rs

@@ -277,10 +277,10 @@ fn load_material(material: &Material, load_context: &mut LoadContext) -> Handle<
     load_context.set_labeled_asset(
         &material_label,
         LoadedAsset::new(StandardMaterial {
-            base_color_factor: Color::rgba(color[0], color[1], color[2], color[3]),
+            base_color: Color::rgba(color[0], color[1], color[2], color[3]),
             base_color_texture: texture_handle,
-            roughness_factor: pbr.roughness_factor(),
-            metallic_factor: pbr.metallic_factor(),
+            roughness: pbr.roughness_factor(),
+            metallic: pbr.metallic_factor(),
             unlit: material.unlit(),
             ..Default::default()
         })

crates/bevy_pbr/src/lib.rs

@@ -42,7 +42,7 @@ impl Plugin for PbrPlugin {
         materials.set_untracked(
             Handle::<StandardMaterial>::default(),
             StandardMaterial {
-                base_color_factor: Color::PINK,
+                base_color: Color::PINK,
                 unlit: true,
                 ..Default::default()
             },

crates/bevy_pbr/src/material.rs

@@ -8,14 +8,20 @@ use bevy_render::{color::Color, renderer::RenderResources, shader::ShaderDefs, t
 #[uuid = "dace545e-4bc6-4595-a79d-c224fc694975"]
 pub struct StandardMaterial {
     /// Doubles as diffuse albedo for non-metallic, specular for metallic and a mix for everything in between
-    pub base_color_factor: Color,
+    /// If used together with a base_color_texture, this is factored into the final base color
+    /// as `base_color * base_color_texture_value`
+    pub base_color: Color,
     #[shader_def]
     pub base_color_texture: Option<Handle<Texture>>,
     /// Linear perceptual roughness, clamped to [0.089, 1.0] in the shader
     /// Defaults to minimum of 0.089
-    pub roughness_factor: f32,
+    /// If used together with a roughness/metallic texture, this is factored into the final base color
+    /// as `roughness * roughness_texture_value`
+    pub roughness: f32,
     /// From [0.0, 1.0], dielectric to pure metallic
-    pub metallic_factor: f32,
+    /// If used together with a roughness/metallic texture, this is factored into the final base color
+    /// as `metallic * metallic_texture_value`
+    pub metallic: f32,
     /// Specular intensity for non-metals on a linear scale of [0.0, 1.0]
     /// defaults to 0.5 which is mapped to 4% reflectance in the shader
     pub reflectance: f32,
@@ -27,16 +33,16 @@ pub struct StandardMaterial {
 impl Default for StandardMaterial {
     fn default() -> Self {
         StandardMaterial {
-            base_color_factor: Color::rgb(1.0, 1.0, 1.0),
+            base_color: Color::rgb(1.0, 1.0, 1.0),
             base_color_texture: None,
             // This is the minimum the roughness is clamped to in shader code
             // See https://google.github.io/filament/Filament.html#materialsystem/parameterization/
             // It's the minimum floating point value that won't be rounded down to 0 in the calculations used.
             // Although technically for 32-bit floats, 0.045 could be used.
-            roughness_factor: 0.089,
+            roughness: 0.089,
             // Few materials are purely dielectric or metallic
             // This is just a default for mostly-dielectric
-            metallic_factor: 0.01,
+            metallic: 0.01,
             // Minimum real-world reflectance is 2%, most materials between 2-5%
             // Expressed in a linear scale and equivalent to 4% reflectance see https://google.github.io/filament/Material%20Properties.pdf
             reflectance: 0.5,
@@ -48,7 +54,7 @@ impl Default for StandardMaterial {
 impl From<Color> for StandardMaterial {
     fn from(color: Color) -> Self {
         StandardMaterial {
-            base_color_factor: color,
+            base_color: color,
             ..Default::default()
         }
     }

crates/bevy_pbr/src/render_graph/forward_pipeline/forward.frag

@@ -62,8 +62,8 @@ layout(set = 1, binding = 0) uniform Lights {
     Light SceneLights[MAX_LIGHTS];
 };
 
-layout(set = 3, binding = 0) uniform StandardMaterial_base_color_factor {
-    vec4 base_color_factor;
+layout(set = 3, binding = 0) uniform StandardMaterial_base_color {
+    vec4 base_color;
 };
 
 #ifdef STANDARDMATERIAL_BASE_COLOR_TEXTURE
@@ -74,11 +74,11 @@ layout(set = 3,
 
 #ifndef STANDARDMATERIAL_UNLIT
 
-layout(set = 3, binding = 3) uniform StandardMaterial_roughness_factor {
+layout(set = 3, binding = 3) uniform StandardMaterial_roughness {
     float perceptual_roughness;
 };
 
-layout(set = 3, binding = 4) uniform StandardMaterial_metallic_factor {
+layout(set = 3, binding = 4) uniform StandardMaterial_metallic {
     float metallic;
 };
 
@@ -248,7 +248,7 @@ vec3 reinhard_extended_luminance(vec3 color, float max_white_l) {
 #endif
 
 void main() {
-    vec4 output_color = base_color_factor;
+    vec4 output_color = base_color;
 #ifdef STANDARDMATERIAL_BASE_COLOR_TEXTURE
     output_color *= texture(sampler2D(StandardMaterial_base_color_texture,
                                       StandardMaterial_base_color_texture_sampler),

examples/3d/parenting.rs

@@ -29,7 +29,7 @@ fn setup(
 ) {
     let cube_handle = meshes.add(Mesh::from(shape::Cube { size: 2.0 }));
     let cube_material_handle = materials.add(StandardMaterial {
-        base_color_factor: Color::rgb(0.8, 0.7, 0.6),
+        base_color: Color::rgb(0.8, 0.7, 0.6),
         ..Default::default()
     });
 

examples/3d/pbr.rs

@@ -28,10 +28,10 @@ fn setup(
                         subdivisions: 32,
                     })),
                     material: materials.add(StandardMaterial {
-                        base_color_factor: Color::hex("ffd891").unwrap(),
+                        base_color: Color::hex("ffd891").unwrap(),
                         // vary key PBR parameters on a grid of spheres to show the effect
-                        metallic_factor: y01,
-                        roughness_factor: x01,
+                        metallic: y01,
+                        roughness: x01,
                         ..Default::default()
                     }),
                     transform: Transform::from_xyz(x as f32, y as f32, 0.0),

examples/3d/spawner.rs

@@ -30,7 +30,7 @@ fn move_cubes(
     for (mut transform, material_handle) in query.iter_mut() {
         let material = materials.get_mut(material_handle).unwrap();
         transform.translation += Vec3::new(1.0, 0.0, 0.0) * time.delta_seconds();
-        material.base_color_factor =
+        material.base_color =
             Color::BLUE * Vec3::splat((3.0 * time.seconds_since_startup() as f32).sin());
     }
 }
@@ -58,7 +58,7 @@ fn setup(
         commands.spawn(PbrBundle {
             mesh: cube_handle.clone(),
             material: materials.add(StandardMaterial {
-                base_color_factor: Color::rgb(
+                base_color: Color::rgb(
                     rng.gen_range(0.0..1.0),
                     rng.gen_range(0.0..1.0),
                     rng.gen_range(0.0..1.0),

examples/3d/texture.rs

@@ -35,15 +35,15 @@ fn setup(
 
     // this material modulates the texture to make it red (and slightly transparent)
     let red_material_handle = materials.add(StandardMaterial {
-        base_color_factor: Color::rgba(1.0, 0.0, 0.0, 0.5),
+        base_color: Color::rgba(1.0, 0.0, 0.0, 0.5),
         base_color_texture: Some(texture_handle.clone()),
         unlit: true,
         ..Default::default()
     });
 
     // and lets make this one blue! (and also slightly transparent)
     let blue_material_handle = materials.add(StandardMaterial {
-        base_color_factor: Color::rgba(0.0, 0.0, 1.0, 0.5),
+        base_color: Color::rgba(0.0, 0.0, 1.0, 0.5),
         base_color_texture: Some(texture_handle),
         unlit: true,
         ..Default::default()

examples/3d/z_sort_debug.rs

@@ -36,7 +36,7 @@ fn camera_order_color_system(
             if let Ok(material_handle) = material_query.get(visible_entity.entity) {
                 let material = materials.get_mut(&*material_handle).unwrap();
                 let value = 1.0 - (visible_entity.order.0.sqrt() - 10.0) / 7.0;
-                material.base_color_factor = Color::rgb(value, value, value);
+                material.base_color = Color::rgb(value, value, value);
             }
         }
     }

examples/asset/asset_loading.rs

@@ -39,7 +39,7 @@ fn setup(
 
     // You can also add assets directly to their Assets<T> storage:
     let material_handle = materials.add(StandardMaterial {
-        base_color_factor: Color::rgb(0.8, 0.7, 0.6),
+        base_color: Color::rgb(0.8, 0.7, 0.6),
         ..Default::default()
     });