From e6e23fdfa97b0ebfad3495407d9dff27d75ab843 Mon Sep 17 00:00:00 2001
From: Will Crichton <wcrichto@cs.stanford.edu>
Date: Sun, 31 Jan 2021 20:13:16 -0500
Subject: [PATCH] Add support for gltf::Material::unlit (#1341)

* Add support for gltf::Material::unlit
---
 crates/bevy_gltf/Cargo.toml                                 | 2 +-
 crates/bevy_gltf/src/loader.rs                              | 2 +-
 crates/bevy_pbr/src/lib.rs                                  | 2 +-
 crates/bevy_pbr/src/material.rs                             | 4 ++--
 .../bevy_pbr/src/render_graph/forward_pipeline/forward.frag | 2 +-
 examples/3d/texture.rs                                      | 6 +++---
 examples/3d/z_sort_debug.rs                                 | 6 +++---
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/crates/bevy_gltf/Cargo.toml b/crates/bevy_gltf/Cargo.toml
index cb21281931..c0ef7d52ca 100644
--- a/crates/bevy_gltf/Cargo.toml
+++ b/crates/bevy_gltf/Cargo.toml
@@ -26,7 +26,7 @@ bevy_math = { path = "../bevy_math", version = "0.4.0" }
 bevy_scene = { path = "../bevy_scene", version = "0.4.0" }
 
 # other
-gltf = { version = "0.15.2", default-features = false, features = ["utils", "names"] }
+gltf = { version = "0.15.2", default-features = false, features = ["utils", "names", "KHR_materials_unlit"] }
 image = { version = "0.23.12", default-features = false }
 thiserror = "1.0"
 anyhow = "1.0"
diff --git a/crates/bevy_gltf/src/loader.rs b/crates/bevy_gltf/src/loader.rs
index 55fa2442ee..68a84fb02f 100644
--- a/crates/bevy_gltf/src/loader.rs
+++ b/crates/bevy_gltf/src/loader.rs
@@ -298,7 +298,7 @@ fn load_material(material: &Material, load_context: &mut LoadContext) -> Handle<
         LoadedAsset::new(StandardMaterial {
             albedo: Color::rgba(color[0], color[1], color[2], color[3]),
             albedo_texture: texture_handle,
-            ..Default::default()
+            unlit: material.unlit(),
         })
         .with_dependencies(dependencies),
     )
diff --git a/crates/bevy_pbr/src/lib.rs b/crates/bevy_pbr/src/lib.rs
index fc7a5b2c06..4d217367b7 100644
--- 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
index 7973c0a6f6..1244d23a11 100644
--- a/crates/bevy_pbr/src/material.rs
+++ b/crates/bevy_pbr/src/material.rs
@@ -11,7 +11,7 @@ pub struct StandardMaterial {
     pub albedo_texture: Option<Handle<Texture>>,
     #[render_resources(ignore)]
     #[shader_def]
-    pub shaded: bool,
+    pub unlit: bool,
 }
 
 impl Default for StandardMaterial {
@@ -19,7 +19,7 @@ impl Default for StandardMaterial {
         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
index c523b052fd..fc043c0db5 100644
--- 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;
diff --git a/examples/3d/texture.rs b/examples/3d/texture.rs
index 705979879b..32d0a929d9 100644
--- a/examples/3d/texture.rs
+++ b/examples/3d/texture.rs
@@ -29,7 +29,7 @@ fn setup(
     // this material renders the texture normally
     let material_handle = materials.add(StandardMaterial {
         albedo_texture: Some(texture_handle.clone()),
-        shaded: false,
+        unlit: true,
         ..Default::default()
     });
 
@@ -37,14 +37,14 @@ fn setup(
     let red_material_handle = materials.add(StandardMaterial {
         albedo: Color::rgba(1.0, 0.0, 0.0, 0.5),
         albedo_texture: Some(texture_handle.clone()),
-        shaded: false,
+        unlit: true,
     });
 
     // and lets make this one blue! (and also slightly transparent)
     let blue_material_handle = materials.add(StandardMaterial {
         albedo: Color::rgba(0.0, 0.0, 1.0, 0.5),
         albedo_texture: Some(texture_handle),
-        shaded: false,
+        unlit: true,
     });
 
     // add entities to the world
diff --git a/examples/3d/z_sort_debug.rs b/examples/3d/z_sort_debug.rs
index 337608401c..1565d86358 100644
--- a/examples/3d/z_sort_debug.rs
+++ b/examples/3d/z_sort_debug.rs
@@ -52,7 +52,7 @@ fn setup(
         .spawn(PbrBundle {
             mesh: cube_handle.clone(),
             material: materials.add(StandardMaterial {
-                shaded: false,
+                unlit: true,
                 ..Default::default()
             }),
             transform: Transform::from_xyz(0.0, 0.0, 1.0),
@@ -65,7 +65,7 @@ fn setup(
                 .spawn(PbrBundle {
                     mesh: cube_handle.clone(),
                     material: materials.add(StandardMaterial {
-                        shaded: false,
+                        unlit: true,
                         ..Default::default()
                     }),
                     transform: Transform::from_xyz(0.0, 3.0, 0.0),
@@ -74,7 +74,7 @@ fn setup(
                 .spawn(PbrBundle {
                     mesh: cube_handle,
                     material: materials.add(StandardMaterial {
-                        shaded: false,
+                        unlit: true,
                         ..Default::default()
                     }),
                     transform: Transform::from_xyz(0.0, -3.0, 0.0),