Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - Add 3d shapes example #4613

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ path = "examples/3d/pbr.rs"
name = "shadow_biases"
path = "examples/3d/shadow_biases.rs"

[[example]]
name = "shapes"
path = "examples/3d/shapes.rs"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
path = "examples/3d/shapes.rs"
path = "examples/3d/3d_shapes.rs"

The problem with this is that if a user sees in the file tree shapes.rs thinks that the example name is shapes.

Remember to rename the file and change the reference to the README if you accept this.


[[example]]
name = "shadow_caster_receiver"
path = "examples/3d/shadow_caster_receiver.rs"
Expand Down
Binary file added assets/textures/uv_debug.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
86 changes: 86 additions & 0 deletions examples/3d/shapes.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
use bevy::prelude::*;

fn main() {
App::new()
.insert_resource(Msaa { samples: 4 })
.add_plugins(DefaultPlugins)
.add_startup_system(setup)
.add_system(rotate)
.run();
}

#[derive(Component)]
struct Shape;

const X_EXTENT: f32 = 14.;

fn setup(
mut commands: Commands,
mut meshes: ResMut<Assets<Mesh>>,
mut materials: ResMut<Assets<StandardMaterial>>,
asset_server: ResMut<AssetServer>,
) {
let debug_material = materials.add(StandardMaterial {
base_color_texture: Some(asset_server.load("textures/uv_debug.png")),
..default()
});

let shapes = [
meshes.add(shape::Cube::default().into()),
meshes.add(shape::Box::default().into()),
meshes.add(shape::Capsule::default().into()),
meshes.add(shape::Torus::default().into()),
meshes.add(shape::Icosphere::default().into()),
meshes.add(shape::UVSphere::default().into()),
];

let num_shapes = shapes.len();

for (i, shape) in shapes.into_iter().enumerate() {
commands
.spawn_bundle(PbrBundle {
mesh: shape,
material: debug_material.clone(),
transform: Transform {
translation: Vec3::new(
-X_EXTENT / 2. + i as f32 / (num_shapes - 1) as f32 * X_EXTENT,
2.0,
0.0,
),
..default()
},
..Default::default()
})
.insert(Shape);
}

commands.spawn_bundle(PointLightBundle {
point_light: PointLight {
intensity: 9000.0,
range: 100.,
shadows_enabled: true,
..Default::default()
},
transform: Transform::from_xyz(8.0, 16.0, 8.0),
..Default::default()
});

// ground plane
commands.spawn_bundle(PbrBundle {
mesh: meshes.add(shape::Plane { size: 50. }.into()),
material: materials.add(Color::SILVER.into()),
..Default::default()
});

commands.spawn_bundle(PerspectiveCameraBundle {
transform: Transform::from_xyz(0.0, 6., 12.0).looking_at(Vec3::new(0., 1., 0.), Vec3::Y),
..Default::default()
});
}

fn rotate(mut query: Query<&mut Transform, With<Shape>>, time: Res<Time>) {
for mut transform in query.iter_mut() {
transform.rotation = Quat::from_rotation_y(time.seconds_since_startup() as f32 / 2.)
* Quat::from_rotation_x(-std::f32::consts::PI / 4.)
}
}
1 change: 1 addition & 0 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ Example | File | Description
`texture` | [`3d/texture.rs`](./3d/texture.rs) | Shows configuration of texture materials
`update_gltf_scene` | [`3d/update_gltf_scene.rs`](./3d/update_gltf_scene.rs) | Update a scene from a gltf file, either by spawning the scene as a child of another entity, or by accessing the entities of the scene
`wireframe` | [`3d/wireframe.rs`](./3d/wireframe.rs) | Showcases wireframe rendering
`shapes` | [`3d/shapes.rs`](./3d/shapes.rs) | A scene showcasing more built-in shapes
rparrett marked this conversation as resolved.
Show resolved Hide resolved
rparrett marked this conversation as resolved.
Show resolved Hide resolved

## Animation

Expand Down