From 560479632824aee31c0256042788f7fd87eb6c87 Mon Sep 17 00:00:00 2001 From: "Elijah C. Voigt" Date: Sun, 19 May 2024 21:09:11 -0700 Subject: [PATCH] Prepare for additional camera angles --- assets/martian.tweak.toml | 6 ++++-- assets/models/Martian Chess.glb | 4 ++-- src/display3d.rs | 18 +++++------------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/assets/martian.tweak.toml b/assets/martian.tweak.toml index e761046..78b171f 100644 --- a/assets/martian.tweak.toml +++ b/assets/martian.tweak.toml @@ -234,8 +234,10 @@ width_px = 400.0 [display3d.models.animations] intro_a = "GameCamIntro1" intro_b = "GameCamIntro2" -turn_b = "GameCamSide2>1" -turn_a = "GameCamSide1>2" +turn_b = "GameCamSide2>1" +turn_b_sight = "GameCamSide2.1>1" +turn_a = "GameCamSide1>2" +turn_a_sight = "GameCamSide1.1>2" [display3d.models.animations.pick_up] PawnBlue = "PawnBluePiecePickup" diff --git a/assets/models/Martian Chess.glb b/assets/models/Martian Chess.glb index ab0fea0..68977ff 100644 --- a/assets/models/Martian Chess.glb +++ b/assets/models/Martian Chess.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9b1f2e6bc8728b215ddd06709e054b1cf4fcbcd4ac9cf0fc66e70d40486ce60 -size 17299496 +oid sha256:45dee8fe5223ced1652124dcb691992d24f5421c22a9148ca68b0ef38cf69cb5 +size 8841360 diff --git a/src/display3d.rs b/src/display3d.rs index ca185e6..3721f35 100644 --- a/src/display3d.rs +++ b/src/display3d.rs @@ -1005,20 +1005,12 @@ fn switch_sides( players.iter_mut().for_each(|mut player| { debug!("Switching sides"); - let animation = match state.get() { - game::TurnState(game::Side::A) => gltf.named_animations.get( - tweak - .get::("display3d_models_animations_turn_a") - .unwrap() - .as_str(), - ), - game::TurnState(game::Side::B) => gltf.named_animations.get( - tweak - .get::("display3d_models_animations_turn_b") - .unwrap() - .as_str(), - ), + let animation_key = match state.get() { + game::TurnState(game::Side::A) => "display3d_models_animations_turn_a_sight", + game::TurnState(game::Side::B) => "display3d_models_animations_turn_b_sight", }; + let animation_val = tweak.get::(animation_key).unwrap(); + let animation = gltf.named_animations.get(animation_val.as_str()); player.start_with_transition( animation.expect("Camera Transition Animation").clone(), Duration::from_secs_f32(1.00),