rt-prep: exposition ecrite dans les tuiles, pente Horn / pas
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Cette révision appartient à :
1 Parent
7acda01811
révision
d4e96c6e47
1 fichier modifié
+25
-2
@@ -96,10 +96,15 @@ pub fn colonnes_tuile(mnt: &Mnt, o: &WorldOrigin, id: TileId) -> Option<Vec<Colu
|
||||
if (-1..=1).any(|dz| (-1..=1).any(|dx| at(dx, dz) == 0.0)) {
|
||||
continue;
|
||||
}
|
||||
let dzdx = ((at(1, -1) + 2.0 * at(1, 0) + at(1, 1)) - (at(-1, -1) + 2.0 * at(-1, 0) + at(-1, 1))) / 8.0;
|
||||
let dzdz = ((at(-1, 1) + 2.0 * at(0, 1) + at(1, 1)) - (at(-1, -1) + 2.0 * at(0, -1) + at(1, -1))) / 8.0;
|
||||
let k = 8.0 * mnt.pas as f32;
|
||||
let dzdx = ((at(1, -1) + 2.0 * at(1, 0) + at(1, 1)) - (at(-1, -1) + 2.0 * at(-1, 0) + at(-1, 1))) / k;
|
||||
let dzdz = ((at(-1, 1) + 2.0 * at(0, 1) + at(1, 1)) - (at(-1, -1) + 2.0 * at(0, -1) + at(1, -1))) / k;
|
||||
let pente = (dzdx.hypot(dzdz)).atan().to_degrees();
|
||||
cols[lz * SIDE + lx].slope_deg = pente.round().clamp(0.0, 90.0) as u8;
|
||||
// Exposition : direction de descente, 0 = nord, 90 = est, codee sur 256 pas (1,40625 deg).
|
||||
// dzdx > 0 : monte vers l'est ; dzdz > 0 : monte vers le sud (z croissant).
|
||||
let asp = (-dzdx).atan2(dzdz).to_degrees().rem_euclid(360.0);
|
||||
cols[lz * SIDE + lx].aspect = ((asp / 360.0 * 256.0).round() as u32 % 256) as u8;
|
||||
}
|
||||
}
|
||||
(n > 0).then_some(cols)
|
||||
@@ -158,4 +163,22 @@ mod tests {
|
||||
assert_eq!(at(4, 0).ground_dm, 0);
|
||||
assert!(colonnes_tuile(&m, &o, TileId { tx: 1, tz: 0 }).is_none());
|
||||
}
|
||||
|
||||
/// Plan incline : monte vers le sud (z croissant) -> descend vers le nord -> aspect 0 ;
|
||||
/// monte vers l'est -> descend vers l'ouest -> aspect 270 deg = 192/256.
|
||||
#[test]
|
||||
fn exposition_et_pente() {
|
||||
let o = WorldOrigin::LANS;
|
||||
let plan = |f: &dyn Fn(usize, usize) -> f32| Mnt {
|
||||
largeur: 20, hauteur: 20, x0: 903_000.0, y0: 6_451_500.0, pas: 1.0, nodata: None,
|
||||
valeurs: (0..400).map(|i| 1100.0 + f(i % 20, i / 20)).collect(),
|
||||
};
|
||||
let m = plan(&|_, r| r as f32);
|
||||
let cols = colonnes_tuile(&m, &o, TileId { tx: 0, tz: 0 }).unwrap();
|
||||
let c = cols[(2 + 10) * SIDE + 2 + 10];
|
||||
assert_eq!((c.slope_deg, c.aspect), (45, 0));
|
||||
let m = plan(&|c, _| c as f32);
|
||||
let cols = colonnes_tuile(&m, &o, TileId { tx: 0, tz: 0 }).unwrap();
|
||||
assert_eq!(cols[(2 + 10) * SIDE + 2 + 10].aspect, 192);
|
||||
}
|
||||
}
|
||||
Référencer dans un nouveau ticket
Bloquer un utilisateur