mirror of
https://github.com/bevyengine/bevy
synced 2024-11-10 23:24:44 +00:00
b1a91a823f
* bevy_pbr2: Add support for most of the StandardMaterial textures Normal maps are not included here as they require tangents in a vertex attribute. * bevy_pbr2: Ensure RenderCommandQueue is ready for PbrShaders init * texture_pipelined: Add a light to the scene so we can see stuff * WIP bevy_pbr2: back to front sorting hack * bevy_pbr2: Uniform control flow for texture sampling in pbr.frag From 'fintelia' on the Bevy Render Rework Round 2 discussion: "My understanding is that GPUs these days never use the "execute both branches and select the result" strategy. Rather, what they do is evaluate the branch condition on all threads of a warp, and jump over it if all of them evaluate to false. If even a single thread needs to execute the if statement body, however, then the remaining threads are paused until that is completed." * bevy_pbr2: Simplify texture and sampler names The StandardMaterial_ prefix is no longer needed * bevy_pbr2: Match default 'AmbientColor' of current bevy_pbr for now * bevy_pbr2: Convert from non-linear to linear sRGB for the color uniform * bevy_pbr2: Add pbr_pipelined example * Fix view vector in pbr frag to work in ortho * bevy_pbr2: Use a 90 degree y fov and light range projection for lights * bevy_pbr2: Add AmbientLight resource * bevy_pbr2: Convert PointLight color to linear sRGB for use in fragment shader * bevy_pbr2: pbr.frag: Rename PointLight.projection to view_projection The uniform contains the view_projection matrix so this was incorrect. * bevy_pbr2: PointLight is an OmniLight as it has a radius * bevy_pbr2: Factoring out duplicated code * bevy_pbr2: Implement RenderAsset for StandardMaterial * Remove unnecessary texture and sampler clones * fix comment formatting * remove redundant Buffer:from * Don't extract meshes when their material textures aren't ready * make missing textures in the queue step an error Co-authored-by: Aevyrie <aevyrie@gmail.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com>
109 lines
3.1 KiB
Rust
109 lines
3.1 KiB
Rust
use bevy::{
|
|
core::Time,
|
|
diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
|
|
ecs::prelude::*,
|
|
input::Input,
|
|
math::Vec3,
|
|
pbr2::{OmniLightBundle, PbrBundle, StandardMaterial},
|
|
prelude::{App, Assets, KeyCode, Transform},
|
|
render2::{
|
|
camera::PerspectiveCameraBundle,
|
|
color::Color,
|
|
mesh::{shape, Mesh},
|
|
},
|
|
PipelinedDefaultPlugins,
|
|
};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(PipelinedDefaultPlugins)
|
|
.add_plugin(FrameTimeDiagnosticsPlugin::default())
|
|
.add_plugin(LogDiagnosticsPlugin::default())
|
|
.add_startup_system(setup.system())
|
|
.add_system(movement.system())
|
|
.run();
|
|
}
|
|
|
|
struct Movable;
|
|
|
|
/// set up a simple 3D scene
|
|
fn setup(
|
|
mut commands: Commands,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
) {
|
|
// plane
|
|
commands.spawn_bundle(PbrBundle {
|
|
mesh: meshes.add(Mesh::from(shape::Plane { size: 5.0 })),
|
|
material: materials.add(StandardMaterial {
|
|
base_color: Color::INDIGO,
|
|
perceptual_roughness: 1.0,
|
|
..Default::default()
|
|
}),
|
|
..Default::default()
|
|
});
|
|
// cube
|
|
commands
|
|
.spawn_bundle(PbrBundle {
|
|
mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
|
|
material: materials.add(StandardMaterial {
|
|
base_color: Color::PINK,
|
|
perceptual_roughness: 0.0,
|
|
metallic: 1.0,
|
|
reflectance: 1.0,
|
|
..Default::default()
|
|
}),
|
|
transform: Transform::from_xyz(0.0, 1.0, 0.0),
|
|
..Default::default()
|
|
})
|
|
.insert(Movable);
|
|
// sphere
|
|
commands
|
|
.spawn_bundle(PbrBundle {
|
|
mesh: meshes.add(Mesh::from(shape::UVSphere {
|
|
radius: 0.5,
|
|
..Default::default()
|
|
})),
|
|
material: materials.add(StandardMaterial {
|
|
base_color: Color::LIME_GREEN,
|
|
..Default::default()
|
|
}),
|
|
transform: Transform::from_xyz(1.5, 1.0, 1.5),
|
|
..Default::default()
|
|
})
|
|
.insert(Movable);
|
|
// light
|
|
commands.spawn_bundle(OmniLightBundle {
|
|
transform: Transform::from_xyz(5.0, 8.0, 2.0),
|
|
..Default::default()
|
|
});
|
|
// camera
|
|
commands.spawn_bundle(PerspectiveCameraBundle {
|
|
transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
..Default::default()
|
|
});
|
|
}
|
|
|
|
fn movement(
|
|
input: Res<Input<KeyCode>>,
|
|
time: Res<Time>,
|
|
mut query: Query<&mut Transform, With<Movable>>,
|
|
) {
|
|
for mut transform in query.iter_mut() {
|
|
let mut direction = Vec3::ZERO;
|
|
if input.pressed(KeyCode::Up) {
|
|
direction.y += 1.0;
|
|
}
|
|
if input.pressed(KeyCode::Down) {
|
|
direction.y -= 1.0;
|
|
}
|
|
if input.pressed(KeyCode::Left) {
|
|
direction.x -= 1.0;
|
|
}
|
|
if input.pressed(KeyCode::Right) {
|
|
direction.x += 1.0;
|
|
}
|
|
|
|
transform.translation += time.delta_seconds() * 2.0 * direction;
|
|
}
|
|
}
|