Rename StandardMaterial::shaded to unlit

bevyengine · Feb 1, 2021 · 3241fb8 · 3241fb8
1 parent 6d7ae6d
commit 3241fb8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/crates/bevy_pbr/src/lib.rs b/crates/bevy_pbr/src/lib.rs
@@ -46,7 +46,7 @@ impl Plugin for PbrPlugin {
  Handle::<StandardMaterial>::default(),
  StandardMaterial {
  albedo: Color::PINK,
- shaded: false,
+ unlit: true,
  albedo_texture: None,
  },
  );

diff --git a/crates/bevy_pbr/src/material.rs b/crates/bevy_pbr/src/material.rs
@@ -11,15 +11,15 @@ pub struct StandardMaterial {
  pub albedo_texture: Option<Handle<Texture>>,
  #[render_resources(ignore)]
  #[shader_def]
- pub shaded: bool,
+ pub unlit: bool,
 }
 
 impl Default for StandardMaterial {
  fn default() -> Self {
  StandardMaterial {
  albedo: Color::rgb(1.0, 1.0, 1.0),
  albedo_texture: None,
- shaded: true,
+ unlit: false,
  }
  }
 }

diff --git a/crates/bevy_pbr/src/render_graph/forward_pipeline/forward.frag b/crates/bevy_pbr/src/render_graph/forward_pipeline/forward.frag
@@ -41,7 +41,7 @@ void main() {
  v_Uv);
 # endif
 
-# ifdef STANDARDMATERIAL_SHADED
+# ifndef STANDARDMATERIAL_UNLIT
  vec3 normal = normalize(v_Normal);
  // accumulate color
  vec3 color = AmbientColor;