mirror of
https://github.com/storytold/storyteller-bevy.git
synced 2026-10-17 00:13:17 +00:00
c788bcf6b7
This PR heavily refactors the entry-point functions in `studio/src/lib.rs` to simplify and consolidate. Additionally, the frontend application should now be configurable as expected with any valid combination of the following URL parameters: * `objectId` : A pre-bundled library object to load (e.g., "couch.gltf") * `bvh` : Any resolvable path to a BVH animation with a MocapNET skeleton (e.g., "mocap/shuffle.bvh") * `mixamo` : Any resolvable path to a glTF animation with the Mixamo skeleton (e.g., "mocap/hip-hop-dancing.gltf") * `sceneImport` : Any resolvable path to an arbitrary glTF scene (untested, but should theoretically work) * `scene` : Any resolvable path to a previously saved Storyteller Studio scene in `*.scn.ron` format * `skybox` : The ID of a pre-bundled skybox asset. Valid options are: - "gum_trees_4k" - "kloofenfal_28d_misty_4k" - "meadow_4k" - "promenade_de_vidy_4k" - "scythian_tombs_4k" - "test_scene" (this is the default if not specified) * `mode` : One of "studio" or "viewer" (the default if not specified) "Validity" rules are as follows: * `objectId`, `bvh`, `mixamo`, `sceneImport` and `scene` are mutually exclusive * `skybox` is not supported for `scene` (the skybox should be saved and loaded as part of the scene description, though this is not currently working) * Both `mode` options are valid for all other parameters
176 lines
5.4 KiB
Rust
176 lines
5.4 KiB
Rust
use bevy::render::render_resource::Extent3d;
|
|
use clap::{Args, Parser, Subcommand};
|
|
use studio::headless::{start_headless, HeadlessMode};
|
|
|
|
#[derive(Parser)]
|
|
#[command(name = "StorytellerStudioHeadless")]
|
|
#[command(author = "The Storyteller Team")]
|
|
#[command(version = "1.0")]
|
|
#[command(
|
|
about = "Executable for Storyteller Studio Headless. Allows you to render frames to images."
|
|
)]
|
|
#[command(propagate_version = true)]
|
|
struct StudioArgs {
|
|
#[command(subcommand)]
|
|
subcommand: Subcommands,
|
|
}
|
|
|
|
#[derive(Subcommand)]
|
|
enum Subcommands {
|
|
Scene {
|
|
scene_dir: String,
|
|
#[arg(long, short)]
|
|
output_dir: Option<String>,
|
|
#[arg(long)]
|
|
skybox: Option<String>,
|
|
#[arg(long = "res", value_parser = extent3d_parser)]
|
|
output_resolution: Option<Extent3d>,
|
|
#[arg(long, value_parser = clap::value_parser!(u32).range(1..))]
|
|
fps: Option<u32>,
|
|
#[arg(long, value_parser = clap::value_parser!(u32).range(1..))]
|
|
frames: Option<u32>,
|
|
},
|
|
Bvh {
|
|
bvh_dir: String,
|
|
#[arg(long, short = 'o', short)]
|
|
out: Option<String>,
|
|
#[arg(long)]
|
|
skybox: Option<String>,
|
|
#[arg(long = "res", value_parser = extent3d_parser)]
|
|
output_resolution: Option<Extent3d>,
|
|
#[arg(long, value_parser = clap::value_parser!(u32).range(1..))]
|
|
fps: Option<u32>,
|
|
#[arg(long, value_parser = clap::value_parser!(u32).range(1..))]
|
|
frames: Option<u32>,
|
|
},
|
|
Mixamo {
|
|
mixamo_dir: String,
|
|
#[arg(long, short = 'o', short)]
|
|
out: Option<String>,
|
|
#[arg(long)]
|
|
skybox: Option<String>,
|
|
#[arg(long = "res", value_parser = extent3d_parser)]
|
|
output_resolution: Option<Extent3d>,
|
|
#[arg(long, value_parser = clap::value_parser!(u32).range(1..))]
|
|
fps: Option<u32>,
|
|
#[arg(long, value_parser = clap::value_parser!(u32).range(1..))]
|
|
frames: Option<u32>,
|
|
},
|
|
}
|
|
|
|
#[derive(Args, Clone)]
|
|
struct CommonArgs {}
|
|
|
|
fn main() {
|
|
let args = StudioArgs::parse();
|
|
|
|
let mut app = match args.subcommand {
|
|
Subcommands::Scene {
|
|
scene_dir,
|
|
skybox,
|
|
output_dir,
|
|
output_resolution,
|
|
fps,
|
|
frames,
|
|
} => {
|
|
let output_dir = output_dir.unwrap_or("./screen_shots/".to_string());
|
|
let output_res = output_resolution.unwrap_or(Extent3d {
|
|
width: 1280,
|
|
height: 720,
|
|
depth_or_array_layers: 1,
|
|
});
|
|
let fps = fps.unwrap_or(24);
|
|
let frames = frames.unwrap_or(30);
|
|
let skybox = skybox.unwrap_or("gum_trees_4k".to_string());
|
|
start_headless(
|
|
HeadlessMode::Scene(scene_dir, skybox),
|
|
fps,
|
|
&output_dir,
|
|
frames,
|
|
output_res,
|
|
)
|
|
}
|
|
Subcommands::Bvh {
|
|
bvh_dir,
|
|
skybox,
|
|
out: output_dir,
|
|
output_resolution,
|
|
fps,
|
|
frames,
|
|
} => {
|
|
let output_dir = output_dir.unwrap_or("./screen_shots/".to_string());
|
|
let output_res = output_resolution.unwrap_or(Extent3d {
|
|
width: 1280,
|
|
height: 720,
|
|
depth_or_array_layers: 1,
|
|
});
|
|
let fps = fps.unwrap_or(24);
|
|
let frames = frames.unwrap_or(u32::MAX);
|
|
let skybox = skybox.unwrap_or("gum_trees_4k".to_string());
|
|
start_headless(
|
|
HeadlessMode::Bvh(bvh_dir, skybox),
|
|
fps,
|
|
&output_dir,
|
|
frames,
|
|
output_res,
|
|
)
|
|
}
|
|
Subcommands::Mixamo {
|
|
mixamo_dir,
|
|
out,
|
|
skybox,
|
|
output_resolution,
|
|
fps,
|
|
frames,
|
|
} => {
|
|
let output_dir = out.unwrap_or("./screen_shots/".to_string());
|
|
let output_res = output_resolution.unwrap_or(Extent3d {
|
|
width: 1280,
|
|
height: 720,
|
|
depth_or_array_layers: 1,
|
|
});
|
|
let fps = fps.unwrap_or(24);
|
|
let frames = frames.unwrap_or(u32::MAX);
|
|
let skybox = skybox.unwrap_or("gum_trees_4k".to_string());
|
|
start_headless(
|
|
HeadlessMode::Mixamo(mixamo_dir, skybox),
|
|
fps,
|
|
&output_dir,
|
|
frames,
|
|
output_res,
|
|
)
|
|
}
|
|
};
|
|
|
|
app.run();
|
|
}
|
|
|
|
//==============================================================================
|
|
// Parsers
|
|
//==============================================================================
|
|
|
|
fn extent3d_parser(input: &str) -> Result<Extent3d, String> {
|
|
let split = input.split('x').collect::<Vec<_>>();
|
|
|
|
if split.len() != 2 {
|
|
return Err(
|
|
"Invalid format for the Resolution argument, must follow the following pattern: <WIDTH>x<HEIGHT>"
|
|
.to_string()
|
|
);
|
|
}
|
|
|
|
let Ok(width) = split[0].parse::<u32>() else {
|
|
return Err("Width must be a number when defining the output resolution.".to_string());
|
|
};
|
|
|
|
let Ok(height) = split[1].parse::<u32>() else {
|
|
return Err("Width must be a number when defining the output resolution.".to_string());
|
|
};
|
|
|
|
Ok(Extent3d {
|
|
width,
|
|
height,
|
|
depth_or_array_layers: 1,
|
|
})
|
|
}
|