Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-10 15:14:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for gltf::Material::unlit (#1341)

Browse source 
* Add support for gltf::Material::unlit
This commit is contained in:
Will Crichton 2021-01-31 20:13:16 -05:00 committed by GitHub
parent 06dbfffe2e
commit e6e23fdfa9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/bevy_gltf/Cargo.toml
View file

@ -26,7 +26,7 @@ bevy_math = { path = "../bevy_math", version = "0.4.0" }
bevy_scene = { path = "../bevy_scene", version = "0.4.0" } bevy_scene = { path = "../bevy_scene", version = "0.4.0" }
# other # 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 } image = { version = "0.23.12", default-features = false }
thiserror = "1.0" thiserror = "1.0"
anyhow = "1.0" anyhow = "1.0"

2
crates/bevy_gltf/src/loader.rs
View file

@ -298,7 +298,7 @@ fn load_material(material: &Material, load_context: &mut LoadContext) -> Handle<
LoadedAsset::new(StandardMaterial { LoadedAsset::new(StandardMaterial {
albedo: Color::rgba(color[0], color[1], color[2], color[3]), albedo: Color::rgba(color[0], color[1], color[2], color[3]),
albedo_texture: texture_handle, albedo_texture: texture_handle,
..Default::default() unlit: material.unlit(),
}) })
.with_dependencies(dependencies), .with_dependencies(dependencies),
) )

2
crates/bevy_pbr/src/lib.rs
View file

@ -46,7 +46,7 @@ impl Plugin for PbrPlugin {
Handle::<StandardMaterial>::default(), Handle::<StandardMaterial>::default(),
StandardMaterial { StandardMaterial {
albedo: Color::PINK, albedo: Color::PINK,
shaded: false, unlit: true,
albedo_texture: None, albedo_texture: None,
}, },
); );

4
crates/bevy_pbr/src/material.rs
View file

@ -11,7 +11,7 @@ pub struct StandardMaterial {
pub albedo_texture: Option<Handle<Texture>>, pub albedo_texture: Option<Handle<Texture>>,
#[render_resources(ignore)] #[render_resources(ignore)]
#[shader_def] #[shader_def]
pub shaded: bool, pub unlit: bool,
} }
impl Default for StandardMaterial { impl Default for StandardMaterial {
@ -19,7 +19,7 @@ impl Default for StandardMaterial {
StandardMaterial { StandardMaterial {
albedo: Color::rgb(1.0, 1.0, 1.0), albedo: Color::rgb(1.0, 1.0, 1.0),
albedo_texture: None, albedo_texture: None,
shaded: true, unlit: false,
} }
} }
} }

2
crates/bevy_pbr/src/render_graph/forward_pipeline/forward.frag
View file

@ -41,7 +41,7 @@ void main() {
v_Uv); v_Uv);
# endif # endif
# ifdef STANDARDMATERIAL_SHADED # ifndef STANDARDMATERIAL_UNLIT
vec3 normal = normalize(v_Normal); vec3 normal = normalize(v_Normal);
// accumulate color // accumulate color
vec3 color = AmbientColor; vec3 color = AmbientColor;

6
examples/3d/texture.rs
View file

@ -29,7 +29,7 @@ fn setup(
// this material renders the texture normally // this material renders the texture normally
let material_handle = materials.add(StandardMaterial { let material_handle = materials.add(StandardMaterial {
albedo_texture: Some(texture_handle.clone()), albedo_texture: Some(texture_handle.clone()),
shaded: false, unlit: true,
..Default::default() ..Default::default()
}); });
@ -37,14 +37,14 @@ fn setup(
let red_material_handle = materials.add(StandardMaterial { let red_material_handle = materials.add(StandardMaterial {
albedo: Color::rgba(1.0, 0.0, 0.0, 0.5), albedo: Color::rgba(1.0, 0.0, 0.0, 0.5),
albedo_texture: Some(texture_handle.clone()), albedo_texture: Some(texture_handle.clone()),
shaded: false, unlit: true,
}); });
// and lets make this one blue! (and also slightly transparent) // and lets make this one blue! (and also slightly transparent)
let blue_material_handle = materials.add(StandardMaterial { let blue_material_handle = materials.add(StandardMaterial {
albedo: Color::rgba(0.0, 0.0, 1.0, 0.5), albedo: Color::rgba(0.0, 0.0, 1.0, 0.5),
albedo_texture: Some(texture_handle), albedo_texture: Some(texture_handle),
shaded: false, unlit: true,
}); });
// add entities to the world // add entities to the world

6
examples/3d/z_sort_debug.rs
View file

@ -52,7 +52,7 @@ fn setup(
.spawn(PbrBundle { .spawn(PbrBundle {
mesh: cube_handle.clone(), mesh: cube_handle.clone(),
material: materials.add(StandardMaterial { material: materials.add(StandardMaterial {
shaded: false, unlit: true,
..Default::default() ..Default::default()
}), }),
transform: Transform::from_xyz(0.0, 0.0, 1.0), transform: Transform::from_xyz(0.0, 0.0, 1.0),
@ -65,7 +65,7 @@ fn setup(
.spawn(PbrBundle { .spawn(PbrBundle {
mesh: cube_handle.clone(), mesh: cube_handle.clone(),
material: materials.add(StandardMaterial { material: materials.add(StandardMaterial {
shaded: false, unlit: true,
..Default::default() ..Default::default()
}), }),
transform: Transform::from_xyz(0.0, 3.0, 0.0), transform: Transform::from_xyz(0.0, 3.0, 0.0),
@ -74,7 +74,7 @@ fn setup(
.spawn(PbrBundle { .spawn(PbrBundle {
mesh: cube_handle, mesh: cube_handle,
material: materials.add(StandardMaterial { material: materials.add(StandardMaterial {
shaded: false, unlit: true,
..Default::default() ..Default::default()
}), }),
transform: Transform::from_xyz(0.0, -3.0, 0.0), transform: Transform::from_xyz(0.0, -3.0, 0.0),