mirror of
https://github.com/bevyengine/bevy.git
synced 2026-05-06 06:06:42 -04:00
13877fa84d
# Objective - Allow the `Val`-helper functions to accept more types besides just `f32` Fixes #20549 ## Solution - Adds a new trait that can be implemented for numbers - That trait has a method that converts `self` to `f32` ## Testing - I tested it using Rust's testing framework (although I didn't leave the tests in, as I don't deem them important enough) <details> <summary>Rust test</summary> ```rust #[cfg(test)] mod tests { use super::*; #[test] fn test_val_helpers_work() { let p = px(10_u8); assert_eq!(p, Val::Px(10.0)); let p = px(10_u16); assert_eq!(p, Val::Px(10.0)); let p = px(10_u32); assert_eq!(p, Val::Px(10.0)); let p = px(10_u64); assert_eq!(p, Val::Px(10.0)); let p = px(10_u128); assert_eq!(p, Val::Px(10.0)); let p = px(10_i8); assert_eq!(p, Val::Px(10.0)); let p = px(10_i16); assert_eq!(p, Val::Px(10.0)); let p = px(10_i32); assert_eq!(p, Val::Px(10.0)); let p = px(10_i64); assert_eq!(p, Val::Px(10.0)); let p = px(10_i128); assert_eq!(p, Val::Px(10.0)); let p = px(10.3_f32); assert_eq!(p, Val::Px(10.3)); let p = px(10.6_f64); assert_eq!(p, Val::Px(10.6)); } } ``` </details> --- ## Showcase ```rust // Same as Val::Px(10.) px(10); px(10_u8); px(10.0); ```
142 lines
4.5 KiB
Rust
142 lines
4.5 KiB
Rust
//! Shows how to orbit camera around a static scene using pitch, yaw, and roll.
|
|
//!
|
|
//! See also: `first_person_view_model` example, which does something similar but as a first-person
|
|
//! camera view.
|
|
|
|
use std::{f32::consts::FRAC_PI_2, ops::Range};
|
|
|
|
use bevy::{input::mouse::AccumulatedMouseMotion, prelude::*};
|
|
|
|
#[derive(Debug, Resource)]
|
|
struct CameraSettings {
|
|
pub orbit_distance: f32,
|
|
pub pitch_speed: f32,
|
|
// Clamp pitch to this range
|
|
pub pitch_range: Range<f32>,
|
|
pub roll_speed: f32,
|
|
pub yaw_speed: f32,
|
|
}
|
|
|
|
impl Default for CameraSettings {
|
|
fn default() -> Self {
|
|
// Limiting pitch stops some unexpected rotation past 90° up or down.
|
|
let pitch_limit = FRAC_PI_2 - 0.01;
|
|
Self {
|
|
// These values are completely arbitrary, chosen because they seem to produce
|
|
// "sensible" results for this example. Adjust as required.
|
|
orbit_distance: 20.0,
|
|
pitch_speed: 0.003,
|
|
pitch_range: -pitch_limit..pitch_limit,
|
|
roll_speed: 1.0,
|
|
yaw_speed: 0.004,
|
|
}
|
|
}
|
|
}
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.init_resource::<CameraSettings>()
|
|
.add_systems(Startup, (setup, instructions))
|
|
.add_systems(Update, orbit)
|
|
.run();
|
|
}
|
|
|
|
/// Set up a simple 3D scene
|
|
fn setup(
|
|
mut commands: Commands,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
) {
|
|
commands.spawn((
|
|
Name::new("Camera"),
|
|
Camera3d::default(),
|
|
Transform::from_xyz(5.0, 5.0, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
));
|
|
|
|
commands.spawn((
|
|
Name::new("Plane"),
|
|
Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
|
|
MeshMaterial3d(materials.add(StandardMaterial {
|
|
base_color: Color::srgb(0.3, 0.5, 0.3),
|
|
// Turning off culling keeps the plane visible when viewed from beneath.
|
|
cull_mode: None,
|
|
..default()
|
|
})),
|
|
));
|
|
|
|
commands.spawn((
|
|
Name::new("Cube"),
|
|
Mesh3d(meshes.add(Cuboid::default())),
|
|
MeshMaterial3d(materials.add(Color::srgb(0.8, 0.7, 0.6))),
|
|
Transform::from_xyz(1.5, 0.51, 1.5),
|
|
));
|
|
|
|
commands.spawn((
|
|
Name::new("Light"),
|
|
PointLight::default(),
|
|
Transform::from_xyz(3.0, 8.0, 5.0),
|
|
));
|
|
}
|
|
|
|
fn instructions(mut commands: Commands) {
|
|
commands.spawn((
|
|
Name::new("Instructions"),
|
|
Text::new(
|
|
"Mouse up or down: pitch\n\
|
|
Mouse left or right: yaw\n\
|
|
Mouse buttons: roll",
|
|
),
|
|
Node {
|
|
position_type: PositionType::Absolute,
|
|
top: px(12),
|
|
left: px(12),
|
|
..default()
|
|
},
|
|
));
|
|
}
|
|
|
|
fn orbit(
|
|
mut camera: Single<&mut Transform, With<Camera>>,
|
|
camera_settings: Res<CameraSettings>,
|
|
mouse_buttons: Res<ButtonInput<MouseButton>>,
|
|
mouse_motion: Res<AccumulatedMouseMotion>,
|
|
time: Res<Time>,
|
|
) {
|
|
let delta = mouse_motion.delta;
|
|
let mut delta_roll = 0.0;
|
|
|
|
if mouse_buttons.pressed(MouseButton::Left) {
|
|
delta_roll -= 1.0;
|
|
}
|
|
if mouse_buttons.pressed(MouseButton::Right) {
|
|
delta_roll += 1.0;
|
|
}
|
|
|
|
// Mouse motion is one of the few inputs that should not be multiplied by delta time,
|
|
// as we are already receiving the full movement since the last frame was rendered. Multiplying
|
|
// by delta time here would make the movement slower that it should be.
|
|
let delta_pitch = delta.y * camera_settings.pitch_speed;
|
|
let delta_yaw = delta.x * camera_settings.yaw_speed;
|
|
|
|
// Conversely, we DO need to factor in delta time for mouse button inputs.
|
|
delta_roll *= camera_settings.roll_speed * time.delta_secs();
|
|
|
|
// Obtain the existing pitch, yaw, and roll values from the transform.
|
|
let (yaw, pitch, roll) = camera.rotation.to_euler(EulerRot::YXZ);
|
|
|
|
// Establish the new yaw and pitch, preventing the pitch value from exceeding our limits.
|
|
let pitch = (pitch + delta_pitch).clamp(
|
|
camera_settings.pitch_range.start,
|
|
camera_settings.pitch_range.end,
|
|
);
|
|
let roll = roll + delta_roll;
|
|
let yaw = yaw + delta_yaw;
|
|
camera.rotation = Quat::from_euler(EulerRot::YXZ, yaw, pitch, roll);
|
|
|
|
// Adjust the translation to maintain the correct orientation toward the orbit target.
|
|
// In our example it's a static target, but this could easily be customized.
|
|
let target = Vec3::ZERO;
|
|
camera.translation = target - camera.forward() * camera_settings.orbit_distance;
|
|
}
|