storytold/storyteller-bevy
2
0
Fork 0
mirror of https://github.com/storytold/storyteller-bevy.git synced 2026-10-17 00:13:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

camera modes work on testing

Browse Source 
moving them over to headless mode
This commit is contained in:
Brooks Palin
2024-03-14 01:29:22 -06:00
parent 7d5c490874
commit 77a44a52a5
4 changed files with 141 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor.ron
+2 -2
View File
@@ -1,6 +1,6 @@
{
"space_editor_core::hotkeys::HotkeySet<space_editor_ui::tools::gizmo::GizmoHotkey>": "{\"space_editor_core::hotkeys::HotkeySet<space_editor_ui::tools::gizmo::GizmoHotkey>\":(bindings:{Rotate:[R],Translate:[G],Scale:[S],Multiple:[ShiftLeft],Clone:[AltLeft],Delete:[X]},name:\"GizmoHotkey\")}",
"space_undo::ChangeChainSettings": "{\"space_undo::ChangeChainSettings\":(max_change_chain_size:200)}",
"space_persistence::PersistenceSettings": "{\"space_persistence::PersistenceSettings\":(load_on_startup:true,save_on_close:true)}",
"space_editor_ui::settings::NewWindowSettings": "{\"space_editor_ui::settings::NewWindowSettings\":(new_tab:SameNode)}",
"space_undo::ChangeChainSettings": "{\"space_undo::ChangeChainSettings\":(max_change_chain_size:200)}",
"space_editor_core::hotkeys::HotkeySet<space_editor_ui::tools::gizmo::GizmoHotkey>": "{\"space_editor_core::hotkeys::HotkeySet<space_editor_ui::tools::gizmo::GizmoHotkey>\":(bindings:{Rotate:[R],Translate:[G],Scale:[S],Multiple:[ShiftLeft],Clone:[AltLeft],Delete:[X]},name:\"GizmoHotkey\")}",
}
studio/src/lib.rs
+1 -1
View File
@@ -26,7 +26,7 @@ mod mixamo;
mod path;
mod persistance;
mod remote;
mod scene;
pub mod scene;
pub mod screenshot;
mod skybox;
mod ui;
studio/src/main-headless.rs
+59 -27
View File
@@ -20,11 +20,7 @@ enum Subcommands {
Scene {
scene_dir: String,
#[arg(long)]
orbit: bool,
#[arg(long, value_parser = clap::value_parser!(f32))]
orbit_radius: Option<f32>,
#[arg(long, value_parser = clap::value_parser!(f32))]
orbit_speed: Option<f32>,
camera_motion : Option<String>,
#[arg(long, short)]
output_dir: Option<String>,
#[arg(long)]
@@ -73,9 +69,7 @@ fn main() {
let mut app = match args.subcommand {
Subcommands::Scene {
scene_dir,
orbit,
orbit_speed,
orbit_radius,
camera_motion,
skybox,
output_dir,
output_resolution,
@@ -98,15 +92,22 @@ fn main() {
frames,
output_res,
);
let orbit_speed = orbit_speed.unwrap_or(1.0);
let orbit_radius = orbit_radius.unwrap_or(8.0);
if orbit {
app.insert_resource(OrbitSettings {
radius: orbit_radius,
speed: orbit_speed,
})
.add_systems(Update, orbit_scene);
if let Some(camera_motion) = camera_motion {
match camera_motion.as_str() {
"orbit" => {
app.insert_resource(CameraMotion::Orbit);
}
"pan" => {
app.insert_resource(CameraMotion::Pan);
}
"zoom" => {
app.insert_resource(CameraMotion::Zoom);
}
_ => panic!("Unsupported camera motion type.")
}
app.add_systems(Update, update_camera_motion);
}
app
@@ -167,28 +168,59 @@ fn main() {
}
#[derive(Resource)]
struct OrbitSettings {
radius: f32,
speed: f32,
enum CameraMotion {
Orbit,
Pan,
Zoom,
Static
}
fn orbit_scene(
pub(crate) fn update_camera_motion(
mut camera: Query<&mut Transform, With<Camera>>,
orbit_settings: Res<OrbitSettings>,
camera_motion: Res<CameraMotion>,
time: Res<Time>,
) {
let Ok(mut main_cam_transform) = camera.get_single_mut() else {
return;
};
main_cam_transform.translation = Vec3::new(
orbit_settings.radius * (time.elapsed_seconds() * orbit_settings.speed).cos(),
6.0,
orbit_settings.radius * (time.elapsed_seconds() * orbit_settings.speed).sin(),
);
match *camera_motion {
CameraMotion::Orbit => {
orbit_camera(&mut main_cam_transform, &time);
}
CameraMotion::Pan => {
pan_camera(&mut main_cam_transform, &time);
}
CameraMotion::Zoom => {
zoom_camera(&mut main_cam_transform, &time);
}
CameraMotion::Static => {}
}
main_cam_transform.look_at(Vec3::ZERO, Vec3::Y);
}
fn zoom_camera(main_cam_transform: &Transform, time: &Time<()>) {
todo!()
}
fn pan_camera(main_cam_transform: &Transform, time: &Time<()>) {
todo!()
}
fn orbit_camera(main_cam_transform: &mut Mut<'_, Transform>, time: &Res<'_, Time>) {
let scaled_time = time.elapsed().as_secs_f32() * 0.1;
let max_angle = std::f32::consts::PI / 2.0;
let normalized_sin = (scaled_time.sin() + 1.0) / 2.0;
let angle = max_angle * normalized_sin;
let t = (time.elapsed().as_secs_f32() / 5.0) % 1.0;
main_cam_transform.translation = Vec3::new(2.2 * angle.cos(), 1.0, 2.5 * angle.sin());
main_cam_transform.look_at(Vec3::new(0.347, 0.556, -1.0), Vec3::Y);
}
//==============================================================================
// Parsers
//==============================================================================
studio/src/main.rs
+79 -5
View File
@@ -1,9 +1,8 @@
use bevy::{
app::Update,
window::{close_on_esc, Window},
app::Update, transform::components::Transform, window::{close_on_esc, Window}, prelude::*
};
use clap::Parser;
use studio::{screenshot::ScreenShotPlugin, InitAsset, InitParams, StudioMode};
use studio::{scene::SceneState, screenshot::ScreenShotPlugin, InitAsset, InitParams, StudioMode };
#[derive(Parser)]
#[command(name = "StorytellerStudio")]
@@ -19,7 +18,7 @@ struct StudioArgs {
fn main() {
let args = StudioArgs::parse();
let object_id = args.model.unwrap_or("Mannequin.gltf".to_string());
let object_id = args.model.unwrap_or("sample-room.gltf".to_string());
let skybox_id = args.skybox.unwrap_or("gum_trees_4k".to_string());
// Edit the arguments here to change the default startup scene or skybox
@@ -37,7 +36,82 @@ fn main() {
// Add any additional systems, resources, etc. for local debugging
app.add_systems(Update, close_on_esc);
app.add_plugins(ScreenShotPlugin);
// app.add_plugins(ScreenShotPlugin);
app.insert_resource(CameraMotion::Zoom);
app.add_systems(Update, update_camera_motion.run_if(in_state(SceneState::Active)));
app.run();
}
//TODO: Remove this test code
pub const SPEED : f32 = 0.8;
#[derive(Resource)]
enum CameraMotion {
Orbit,
Pan,
Zoom,
Static
}
pub(crate) fn update_camera_motion(
mut camera: Query<&mut Transform, (With<Camera>, Without<Parent>)>,
camera_motion: Res<CameraMotion>,
time: Res<Time>,
) {
println!("{}", camera.iter().count());
let Ok(mut main_cam_transform) = camera.get_single_mut() else {
return;
};
println!("Updating camera motion");
match *camera_motion {
CameraMotion::Orbit => {
orbit_camera(&mut main_cam_transform, &time);
}
CameraMotion::Pan => {
pan_camera(&mut main_cam_transform, &time);
}
CameraMotion::Zoom => {
zoom_camera(&mut main_cam_transform, &time);
}
CameraMotion::Static => {}
}
// main_cam_transform.look_at(Vec3::ZERO, Vec3::Y);
}
fn zoom_camera(main_cam_transform: &mut Transform, time: &Time<()>) {
let scaled_time = time.elapsed().as_secs_f32() * SPEED;
let normalized_cos = (-scaled_time.cos() + 1.0) / 2.0;
let start_pos = Vec3::new(0.366, 1.1, 2.5);
let end_pos = Vec3::new(0.366, 1.1, -0.5);
main_cam_transform.translation = start_pos.lerp(end_pos, normalized_cos);
main_cam_transform.rotation = Quat::from_euler(EulerRot::XYZ, 0.0, 0.0, 0.0);
}
fn pan_camera(main_cam_transform: &mut Transform, time: &Time<()>) {
let scaled_time = time.elapsed().as_secs_f32() * SPEED;
let normalized_cos = (scaled_time.cos() + 1.0) / 2.0;
let start_pos = Vec3::new(1.617, 0.9, 2.177);
let end_pos = Vec3::new(-0.365, 0.9, 2.323);
main_cam_transform.translation = start_pos.lerp(end_pos, normalized_cos);
main_cam_transform.rotation = Quat::from_euler(EulerRot::XYZ, 0.0, 0.0, 0.0);
}
fn orbit_camera(main_cam_transform: &mut Mut<'_, Transform>, time: &Res<'_, Time>) {
println!("Orbiting camera");
let scaled_time = time.elapsed().as_secs_f32() * SPEED;
let max_angle = std::f32::consts::PI / 2.0;
let normalized_cos = (scaled_time.cos() + 1.0) / 2.0;
let angle = max_angle * normalized_cos;
// let t = (time.elapsed().as_secs_f32() / 5.0) % 1.0;
main_cam_transform.translation = Vec3::new(-2.2 * angle.cos(), 1.0, 2.5 * angle.sin());
main_cam_transform.look_at(Vec3::new(0.347, 0.556, -1.0), Vec3::Y);
}