Skip to content

Record your screen, ship a demo. Free and open-source, GPU-accelerated, no watermarks, no subscriptions. Windows, macOS, Linux. Actively maintained.

fix(compositor): steep roll-free Left and Right, iso folded into Left

EtienneLescotfe1054cb7ea5
diff --git a/crates/compositor/src/frame_geometry.rs b/crates/compositor/src/frame_geometry.rs
index e3039c0a3..00c889f50 100644
--- a/crates/compositor/src/frame_geometry.rs
+++ b/crates/compositor/src/frame_geometry.rs
@@ -3767,7 +3767,10 @@ impl ModelView {
])
});
let top = corners.iter().fold(0.0f32, |m, p| m.max(p[2])) / self.unit;
- let penumbra = (top / lz / MODEL_SOFTNESS).min(MODEL_SHADOW_PAD);
+ // La marche du shader court jusqu'à la sortie de la boîte ÉLARGIE de `MODEL_SHADOW_PAD` :
+ // sous une lumière rasante (`right`, `lz` ≈ 0,2), le rayon y va bien au-delà de `top / lz`,
+ // et la pénombre avec lui.
+ let penumbra = ((top + MODEL_SHADOW_PAD) / lz / MODEL_SOFTNESS).min(MODEL_SHADOW_PAD);
let reach = (penumbra / lz + MODEL_CONTACT_RADIUS) * self.unit;
let mut b = [f32::MAX, f32::MAX, f32::MIN, f32::MIN];
let mut add = |p: [f32; 2]| {
@@ -6743,7 +6746,7 @@ mod tests {
}
const ISO: [f32; 3] = [-23.0, -25.0, 0.0];
- const LEFT: [f32; 3] = [-6.5, -17.0, 0.0];
+ const LEFT: [f32; 3] = [-23.0, -25.0, 0.0];
/// Le `LayerCB` du sprite incliné est, octet pour octet, celui que chaque backend construisait
/// avant de le partager. La référence est le corps d'origine de `draw_cursor_sprite`.
@@ -6801,7 +6804,7 @@ mod tests {
let len = std::mem::size_of::<LayerCB>();
unsafe { std::slice::from_raw_parts(cb as *const LayerCB as *const u8, len) }.to_vec()
};
- for rot in [ISO, LEFT, [-6.5, 17.0, 0.0]] {
+ for rot in [ISO, LEFT, [-23.0, 25.0, 0.0]] {
let plan = plan_with(rot);
let clip = [0.1, 0.2, 0.7, 0.6];
let got = cursor_sprite_cb(
@@ -7182,7 +7185,7 @@ mod tests {
assert!(model_plan([0.0; 3], &bare, &track, 0.3, true).expect("plan").model.is_none());
}
- const LEFT_ROT: [f32; 3] = [-6.5, -17.0, 0.0];
+ const LEFT_ROT: [f32; 3] = [-23.0, -25.0, 0.0];
const ISO_ROT: [f32; 3] = [-23.0, -25.0, 0.0];
/// Les poses d'essai, pour chaque état de `MODEL_STATES` : au repos, posé, tourné.
@@ -7196,7 +7199,7 @@ mod tests {
vec![],
vec![(0.0, key.to_string())],
);
- for (name, rot) in [("flat", [0.0; 3]), ("iso", ISO_ROT), ("left", LEFT_ROT), ("right", [-6.5, 17.0, 0.0])] {
+ for (name, rot) in [("flat", [0.0; 3]), ("iso", ISO_ROT), ("left", LEFT_ROT), ("right", [-23.0, 25.0, 0.0])] {
for (pose, track, t) in [("hover", &clicked, 0.3), ("touch", &clicked, 0.5 + CONTACT_S), ("yaw", &moving, 1.0)] {
let plan = model_plan(rot, &scene, track, t, true).expect("plan");
let (sdf, shape) = sprite_model(key);
diff --git a/crates/compositor/src/regions.rs b/crates/compositor/src/regions.rs
index 13bd99fba..27f0ba5e7 100644
--- a/crates/compositor/src/regions.rs
+++ b/crates/compositor/src/regions.rs
@@ -580,15 +580,17 @@ fn ease_connected_pan(t: f32) -> f32 {
/// Sans roulis, la règle ne laisse que deux bandes de tangage (X). Une rotation Y pure garde les
/// verticales verticales, donc chaque préset tangue ; et entre 10° et 14° de tangage, le bord haut
/// d'un écran tourné ressort à plat (la remontée du rotateX annulée par la perspective), à tout
-/// lacet. D'où left/right à 6,5° (un écran tourné, à peine vu d'en haut, arêtes à 2,5° au plus
-/// près) et iso à 23° (vu d'en haut franchement, le plus incliné, arêtes à 4,8°). Iso sort de la
-/// bande des 2° pendant son ease-in à 0,82 de force, avant que la parallaxe ne s'ouvre
-/// (`PARALLAX_GATE_START`). Le budget dynamique suit left/right (`DYNAMIC_TILT_BUDGET`).
+/// lacet. Les deux présets prennent donc la bande haute, le regard de l'ancien `iso` : tourné et
+/// vu d'en haut franchement, arêtes à 4,8° au plus près. Ils sortent de la bande des 2° pendant
+/// leur ease-in à 0,82 de force, avant que la parallaxe ne s'ouvre (`PARALLAX_GATE_START`), et
+/// laissent au budget dynamique ses ±1,9° / ±3° d'origine (`DYNAMIC_TILT_BUDGET`).
+///
+/// `iso` n'est plus proposé : c'était déjà ce regard-là, tourné à gauche. Un projet qui le porte
+/// encore se lit donc comme `left` (côté app : `readRotation3DPreset`, et ici par sécurité).
fn rotation3d_for(rotation: &Option<String>) -> [f32; 3] {
match rotation.as_deref() {
- Some("iso") => [-23.0, -25.0, 0.0],
- Some("left") => [-6.5, -17.0, 0.0],
- Some("right") => [-6.5, 17.0, 0.0],
+ Some("left" | "iso") => [-23.0, -25.0, 0.0],
+ Some("right") => [-23.0, 25.0, 0.0],
_ => [0.0, 0.0, 0.0],
}
}
@@ -1171,18 +1173,16 @@ fn contain_scale(
/// anime le plan (la parallaxe ici ; l'impact du clic ensuite) : les contributions s'ADDITIONNENT
/// puis la somme est bornée par `clamp_dynamic_tilt`.
///
-/// - Z : 0. Jamais de roulis ; c'est aussi l'axe le plus étroit (0,6° en fait sortir `left`).
-/// - X : ±1,2°. La limite de `left`/`right` : leur tangage de 6,5° vit dans une bande étroite, sous
-/// laquelle les verticales se redressent et au-dessus de laquelle le bord haut s'aplatit.
-/// - Y : ±1,8°. Vers 2,1°, `left` rapproche une arête de son axe ou déborde sa boîte ; à ±1,9°,
-/// la fin d'une transition chaînée depuis `iso` en approche une à 0,002° de la règle.
+/// - Z : 0. Jamais de roulis : une caméra qui bouge ne roule pas le métrage.
+/// - X : ±1,9°, Y : ±3°. Ensemble, à 1,15 fois ces valeurs, `left` sort d'une des deux règles
+/// (arête à moins de 2° d'un axe, ou débordement de sa boîte) ; seul, Y y arrive vers 3,3°, X
+/// laisse plus de marge (`the_budget_is_close_to_what_left_allows`).
///
-/// C'était ±1,9° / ±3° tant que les présets roulaient : sans roulis, `left` n'en laisse que ça.
/// Reproduits par `the_budget_sweep_keeps_every_edge_off_axis`,
/// `the_budget_sweep_stays_inside_the_original_rect` et
/// `the_chained_sweep_keeps_every_edge_off_axis_and_inside` sur tout le balayage, pas seulement
/// aux présets.
-pub const DYNAMIC_TILT_BUDGET: [f32; 3] = [1.2, 1.8, 0.0];
+pub const DYNAMIC_TILT_BUDGET: [f32; 3] = [1.9, 3.0, 0.0];
/// Borne une part dynamique au budget, axe par axe.
pub fn clamp_dynamic_tilt(rot: [f32; 3]) -> [f32; 3] {
@@ -1191,11 +1191,10 @@ pub fn clamp_dynamic_tilt(rot: [f32; 3]) -> [f32; 3] {
}
/// Force du préset sous laquelle la part dynamique est nulle ; elle s'installe en smoothstep
-/// jusqu'à 1. La spec disait 0,5 ; les maths de ce crate disent autrement : `left`/`right` ne
-/// sortent de la bande des 2° qu'à 0,71 de force, et le budget plein ne leur laisse que 0,02° de
-/// marge à force 1. Juste sous 1, la base perd plus d'angle que la porte n'en retire — il faut une
-/// porte raide. `iso`, lui, traverse en montant le tangage où le bord haut ressort à plat, et n'en
-/// sort qu'à 0,82 : la porte doit s'ouvrir après. Cf. `the_budget_sweep_keeps_every_edge_off_axis`.
+/// jusqu'à 1. La spec disait 0,5 ; les maths de ce crate disent autrement : en montant,
+/// `left`/`right` traversent le tangage où leur bord haut ressort à plat, et ne sortent de la
+/// bande des 2° qu'à 0,82 de force : la porte doit s'ouvrir après, et raide. Cf.
+/// `the_budget_sweep_keeps_every_edge_off_axis`.
const PARALLAX_GATE_START: f32 = 0.85;
/// Degrés de parallaxe par unité de vitesse (largeurs — ou hauteurs — de coupe par seconde),
/// avant saturation. Un balayage d'une demi-largeur par seconde penche d'environ 2° en Y, une
@@ -1265,7 +1264,7 @@ pub const CLICK_IMPACT_WINDOW_S: f32 = 0.26;
/// autant sur les deux axes sans que X sature seul et ne tourne l'axe du pivot. Ce n'est PAS
/// le réglage `clickBounce` du curseur (brut sur [0, 5], 2,5 par défaut) : il rendrait le plan
/// 2,5 fois trop fort. Cf. `a_corner_click_moves_the_plane_visibly_at_a_frozen_scale`.
-pub const CLICK_IMPACT_DEG: f32 = 1.2;
+pub const CLICK_IMPACT_DEG: f32 = 1.9;
/// Valeur du pic de `sin(2πe)·(1−e)²` (en e ≈ 0,1904), pour que le creux de `tap` vaille −1.
const TAP_NORM: f32 = 0.610;
@@ -1829,7 +1828,7 @@ mod tilt_tests {
/// pose dessus (le curseur) se décale par rapport à l'image que le shader y a dessinée.
#[test]
fn the_plane_corners_map_to_the_projected_corners() {
- let quad = rotated_quad_corners_px(1920.0, 1080.0, preset("iso"), [0.0; 3]);
+ let quad = rotated_quad_corners_px(1920.0, 1080.0, preset("left"), [0.0; 3]);
for (i, (fx, fy)) in [(0.0, 0.0), (1.0, 0.0), (1.0, 1.0), (0.0, 1.0)].into_iter().enumerate()
{
let (x, y) = quad.point_px(fx, fy);
@@ -1855,7 +1854,7 @@ mod tilt_tests {
#[test]
fn a_tilted_plane_moves_the_cursor_off_the_upright_rect() {
let (w, h) = (1920.0f32, 1080.0f32);
- let quad = rotated_quad_corners_px(w, h, rotation3d_for(&Some("iso".into())), [0.0; 3]);
+ let quad = rotated_quad_corners_px(w, h, rotation3d_for(&Some("left".into())), [0.0; 3]);
let mut worst: f32 = 0.0;
for (fx, fy) in [(0.0, 0.0), (1.0, 0.0), (0.0, 1.0), (1.0, 1.0), (0.5, 0.0)] {
let (x, y) = quad.point_px(fx, fy);
@@ -1871,7 +1870,6 @@ mod tilt_tests {
#[test]
fn every_preset_stays_inside_the_original_rect() {
for (name, rot) in [
- ("iso", rotation3d_for(&Some("iso".into()))),
("left", rotation3d_for(&Some("left".into()))),
("right", rotation3d_for(&Some("right".into()))),
] {
@@ -1890,13 +1888,21 @@ mod tilt_tests {
}
}
+ /// `iso` n'est plus proposé : il se lit comme `left`, qui a gardé son regard, et `right` en est
+ /// le miroir exact.
+ #[test]
+ fn iso_reads_as_left_and_right_mirrors_it() {
+ let left = rotation3d_for(&Some("left".into()));
+ assert_eq!(rotation3d_for(&Some("iso".into())), left);
+ assert_eq!(rotation3d_for(&Some("right".into())), [left[0], -left[1], 0.0]);
+ }
+
/// Aucune arête d'un préset ne doit longer un axe de l'image. C'est LE critère qui distingue
/// « un écran incliné » d'« un enregistrement tronqué » : un bord parfaitement vertical qui
/// coupe une phrase se lit comme un `overflow: hidden`, quelle que soit la justesse du reste.
#[test]
fn no_preset_has_an_axis_aligned_edge() {
for (name, rot) in [
- ("iso", rotation3d_for(&Some("iso".into()))),
("left", rotation3d_for(&Some("left".into()))),
("right", rotation3d_for(&Some("right".into()))),
] {
@@ -1919,9 +1925,8 @@ mod tilt_tests {
}
}
- fn presets() -> [(&'static str, [f32; 3]); 3] {
+ fn presets() -> [(&'static str, [f32; 3]); 2] {
[
- ("iso", rotation3d_for(&Some("iso".into()))),
("left", rotation3d_for(&Some("left".into()))),
("right", rotation3d_for(&Some("right".into()))),
]
@@ -1970,7 +1975,7 @@ mod tilt_tests {
#[test]
fn iso_depth_rises_towards_the_corner_drawn_larger() {
let (w, h) = (1920.0f32, 1080.0f32);
- let rot = rotation3d_for(&Some("iso".into()));
+ let rot = rotation3d_for(&Some("left".into()));
let quad = rotated_quad_corners_px(w, h, rot, [0.0; 3]);
let mb = quad.depth_mb([w, h], [0.5, 0.5], false);
let (z_tr, z_bl) = (depth_at(mb, 1.0, 0.0), depth_at(mb, 0.0, 1.0));
@@ -2009,7 +2014,7 @@ mod tilt_tests {
/// unités de la distance de fuite, pas en pixels de sortie.
#[test]
fn the_circle_of_confusion_grows_away_from_the_focus_and_ignores_resolution() {
- let rot = rotation3d_for(&Some("iso".into()));
+ let rot = rotation3d_for(&Some("left".into()));
let coc = |w: f32, h: f32, focus: [f32; 2], s: f32, t: f32| {
let quad = rotated_quad_corners_px(w, h, rot, [0.0; 3]);
let mb = quad.depth_mb([w, h], focus, true);
@@ -2038,7 +2043,7 @@ mod tilt_tests {
fn the_tilt_actually_tilts() {
// Garde-fou contre un containment trop zélé qui aplatirait l'effet : les quatre coins
// d'un quad incliné ne peuvent pas rester alignés deux à deux comme un rectangle droit.
- let corners = rotated_quad_corners_px(1920.0, 1080.0, preset("iso"), [0.0; 3]).corners;
+ let corners = rotated_quad_corners_px(1920.0, 1080.0, preset("left"), [0.0; 3]).corners;
let top_edge_slope = (corners[1].1 - corners[0].1).abs();
assert!(top_edge_slope > 1.0, "arête supérieure horizontale : le tilt a disparu");
}
@@ -2074,14 +2079,13 @@ mod tilt_tests {
/// La règle des 2° tient sur TOUT le balayage du budget, et pas qu'aux présets : à force 1
/// sur la boîte entière, et pendant l'ease-in, où la part dynamique ne doit jamais faire
- /// passer une arête sous min(2°, ce que la base seule donne). Sous ~0,71 de force, `left`
- /// et `right` sont DÉJÀ dans la bande (l'ease-in traverse 0°), `iso` jusqu'à ~0,82 (il
- /// traverse le tangage où son bord haut ressort à plat) ; on ne leur demande alors que de ne
- /// pas empirer.
+ /// passer une arête sous min(2°, ce que la base seule donne). Sous ~0,82 de force, `left`
+ /// et `right` sont DÉJÀ dans la bande (l'ease-in traverse 0°, puis le tangage où leur bord
+ /// haut ressort à plat) ; on ne leur demande alors que de ne pas empirer.
#[test]
fn the_budget_sweep_keeps_every_edge_off_axis() {
let (w, h) = (1920.0f32, 1080.0f32);
- for name in ["iso", "left", "right"] {
+ for name in ["left", "right"] {
for k in 0..=400 {
let strength = k as f32 / 400.0;
let base = lerp_rotation3d([0.0; 3], preset(name), strength);
@@ -2099,20 +2103,23 @@ mod tilt_tests {
}
}
- /// Les chiffres du budget sont ceux des maths du crate, à peu près au ras : 15 % de plus
- /// sur X ou Y, ou 1,2° sur Z, et `left` casse une des deux règles.
+ /// Les chiffres du budget sont ceux des maths du crate, à peu près au ras : le balayage à 15 %
+ /// de plus sur X et Y ensemble fait casser à `left` une des deux règles, arête à moins de 2°
+ /// d'un axe (16:9) ou débordement de sa boîte (les trois formes), et Y seul aussi. X seul a
+ /// plus de marge : c'est avec Y qu'il la consomme. Z n'a pas de budget, c'est la règle produit.
#[test]
fn the_budget_is_close_to_what_left_allows() {
- let (w, h) = (1920.0f32, 1080.0f32);
let base = preset("left");
let breaks = |d: [f32; 3]| {
- let c = rotated_quad_corners_px(w, h, base, d).corners;
- min_edge_angle(&c) < 2.0 || overflow(&c, w, h) > 0.0
+ [(1920.0f32, 1080.0f32), (1080.0, 1920.0), (800.0, 800.0)].into_iter().any(|(w, h)| {
+ let c = rotated_quad_corners_px(w, h, base, d).corners;
+ (w > h && min_edge_angle(&c) < 2.0) || overflow(&c, w, h) > 0.0
+ })
};
let b = DYNAMIC_TILT_BUDGET;
- assert!(breaks([b[0] * 1.15, 0.0, 0.0]) || breaks([-b[0] * 1.15, 0.0, 0.0]), "X");
+ assert!(!budget_sweep(1.0).any(|d| breaks(d)), "le budget lui-même doit tenir");
+ assert!(budget_sweep(1.15).any(|d| breaks(d)), "X et Y");
assert!(breaks([0.0, b[1] * 1.15, 0.0]) || breaks([0.0, -b[1] * 1.15, 0.0]), "Y");
- assert!(breaks([0.0, 0.0, 1.2]) && breaks([0.0, 0.0, -1.2]), "Z");
assert_eq!(b[2], 0.0, "Z n'a pas de budget");
}
@@ -2121,7 +2128,7 @@ mod tilt_tests {
/// `every_preset_stays_inside_the_original_rect`.
#[test]
fn the_budget_sweep_stays_inside_the_original_rect() {
- for name in ["iso", "left", "right"] {
+ for name in ["left", "right"] {
for (w, h) in [(1920.0f32, 1080.0f32), (1080.0, 1920.0), (800.0, 800.0)] {
for k in 0..=40 {
let strength = k as f32 / 40.0;
@@ -2162,7 +2169,7 @@ mod tilt_tests {
};
// `follow-cursor` n'incline pas l'écran (caméra réelle, `camera.rs`) : chaînée à un angle
// fixe, la transition passe par l'écran droit, que ce balayage couvre aussi.
- let presets = [None, Some("iso"), Some("left"), Some("right"), Some("follow-cursor")];
+ let presets = [None, Some("left"), Some("right"), Some("follow-cursor")];
for a in presets {
for b in presets {
// Transition chaînée sur [4, 5] s.
@@ -2215,7 +2222,7 @@ mod tilt_tests {
/// son ombre) ne respire pas avec la parallaxe.
#[test]
fn the_scale_is_frozen_while_only_the_dynamic_part_moves() {
- for name in ["iso", "left", "right"] {
+ for name in ["left", "right"] {
let base = preset(name);
let frozen = rotated_quad_corners_px(1920.0, 1080.0, base, [0.0; 3]);
for d in budget_sweep(1.0) {
@@ -2367,7 +2374,7 @@ mod tilt_tests {
assert!((bottom[0] + CLICK_IMPACT_DEG).abs() < 1e-2 && bottom[1].abs() < 1e-6, "{bottom:?}");
let z = |x: f32, y: f32, rot: [f32; 3]| rotate_corner(x, y, rot).2;
- for name in ["iso", "left", "right"] {
+ for name in ["left", "right"] {
let base = preset(name);
let with = |d: [f32; 3]| [base[0] + d[0], base[1] + d[1], base[2] + d[2]];
// Milieu du bord droit / du bord bas, et le bord opposé qui avance.
@@ -2456,7 +2463,7 @@ mod tilt_tests {
#[test]
fn a_corner_click_moves_the_plane_visibly_at_a_frozen_scale() {
let track = still(1.0, 1.0, vec![1.0]);
- for name in ["iso", "left", "right"] {
+ for name in ["left", "right"] {
let base = rotated_quad_corners_px(1920.0, 1080.0, preset(name), [0.0; 3]);
let mut worst = 0.0f32;
for i in 0..=26 {
@@ -2467,9 +2474,8 @@ mod tilt_tests {
worst = worst.max((a.0 - b.0).hypot(a.1 - b.1));
}
}
- // Mesuré : 13 px (iso), 16 (left), 17 (right) à 1080p pour un clic dans un coin. C'était
- // 24 à 27 px au budget de ±1,9° que le roulis des présets permettait.
- assert!(worst > 12.0, "{name} : {worst:.1} px, invisible");
+ // Mesuré à 1080p pour un clic dans un coin : voir la sortie en cas d'échec.
+ assert!(worst > 15.0, "{name} : {worst:.1} px, invisible");
}
}
@@ -2484,7 +2490,7 @@ mod tilt_tests {
focus_x: 0.5,
focus_y: 0.5,
focus_mode: None,
- rotation: Some("iso".into()),
+ rotation: Some("left".into()),
under_trim: false,
hide_cursor: false,
click_impact,
@@ -2511,7 +2517,7 @@ mod tilt_tests {
hide_cursor: false,
click_impact: false,
};
- assert_eq!(zoom_state_at(&[region(Some("iso"))], 5.0, None).tilt, 1.0);
+ assert_eq!(zoom_state_at(&[region(Some("left"))], 5.0, None).tilt, 1.0);
assert_eq!(zoom_state_at(&[region(None)], 5.0, None).tilt, 0.0);
let easing = zoom_state_at(&[region(Some("left"))], 1.2, None);
assert!(easing.tilt > 0.0 && easing.tilt < 1.0, "{}", easing.tilt);
@@ -2596,7 +2602,6 @@ mod tilt_tests {
// mapping inverse perd des pixels pourtant intérieurs au quad, le trou a exactement cette
// allure — un bord net, sans rapport avec la géométrie visible.
for (name, rot) in [
- ("iso", rotation3d_for(&Some("iso".into()))),
("left", rotation3d_for(&Some("left".into()))),
("right", rotation3d_for(&Some("right".into()))),
] {
@@ -2848,7 +2853,7 @@ mod follow_camera_tests {
let blind = zoom_state_at(&r, 5.0, None);
assert_eq!((blind.aim, blind.orbit), ([0.5, 0.5], [0.5, 0.5]));
// Un angle fixe garde exactement son état.
- let iso = zoom_state_in(&[region("iso", 2.0, 8.0)], 5.0, Some(&tr), &f, &ScreenClock::default());
+ let iso = zoom_state_in(&[region("left", 2.0, 8.0)], 5.0, Some(&tr), &f, &ScreenClock::default());
assert_eq!((iso.rotation, iso.camera, iso.click_impact), ([-23.0, -25.0, 0.0], 0.0, 1.0));
let unknown = zoom_state_in(&[region("orbit", 2.0, 8.0)], 5.0, Some(&tr), &f, &ScreenClock::default());
assert_eq!((unknown.rotation, unknown.tilt, unknown.camera), ([0.0; 3], 0.0, 0.0));
@@ -2874,7 +2879,7 @@ mod follow_camera_tests {
let tr = track(|t| (0.2 + 0.05 * t, 0.5));
let f = whole(&tr);
for regions in [
- [region("iso", 1.0, 4.0), region("follow-cursor", 4.5, 8.0)],
+ [region("left", 1.0, 4.0), region("follow-cursor", 4.5, 8.0)],
[region("follow-cursor", 1.0, 4.0), region("right", 4.5, 8.0)],
[region("follow-cursor", 1.0, 4.0), region("follow-cursor", 4.5, 8.0)],
] {
diff --git a/docs/3d-effects-v2.md b/docs/3d-effects-v2.md
index adf0b703e..add92b6d4 100644
--- a/docs/3d-effects-v2.md
+++ b/docs/3d-effects-v2.md
@@ -15,10 +15,9 @@ Ce document tranche les décisions que la v1 laissait ouvertes et découpe les P
### A.1 Ce qui existe
-Un zoom porte **une attitude figée** (`rotationPreset` : `iso`, `left`, `right`), animée par
+Un zoom porte **une attitude figée** (`rotationPreset` : `left`, `right`), animée par
deux effets qui partagent un unique budget d'angle dynamique (`DYNAMIC_TILT_BUDGET`
-= ±1,2° X, ±1,8° Y, 0° Z, `clamp_dynamic_tilt` ; ±1,9° X et ±3° Y tant que les angles fixes
-roulaient) :
+= ±1,9° X, ±3° Y, 0° Z, `clamp_dynamic_tilt`) :
- **la parallaxe** (`dynamic_tilt`, PR 1) : pilotée par la **vitesse** lissée du curseur ;
- **l'impact du clic** (PR 2b) : piloté par la **position** du clic, `regions::tap`.
@@ -40,24 +39,26 @@ mobile, qui tourne autour de l'écran.
| groupe | valeur | libellé (EN) | ce que ça fait |
|---|---|---|---|
| — | absent | Off | écran droit |
-| Angle fixe | `iso` | Angled from above | tourné vers la gauche, plongée marquée |
-| Angle fixe | `left` | Turned left | tourné vers la gauche |
-| Angle fixe | `right` | Turned right | tourné vers la droite |
+| Angle fixe | `left` | Screen turned left | tourné vers la gauche, vu d'en haut |
+| Angle fixe | `right` | Screen turned right | tourné vers la droite, vu d'en haut |
| Caméra mobile | `follow-cursor` | Orbits with the cursor | l'écran est immobile, une vraie caméra tourne autour de lui avec le curseur |
`swing-clicks` et `orbit` sont retirés (jamais livrés). La caméra mobile qui reste est l'orbite
ci-dessous, sous l'identifiant `follow-cursor`. Un projet qui les porte encore s'ouvre à plat
(valeur inconnue).
-Les trois angles fixes ne roulent plus : Z vaut 0, parce que le tilt entre avec le zoom et qu'une
+Les angles fixes ne roulent plus : Z vaut 0, parce que le tilt entre avec le zoom et qu'une
caméra qui bouge ne roule jamais le métrage (l'ancien roulis de −2°/±1° penchait l'image pendant
-chaque zoom). Sans roulis, la règle des 2° ne laisse que deux bandes de tangage, ≤ 9° ou ≥ 15° :
-`left` [−6,5, −17, 0], `right` [−6,5, 17, 0], `iso` [−23, −25, 0] (`regions::rotation3d_for`). Ils
-se dessinent au warp **projectif** exact, comme la caméra réelle : le warp bilinéaire penchait à
-lui seul la verticale du milieu de l'écran.
-
-« Turned right » veut dire que la face de l'écran regarde vers la droite : le bord droit
-recule. C'est ce que fait `right` [−6,5, 17, 0].
+chaque zoom). Sans roulis, la règle des 2° ne laisse que deux bandes de tangage, ≤ 9° ou ≥ 15°.
+Les deux angles prennent la bande haute, le regard de l'ancien `iso` : `left` [−23, −25, 0] et son
+miroir `right` [−23, 25, 0] (`regions::rotation3d_for`), qui rendent au budget dynamique ses
+±1,9° / ±3°. `iso` n'est plus proposé : c'était déjà ce regard, tourné à gauche, et un projet qui
+le porte se lit comme `left` (`readRotation3DPreset` et le schéma du document). Ils se dessinent
+au warp **projectif** exact, comme la caméra réelle : le warp bilinéaire penchait à lui seul la
+verticale du milieu de l'écran.
+
+« Screen turned right » veut dire que la face de l'écran regarde vers la droite : le bord droit
+recule. C'est ce que fait `right` [−23, 25, 0], vu d'en haut.
### A.3 `follow-cursor` : une caméra en orbite
diff --git a/src/components/ai-edition/depthOfFieldToggle.test.tsx b/src/components/ai-edition/depthOfFieldToggle.test.tsx
index c3fd590c7..6b8e02d46 100644
--- a/src/components/ai-edition/depthOfFieldToggle.test.tsx
+++ b/src/components/ai-edition/depthOfFieldToggle.test.tsx
@@ -13,7 +13,7 @@ import { VideoEffectsPane } from "./RightPanes";
vi.mock("sonner", () => ({ toast: { error: vi.fn(), success: vi.fn(), info: vi.fn() } }));
-function documentWithZoom(rotationPreset?: "iso"): AxcutDocument {
+function documentWithZoom(rotationPreset?: "left"): AxcutDocument {
const base = createEmptyDocument({ title: "T", projectId: "p1" });
return {
...base,
@@ -61,7 +61,7 @@ describe("depth of field toggle", () => {
});
it("is on by default with a tilted zoom, and turns off then on again", async () => {
- const toggle = mount(documentWithZoom("iso"));
+ const toggle = mount(documentWithZoom("left"));
expect(toggle).toBeEnabled();
expect(toggle).toHaveAttribute("aria-pressed", "true");
expect(screen.getByText("3D zooms")).toBeInTheDocument();
diff --git a/src/components/ai-edition/v4/FloatingInspector.test.tsx b/src/components/ai-edition/v4/FloatingInspector.test.tsx
index b27d29424..9b9ccaeb3 100644
--- a/src/components/ai-edition/v4/FloatingInspector.test.tsx
+++ b/src/components/ai-edition/v4/FloatingInspector.test.tsx
@@ -147,7 +147,7 @@ describe("FloatingInspector", () => {
});
it("is disabled with its reason when the region hides the cursor", () => {
- const { tl } = zoomTl({ rotationPreset: "iso", hideCursor: true });
+ const { tl } = zoomTl({ rotationPreset: "left", hideCursor: true });
render(<FloatingInspector {...defaultProps} tl={tl} />);
expect(
screen.getByRole("button", { name: "settings.zoom.clickImpact.title" }),
@@ -168,7 +168,7 @@ describe("FloatingInspector", () => {
it("is disabled with its reason when the cursor is hidden globally", () => {
editorSettings.cursorShow = false;
try {
- const { tl } = zoomTl({ rotationPreset: "iso" });
+ const { tl } = zoomTl({ rotationPreset: "left" });
render(<FloatingInspector {...defaultProps} tl={tl} />);
expect(
screen.getByRole("button", { name: "settings.zoom.clickImpact.title" }),
@@ -180,7 +180,7 @@ describe("FloatingInspector", () => {
});
it("toggles the region's clickImpact under a 3D preset", () => {
- const { tl, updateZoomClickImpact } = zoomTl({ rotationPreset: "iso" });
+ const { tl, updateZoomClickImpact } = zoomTl({ rotationPreset: "left" });
render(<FloatingInspector {...defaultProps} tl={tl} />);
const box = screen.getByRole("button", { name: "settings.zoom.clickImpact.title" });
expect(box).toBeEnabled();
@@ -226,7 +226,7 @@ describe("FloatingInspector", () => {
[...g.querySelectorAll("option")].map((o) => o.value),
]);
expect(groups).toEqual([
- ["settings.zoom.camera.fixed", ["iso", "left", "right"]],
+ ["settings.zoom.camera.fixed", ["left", "right"]],
["settings.zoom.camera.moving", ["follow-cursor"]],
]);
});
@@ -237,8 +237,8 @@ describe("FloatingInspector", () => {
const select = screen.getByRole("combobox", { name: "settings.zoom.camera.title" });
expect(select).toHaveValue("follow-cursor");
expect(screen.getByText("settings.zoom.camera.description.followCursor")).toBeInTheDocument();
- fireEvent.change(select, { target: { value: "iso" } });
- expect(updateZoomRotation).toHaveBeenCalledWith("z", "iso");
+ fireEvent.change(select, { target: { value: "left" } });
+ expect(updateZoomRotation).toHaveBeenCalledWith("z", "left");
fireEvent.change(select, { target: { value: "off" } });
expect(updateZoomRotation).toHaveBeenLastCalledWith("z", undefined);
});
diff --git a/src/components/ai-edition/v4/FloatingInspector.tsx b/src/components/ai-edition/v4/FloatingInspector.tsx
index 8a3a42e75..8878fcd19 100644
--- a/src/components/ai-edition/v4/FloatingInspector.tsx
+++ b/src/components/ai-edition/v4/FloatingInspector.tsx
@@ -344,7 +344,6 @@ function paneStack(label: string, control: React.ReactNode) {
/** Clé i18n (`zoom.camera.preset.*` / `zoom.camera.description.*`) de chaque caméra 3D. */
const CAMERA_KEYS: Record<Rotation3DPreset, string> = {
- iso: "iso",
left: "left",
right: "right",
"follow-cursor": "followCursor",
diff --git a/src/components/video-editor/projectPersistence.test.ts b/src/components/video-editor/projectPersistence.test.ts
index 800fe4bba..ef3f76f12 100644
--- a/src/components/video-editor/projectPersistence.test.ts
+++ b/src/components/video-editor/projectPersistence.test.ts
@@ -203,7 +203,7 @@ describe("projectPersistence media compatibility", () => {
const zoom = { startMs: 0, endMs: 1000, depth: 3 as const, focus: { cx: 0.5, cy: 0.5 } };
const [on, off, junk] = normalizeProjectEditor({
zoomRegions: [
- { ...zoom, id: "on", rotationPreset: "iso", clickImpact: true },
+ { ...zoom, id: "on", rotationPreset: "left", clickImpact: true },
{ ...zoom, id: "off" },
{ ...zoom, id: "junk", clickImpact: "yes" as never },
],
@@ -213,6 +213,18 @@ describe("projectPersistence media compatibility", () => {
expect("clickImpact" in junk).toBe(false);
});
+ it("reads the retired iso camera as Left, which kept its look", () => {
+ const zoom = { startMs: 0, endMs: 1000, depth: 3 as const, focus: { cx: 0.5, cy: 0.5 } };
+ const [iso, unknown] = normalizeProjectEditor({
+ zoomRegions: [
+ { ...zoom, id: "iso", rotationPreset: "iso" as never },
+ { ...zoom, id: "unknown", rotationPreset: "orbit" as never },
+ ],
+ }).zoomRegions;
+ expect(iso.rotationPreset).toBe("left");
+ expect("rotationPreset" in unknown).toBe(false);
+ });
+
it("accepts the dual frame webcam layout preset", () => {
expect(normalizeProjectEditor({ webcamLayoutPreset: "dual-frame" }).webcamLayoutPreset).toBe(
"dual-frame",
diff --git a/src/components/video-editor/projectPersistence.ts b/src/components/video-editor/projectPersistence.ts
index db017a2f6..69b17428e 100644
--- a/src/components/video-editor/projectPersistence.ts
+++ b/src/components/video-editor/projectPersistence.ts
@@ -39,12 +39,12 @@ import {
DEFAULT_WEBCAM_REACTIVE_ZOOM,
DEFAULT_ZOOM_DEPTH,
DEFAULT_ZOOM_MOTION_BLUR,
- isRotation3DPreset,
isWallpaperMotion,
MAX_BLUR_BLOCK_SIZE,
MAX_BLUR_INTENSITY,
MIN_BLUR_BLOCK_SIZE,
MIN_BLUR_INTENSITY,
+ readRotation3DPreset,
type SpeedRegion,
type TrimRegion,
type WallpaperMotion,
@@ -278,9 +278,8 @@ export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): Pro
const startMs = Math.max(0, Math.min(rawStart, rawEnd));
const endMs = Math.max(startMs + 1, rawEnd);
- const validPreset = isRotation3DPreset(region.rotationPreset)
- ? region.rotationPreset
- : undefined;
+ // A retired angle reads as the one that kept its look (`iso` → Left).
+ const validPreset = readRotation3DPreset(region.rotationPreset);
return {
id: region.id,
startMs,
diff --git a/src/components/video-editor/types.ts b/src/components/video-editor/types.ts
index 6aee9d5f9..e12534f5c 100644
--- a/src/components/video-editor/types.ts
+++ b/src/components/video-editor/types.ts
@@ -77,7 +77,7 @@ export const DEFAULT_ROTATION_3D: Rotation3D = {
};
/** A fixed 3D angle: the screen holds one pose for the whole zoom. */
-export const FIXED_ROTATION_3D_PRESETS = ["iso", "left", "right"] as const;
+export const FIXED_ROTATION_3D_PRESETS = ["left", "right"] as const;
export type FixedRotation3DPreset = (typeof FIXED_ROTATION_3D_PRESETS)[number];
/**
@@ -101,13 +101,22 @@ export function isRotation3DPreset(value: unknown): value is Rotation3DPreset {
return typeof value === "string" && (ROTATION_3D_PRESET_ORDER as string[]).includes(value);
}
+/**
+ * A stored 3D camera, read: the presets that no longer exist map to the one that kept their look.
+ * `iso` (turned left, seen from above) became Left. Anything else unknown reads as a flat screen.
+ */
+export function readRotation3DPreset(value: unknown): Rotation3DPreset | undefined {
+ if (value === "iso") return "left";
+ return isRotation3DPreset(value) ? value : undefined;
+}
+
// No preset rolls (Z is 0): the tilt enters with the zoom, and a camera that moves never rolls the
// footage. X and Y are chosen so that no edge of the projected quad comes within 2° of an axis — a
// perfectly vertical edge cutting through text is indistinguishable from `overflow: hidden`, which
// got reported three times as "the recording is truncated". A pure Y rotation keeps both vertical
// edges vertical, so every preset also pitches; and between 10° and 14° of pitch the top edge of a
-// turned screen reads level, so a preset pitches either less or more than that. `regions.rs` holds
-// the same numbers and the tests.
+// turned screen reads level, so both presets pitch well beyond it: turned and seen from above,
+// the old `iso` look. `regions.rs` holds the same numbers and the tests.
//
// A moving camera has no single pose. Its entry is its resting angle (`ELEVATION_DEG` in
// `camera.rs`: cursor centred, the camera 4° above the screen, facing it), what a renderer without
@@ -115,9 +124,8 @@ export function isRotation3DPreset(value: unknown): value is Rotation3DPreset {
// rotation of the screen. It is a camera angle, not a screen rotation, so this is the nearest
// equivalent rather than the same picture.
export const ROTATION_3D_PRESETS: Record<Rotation3DPreset, Rotation3D> = {
- iso: { rotationX: -23, rotationY: -25, rotationZ: 0 },
- left: { rotationX: -6.5, rotationY: -17, rotationZ: 0 },
- right: { rotationX: -6.5, rotationY: 17, rotationZ: 0 },
+ left: { rotationX: -23, rotationY: -25, rotationZ: 0 },
+ right: { rotationX: -23, rotationY: 25, rotationZ: 0 },
"follow-cursor": { rotationX: -4, rotationY: 0, rotationZ: 0 },
};
diff --git a/src/i18n/locales/ar/settings.json b/src/i18n/locales/ar/settings.json
index 52f5b30db..cc2a43be1 100644
--- a/src/i18n/locales/ar/settings.json
+++ b/src/i18n/locales/ar/settings.json
@@ -362,16 +362,14 @@
"fixed": "زاوية ثابتة",
"moving": "كاميرا متحركة",
"preset": {
- "iso": "مائلة من الأعلى",
"left": "الشاشة مستديرة لليسار",
"right": "الشاشة مستديرة لليمين",
"followCursor": "يدور مع المؤشر"
},
"description": {
"off": "تبقى الشاشة مسطحة.",
- "iso": "وضعية واحدة ثابتة: مستديرة لليسار ومرئية من الأعلى.",
- "left": "وضعية واحدة ثابتة: الشاشة تتجه إلى اليسار وحافتها اليمنى تتقدم.",
- "right": "وضعية واحدة ثابتة: الشاشة تتجه إلى اليمين وحافتها اليسرى تتقدم.",
+ "left": "وضعية واحدة ثابتة: مستديرة لليسار ومرئية من الأعلى.",
+ "right": "وضعية واحدة ثابتة: مستديرة لليمين ومرئية من الأعلى.",
"followCursor": "تبقى الشاشة ثابتة، وتدور الكاميرا حولها نحو جهة المؤشر وترتفع أو تنخفض معه."
},
"needsCursor": "المؤشر مخفي: لا شيء تتبعه هذه الكاميرا، فتحافظ على زاويتها الابتدائية."
diff --git a/src/i18n/locales/cs/settings.json b/src/i18n/locales/cs/settings.json
index 7fc99ec5b..423226410 100644
--- a/src/i18n/locales/cs/settings.json
+++ b/src/i18n/locales/cs/settings.json
@@ -362,16 +362,14 @@
"fixed": "Pevný úhel",
"moving": "Pohyblivá kamera",
"preset": {
- "iso": "Šikmo shora",
"left": "Obrazovka natočená doleva",
"right": "Obrazovka natočená doprava",
"followCursor": "Obíhá s kurzorem"
},
"description": {
"off": "Obrazovka zůstane rovná.",
- "iso": "Drží jednu pózu: natočená doleva a viděná shora.",
- "left": "Drží jednu pózu: obrazovka hledí doleva, její pravý okraj vystupuje dopředu.",
- "right": "Drží jednu pózu: obrazovka hledí doprava, její levý okraj vystupuje dopředu.",
+ "left": "Drží jednu pózu: natočená doleva a viděná shora.",
+ "right": "Drží jednu pózu: natočená doprava a viděná shora.",
"followCursor": "Obrazovka zůstává v klidu; kamera kolem ní krouží na stranu kurzoru a stoupá či klesá s ním."
},
"needsCursor": "Kurzor je skrytý: tato kamera nemá co sledovat a drží svůj výchozí úhel."
diff --git a/src/i18n/locales/de/settings.json b/src/i18n/locales/de/settings.json
index 74784272e..241e25fea 100644
--- a/src/i18n/locales/de/settings.json
+++ b/src/i18n/locales/de/settings.json
@@ -362,16 +362,14 @@
"fixed": "Fester Winkel",
"moving": "Bewegte Kamera",
"preset": {
- "iso": "Schräg von oben",
"left": "Bildschirm nach links gedreht",
"right": "Bildschirm nach rechts gedreht",
"followCursor": "Kreist mit dem Cursor"
},
"description": {
"off": "Der Bildschirm bleibt flach.",
- "iso": "Hält eine Pose: nach links gedreht und von oben gesehen.",
- "left": "Hält eine Pose: Der Bildschirm zeigt nach links, seine rechte Kante kommt nach vorn.",
- "right": "Hält eine Pose: Der Bildschirm zeigt nach rechts, seine linke Kante kommt nach vorn.",
+ "left": "Hält eine Pose: nach links gedreht und von oben gesehen.",
+ "right": "Hält eine Pose: nach rechts gedreht und von oben gesehen.",
"followCursor": "Der Bildschirm bleibt stehen; die Kamera kreist um ihn, schwenkt zur Seite des Cursors und hebt oder senkt sich mit ihm."
},
"needsCursor": "Der Cursor ist ausgeblendet: Diese Kamera hat nichts zu folgen und hält ihren Startwinkel."
diff --git a/src/i18n/locales/en/settings.json b/src/i18n/locales/en/settings.json
index aad2ad560..c870e3b98 100644
--- a/src/i18n/locales/en/settings.json
+++ b/src/i18n/locales/en/settings.json
@@ -362,16 +362,14 @@
"fixed": "Fixed angle",
"moving": "Moving camera",
"preset": {
- "iso": "Angled from above",
"left": "Screen turned left",
"right": "Screen turned right",
"followCursor": "Orbits with the cursor"
},
"description": {
"off": "The screen stays flat.",
- "iso": "Holds one pose: turned left and seen from above.",
- "left": "Holds one pose: the screen faces left, its right edge comes forward.",
- "right": "Holds one pose: the screen faces right, its left edge comes forward.",
+ "left": "Holds one pose: turned left and seen from above.",
+ "right": "Holds one pose: turned right and seen from above.",
"followCursor": "The screen stays still; the camera circles it, swinging to the cursor's side and rising or dipping with it."
},
"needsCursor": "The cursor is hidden: this camera has nothing to follow and holds its starting angle."
diff --git a/src/i18n/locales/es/settings.json b/src/i18n/locales/es/settings.json
index e159d8e72..ffea51645 100644
--- a/src/i18n/locales/es/settings.json
+++ b/src/i18n/locales/es/settings.json
@@ -362,16 +362,14 @@
"fixed": "Ángulo fijo",
"moving": "Cámara en movimiento",
"preset": {
- "iso": "Picado en diagonal",
"left": "Pantalla girada a la izquierda",
"right": "Pantalla girada a la derecha",
"followCursor": "Gira con el cursor"
},
"description": {
"off": "La pantalla se queda plana.",
- "iso": "Mantiene una sola pose: girada a la izquierda y vista desde arriba.",
- "left": "Mantiene una sola pose: la pantalla mira a la izquierda y su borde derecho avanza.",
- "right": "Mantiene una sola pose: la pantalla mira a la derecha y su borde izquierdo avanza.",
+ "left": "Mantiene una sola pose: girada a la izquierda y vista desde arriba.",
+ "right": "Mantiene una sola pose: girada a la derecha y vista desde arriba.",
"followCursor": "La pantalla no se mueve; la cámara la rodea hacia el lado del cursor y sube o baja con él."
},
"needsCursor": "El cursor está oculto: esta cámara no tiene nada que seguir y mantiene su ángulo inicial."
diff --git a/src/i18n/locales/fr/settings.json b/src/i18n/locales/fr/settings.json
index 6b8e27c7a..43c1f38af 100644
--- a/src/i18n/locales/fr/settings.json
+++ b/src/i18n/locales/fr/settings.json
@@ -362,16 +362,14 @@
"fixed": "Angle fixe",
"moving": "Caméra mobile",
"preset": {
- "iso": "Plongée de biais",
"left": "Écran tourné à gauche",
"right": "Écran tourné à droite",
"followCursor": "Tourne avec le curseur"
},
"description": {
"off": "L'écran reste à plat.",
- "iso": "Garde une seule pose : tourné vers la gauche et vu d'en haut.",
- "left": "Garde une seule pose : l'écran regarde vers la gauche, son bord droit avance.",
- "right": "Garde une seule pose : l'écran regarde vers la droite, son bord gauche avance.",
+ "left": "Garde une seule pose : tourné vers la gauche et vu d'en haut.",
+ "right": "Garde une seule pose : tourné vers la droite et vu d'en haut.",
"followCursor": "L'écran reste immobile ; la caméra tourne autour, du côté du curseur, et monte ou descend avec lui."
},
"needsCursor": "Le curseur est masqué : cette caméra n'a rien à suivre et garde son angle de départ."
diff --git a/src/i18n/locales/it/settings.json b/src/i18n/locales/it/settings.json
index 085c6dd3f..55b6b0f3f 100644
--- a/src/i18n/locales/it/settings.json
+++ b/src/i18n/locales/it/settings.json
@@ -362,16 +362,14 @@
"fixed": "Angolo fisso",
"moving": "Camera in movimento",
"preset": {
- "iso": "Dall'alto di sbieco",
"left": "Schermo ruotato a sinistra",
"right": "Schermo ruotato a destra",
"followCursor": "Ruota con il cursore"
},
"description": {
"off": "Lo schermo resta piatto.",
- "iso": "Mantiene una sola posa: ruotato a sinistra e visto dall'alto.",
- "left": "Mantiene una sola posa: lo schermo guarda a sinistra e il bordo destro avanza.",
- "right": "Mantiene una sola posa: lo schermo guarda a destra e il bordo sinistro avanza.",
+ "left": "Mantiene una sola posa: ruotato a sinistra e visto dall'alto.",
+ "right": "Mantiene una sola posa: ruotato a destra e visto dall'alto.",
"followCursor": "Lo schermo resta fermo; la telecamera gli gira intorno dal lato del cursore e sale o scende con esso."
},
"needsCursor": "Il cursore è nascosto: questa telecamera non ha nulla da seguire e mantiene l'angolo iniziale."
diff --git a/src/i18n/locales/ja-JP/settings.json b/src/i18n/locales/ja-JP/settings.json
index 05a419369..def54d603 100644
--- a/src/i18n/locales/ja-JP/settings.json
+++ b/src/i18n/locales/ja-JP/settings.json
@@ -362,16 +362,14 @@
"fixed": "固定アングル",
"moving": "動くカメラ",
"preset": {
- "iso": "斜め上から",
"left": "画面を左向きに",
"right": "画面を右向きに",
"followCursor": "カーソルに合わせて回り込む"
},
"description": {
"off": "画面は平らなままです。",
- "iso": "1つの姿勢を保ちます:左向きで、上から見下ろします。",
- "left": "1つの姿勢を保ちます:画面が左を向き、右端が手前に出ます。",
- "right": "1つの姿勢を保ちます:画面が右を向き、左端が手前に出ます。",
+ "left": "1つの姿勢を保ちます:左向きで、上から見下ろします。",
+ "right": "1つの姿勢を保ちます:右向きで、上から見下ろします。",
"followCursor": "画面は動かず、カメラが画面の周りを回ってカーソルのある側へ移り、カーソルに合わせて上下します。"
},
"needsCursor": "カーソルが非表示です:このカメラは追う対象がなく、最初のアングルのままです。"
diff --git a/src/i18n/locales/ko-KR/settings.json b/src/i18n/locales/ko-KR/settings.json
index c39788147..f4aeb6916 100644
--- a/src/i18n/locales/ko-KR/settings.json
+++ b/src/i18n/locales/ko-KR/settings.json
@@ -362,16 +362,14 @@
"fixed": "고정 각도",
"moving": "움직이는 카메라",
"preset": {
- "iso": "위에서 비스듬히",
"left": "화면 왼쪽으로 돌림",
"right": "화면 오른쪽으로 돌림",
"followCursor": "커서를 따라 회전"
},
"description": {
"off": "화면이 평평하게 유지됩니다.",
- "iso": "한 자세를 유지합니다: 왼쪽으로 돌아가 있고 위에서 내려다봅니다.",
- "left": "한 자세를 유지합니다: 화면이 왼쪽을 향하고 오른쪽 가장자리가 앞으로 나옵니다.",
- "right": "한 자세를 유지합니다: 화면이 오른쪽을 향하고 왼쪽 가장자리가 앞으로 나옵니다.",
+ "left": "한 자세를 유지합니다: 왼쪽으로 돌아가 있고 위에서 내려다봅니다.",
+ "right": "한 자세를 유지합니다: 오른쪽으로 돌아가 있고 위에서 내려다봅니다.",
"followCursor": "화면은 고정된 채, 카메라가 화면 주위를 돌아 커서가 있는 쪽으로 가고 커서를 따라 오르내립니다."
},
"needsCursor": "커서가 숨겨져 있습니다. 이 카메라는 따라갈 대상이 없어 시작 각도를 유지합니다."
diff --git a/src/i18n/locales/pt-BR/settings.json b/src/i18n/locales/pt-BR/settings.json
index 823d0c8b7..03e871546 100644
--- a/src/i18n/locales/pt-BR/settings.json
+++ b/src/i18n/locales/pt-BR/settings.json
@@ -362,16 +362,14 @@
"fixed": "Ângulo fixo",
"moving": "Câmera em movimento",
"preset": {
- "iso": "De cima, na diagonal",
"left": "Tela virada para a esquerda",
"right": "Tela virada para a direita",
"followCursor": "Gira com o cursor"
},
"description": {
"off": "A tela fica plana.",
- "iso": "Mantém uma única pose: virada para a esquerda e vista de cima.",
- "left": "Mantém uma única pose: a tela olha para a esquerda e a borda direita avança.",
- "right": "Mantém uma única pose: a tela olha para a direita e a borda esquerda avança.",
+ "left": "Mantém uma única pose: virada para a esquerda e vista de cima.",
+ "right": "Mantém uma única pose: virada para a direita e vista de cima.",
"followCursor": "A tela fica parada; a câmera gira ao redor dela, para o lado do cursor, e sobe ou desce com ele."
},
"needsCursor": "O cursor está oculto: esta câmera não tem o que seguir e mantém seu ângulo inicial."
diff --git a/src/i18n/locales/ru/settings.json b/src/i18n/locales/ru/settings.json
index 123fef3dd..93a5decdc 100644
--- a/src/i18n/locales/ru/settings.json
+++ b/src/i18n/locales/ru/settings.json
@@ -362,16 +362,14 @@
"fixed": "Фиксированный ракурс",
"moving": "Подвижная камера",
"preset": {
- "iso": "Сверху под углом",
"left": "Экран повёрнут влево",
"right": "Экран повёрнут вправо",
"followCursor": "Облетает за курсором"
},
"description": {
"off": "Экран остаётся плоским.",
- "iso": "Одна поза: экран повёрнут влево и виден сверху.",
- "left": "Одна поза: экран смотрит влево, его правый край выдвинут вперёд.",
- "right": "Одна поза: экран смотрит вправо, его левый край выдвинут вперёд.",
+ "left": "Одна поза: экран повёрнут влево и виден сверху.",
+ "right": "Одна поза: экран повёрнут вправо и виден сверху.",
"followCursor": "Экран неподвижен; камера облетает его, уходя в сторону курсора и поднимаясь или опускаясь вместе с ним."
},
"needsCursor": "Курсор скрыт: этой камере нечего отслеживать, и она сохраняет начальный угол."
diff --git a/src/i18n/locales/tr/settings.json b/src/i18n/locales/tr/settings.json
index 4d1609f86..5cf718750 100644
--- a/src/i18n/locales/tr/settings.json
+++ b/src/i18n/locales/tr/settings.json
@@ -362,16 +362,14 @@
"fixed": "Sabit açı",
"moving": "Hareketli kamera",
"preset": {
- "iso": "Yukarıdan çapraz",
"left": "Ekran sola dönük",
"right": "Ekran sağa dönük",
"followCursor": "İmleçle birlikte döner"
},
"description": {
"off": "Ekran düz kalır.",
- "iso": "Tek bir pozda kalır: sola dönük ve yukarıdan görünür.",
- "left": "Tek bir pozda kalır: ekran sola bakar, sağ kenarı öne çıkar.",
- "right": "Tek bir pozda kalır: ekran sağa bakar, sol kenarı öne çıkar.",
+ "left": "Tek bir pozda kalır: sola dönük ve yukarıdan görünür.",
+ "right": "Tek bir pozda kalır: sağa dönük ve yukarıdan görünür.",
"followCursor": "Ekran sabit kalır; kamera etrafında imlecin olduğu tarafa döner ve imleçle birlikte yükselip alçalır."
},
"needsCursor": "İmleç gizli: bu kameranın izleyecek bir şeyi yok ve başlangıç açısında kalır."
diff --git a/src/i18n/locales/vi/settings.json b/src/i18n/locales/vi/settings.json
index 8549a7c2e..786a0ec51 100644
--- a/src/i18n/locales/vi/settings.json
+++ b/src/i18n/locales/vi/settings.json
@@ -362,16 +362,14 @@
"fixed": "Góc cố định",
"moving": "Camera chuyển động",
"preset": {
- "iso": "Chéo từ trên xuống",
"left": "Màn hình xoay sang trái",
"right": "Màn hình xoay sang phải",
"followCursor": "Xoay quanh theo con trỏ"
},
"description": {
"off": "Màn hình giữ phẳng.",
- "iso": "Giữ một tư thế: xoay sang trái và nhìn từ trên xuống.",
- "left": "Giữ một tư thế: màn hình hướng sang trái, cạnh phải nhô về phía trước.",
- "right": "Giữ một tư thế: màn hình hướng sang phải, cạnh trái nhô về phía trước.",
+ "left": "Giữ một tư thế: xoay sang trái và nhìn từ trên xuống.",
+ "right": "Giữ một tư thế: xoay sang phải và nhìn từ trên xuống.",
"followCursor": "Màn hình đứng yên; máy quay bay vòng quanh, sang phía có con trỏ và nâng lên hay hạ xuống theo nó."
},
"needsCursor": "Con trỏ đang bị ẩn: máy quay này không có gì để theo dõi và giữ nguyên góc ban đầu."
diff --git a/src/i18n/locales/zh-CN/settings.json b/src/i18n/locales/zh-CN/settings.json
index 2b28817de..a6d0d60ea 100644
--- a/src/i18n/locales/zh-CN/settings.json
+++ b/src/i18n/locales/zh-CN/settings.json
@@ -362,16 +362,14 @@
"fixed": "固定角度",
"moving": "运动镜头",
"preset": {
- "iso": "斜上方俯视",
"left": "画面向左转",
"right": "画面向右转",
"followCursor": "随光标环绕"
},
"description": {
"off": "画面保持平整。",
- "iso": "保持单一姿态:向左转,并从上方俯视。",
- "left": "保持单一姿态:画面朝向左侧,右边缘向前。",
- "right": "保持单一姿态:画面朝向右侧,左边缘向前。",
+ "left": "保持单一姿态:向左转,并从上方俯视。",
+ "right": "保持单一姿态:向右转,并从上方俯视。",
"followCursor": "屏幕保持不动,镜头绕着屏幕转到光标所在的一侧,并随光标升降。"
},
"needsCursor": "光标已隐藏:此镜头没有可跟随的对象,保持初始角度。"
diff --git a/src/i18n/locales/zh-TW/settings.json b/src/i18n/locales/zh-TW/settings.json
index d310920a8..642e13008 100644
--- a/src/i18n/locales/zh-TW/settings.json
+++ b/src/i18n/locales/zh-TW/settings.json
@@ -362,16 +362,14 @@
"fixed": "固定角度",
"moving": "運動鏡頭",
"preset": {
- "iso": "斜上方俯視",
"left": "畫面向左轉",
"right": "畫面向右轉",
"followCursor": "隨游標環繞"
},
"description": {
"off": "畫面保持平整。",
- "iso": "保持單一姿態:向左轉,並從上方俯視。",
- "left": "保持單一姿態:畫面朝向左側,右邊緣向前。",
- "right": "保持單一姿態:畫面朝向右側,左邊緣向前。",
+ "left": "保持單一姿態:向左轉,並從上方俯視。",
+ "right": "保持單一姿態:向右轉,並從上方俯視。",
"followCursor": "螢幕保持不動,鏡頭繞著螢幕轉到游標所在的一側,並隨游標升降。"
},
"needsCursor": "游標已隱藏:此鏡頭沒有可跟隨的對象,維持初始角度。"
diff --git a/src/lib/ai-edition/document/migrate.test.ts b/src/lib/ai-edition/document/migrate.test.ts
index 6fd417c5f..5168e7e6a 100644
--- a/src/lib/ai-edition/document/migrate.test.ts
+++ b/src/lib/ai-edition/document/migrate.test.ts
@@ -110,7 +110,7 @@ describe("migrateProjectDataToAxcutDocument", () => {
depth: 4,
focus: { cx: 1.5, cy: -0.5 },
focusMode: "manual",
- rotationPreset: "iso",
+ rotationPreset: "iso" as never,
customScale: 2.5,
source: "manual",
hideCursor: true,
@@ -128,7 +128,8 @@ describe("migrateProjectDataToAxcutDocument", () => {
expect(z.startMs).toBe(0);
expect(z.endMs).toBe(2000);
expect(z.customScale).toBe(2.5);
- expect(z.rotationPreset).toBe("iso");
+ // `iso`, retired, reads as Left: the angle that kept its look.
+ expect(z.rotationPreset).toBe("left");
expect(z.hideCursor).toBe(true);
expect(z.clickImpact).toBe(true);
});
diff --git a/src/lib/ai-edition/schema/index.ts b/src/lib/ai-edition/schema/index.ts
index 4c3d833f3..c0cda3e97 100644
--- a/src/lib/ai-edition/schema/index.ts
+++ b/src/lib/ai-edition/schema/index.ts
@@ -499,8 +499,13 @@ export const zoomRegionSchema = endGteStart(
focusMode: z.enum(["manual", "auto"]).optional(),
/** The zoom's 3D camera (`Rotation3DPreset` in `components/video-editor/types.ts` — same
* literal list, duplicated here): a fixed angle, or the camera that turns to the cursor
- * (`crates/compositor/src/camera.rs`). Absent means a flat screen. */
- rotationPreset: z.enum(["iso", "left", "right", "follow-cursor"]).optional(),
+ * (`crates/compositor/src/camera.rs`). Absent means a flat screen. A stored `iso`, the
+ * retired "turned left, seen from above" angle, reads as `left`, which kept its look
+ * (`readRotation3DPreset`): every document load goes through this parse. */
+ rotationPreset: z
+ .enum(["iso", "left", "right", "follow-cursor"])
+ .transform((preset) => (preset === "iso" ? "left" : preset))
+ .optional(),
customScale: z.number().positive().optional(),
source: z.enum(["auto", "manual"]).optional(),
hideCursor: z.boolean().optional(),
diff --git a/src/lib/ai-edition/store/useTimeline.test.ts b/src/lib/ai-edition/store/useTimeline.test.ts
index 8b9ef43b3..19462058d 100644
--- a/src/lib/ai-edition/store/useTimeline.test.ts
+++ b/src/lib/ai-edition/store/useTimeline.test.ts
@@ -764,11 +764,11 @@ describe("useTimeline zoom modifiers (rotation + focus mode)", () => {
it("sets a 3D rotation preset on the region", async () => {
const { result } = renderTimeline();
await act(async () => {
- await result.current.updateZoomRotation("zoom_a", "iso");
+ await result.current.updateZoomRotation("zoom_a", "left");
});
expect(useProjectStore.getState().document?.zoomRanges[0]).toMatchObject({
id: "zoom_a",
- rotationPreset: "iso",
+ rotationPreset: "left",
});
});
@@ -777,7 +777,7 @@ describe("useTimeline zoom modifiers (rotation + focus mode)", () => {
// optional and the native side treats anything unrecognised as zero rotation.
const { result } = renderTimeline();
await act(async () => {
- await result.current.updateZoomRotation("zoom_a", "iso");
+ await result.current.updateZoomRotation("zoom_a", "left");
});
await act(async () => {
await result.current.updateZoomRotation("zoom_a", undefined);
@@ -803,7 +803,7 @@ describe("useTimeline zoom modifiers (rotation + focus mode)", () => {
// One control, one field: a moving camera replaces a fixed angle instead of stacking on it.
const { result } = renderTimeline();
await act(async () => {
- await result.current.updateZoomRotation("zoom_a", "iso");
+ await result.current.updateZoomRotation("zoom_a", "left");
});
await act(async () => {
await result.current.updateZoomRotation("zoom_a", "follow-cursor");
@@ -1258,7 +1258,7 @@ describe("useTimeline undo history", () => {
const { result } = renderTimeline();
const pDepth = result.current.updateZoomDepth("zoom_a", 4);
- const pRotation = result.current.updateZoomRotation("zoom_a", "iso");
+ const pRotation = result.current.updateZoomRotation("zoom_a", "left");
await waitFor(() => expect(gate.release).toEqual(expect.any(Function)));
await act(async () => {
gate.release?.();
@@ -1267,7 +1267,7 @@ describe("useTimeline undo history", () => {
expect(useProjectStore.getState().document?.zoomRanges[0]).toMatchObject({
depth: 4,
- rotationPreset: "iso",
+ rotationPreset: "left",
});
});
@@ -1418,7 +1418,7 @@ describe("useTimeline undo history", () => {
expect(useProjectStore.getState().document?.zoomRanges[0]?.depth).toBe(4);
const gate = gateFirstSave();
- const pRotation = result.current.updateZoomRotation("zoom_a", "iso");
+ const pRotation = result.current.updateZoomRotation("zoom_a", "left");
const pCursor = result.current.updateZoomHideCursor("zoom_a", true);
await waitFor(() => expect(gate.release).toEqual(expect.any(Function)));
let undid = false;
@@ -1452,7 +1452,7 @@ describe("useTimeline undo history", () => {
};
const gate = gateFirstSave();
- const pRotation = result.current.updateZoomRotation("zoom_a", "iso");
+ const pRotation = result.current.updateZoomRotation("zoom_a", "left");
const pCursor = result.current.updateZoomHideCursor("zoom_a", true);
await waitFor(() => expect(gate.release).toEqual(expect.any(Function)));
bridgeMocks.get.mockResolvedValue({ success: true, document: projectB });
@@ -1518,7 +1518,7 @@ describe("useTimeline undo history", () => {
// A later zoom write is refused while that save is still unknown.
let rotationOk: boolean | undefined;
await act(async () => {
- rotationOk = await result.current.updateZoomRotation("zoom_a", "iso");
+ rotationOk = await result.current.updateZoomRotation("zoom_a", "left");
});
expect(rotationOk).toBe(false);
expect(useProjectStore.getState().document?.zoomRanges[0]?.rotationPreset).toBeUndefined();
diff --git a/src/native/sceneDescription.test.ts b/src/native/sceneDescription.test.ts
index 14724f53d..7ea4fe9b6 100644
--- a/src/native/sceneDescription.test.ts
+++ b/src/native/sceneDescription.test.ts
@@ -692,14 +692,14 @@ describe("buildSceneDescription.zoomRegions", () => {
endMs: 5000,
depth: 4,
focus: { cx: 0.25, cy: 0.75 },
- rotationPreset: "iso",
+ rotationPreset: "left",
hideCursor: true,
});
const doc = makeDoc({ zoomRanges: [z] });
const { zoomRegions } = buildSceneDescription(doc);
expect(zoomRegions[0].focusX).toBe(0.25);
expect(zoomRegions[0].focusY).toBe(0.75);
- expect(zoomRegions[0].rotation).toBe("iso");
+ expect(zoomRegions[0].rotation).toBe("left");
expect(zoomRegions[0].hideCursor).toBe(true);
});
@@ -709,7 +709,7 @@ describe("buildSceneDescription.zoomRegions", () => {
endMs: 1000,
depth: 3 as const,
focus: { cx: 0.5, cy: 0.5 },
- rotationPreset: "iso" as const,
+ rotationPreset: "left" as const,
};
const doc = makeDoc({
zoomRanges: [