diff --git a/relief/rt-prep/src/lib.rs b/relief/rt-prep/src/lib.rs index 8830feb..52564f7 100644 --- a/relief/rt-prep/src/lib.rs +++ b/relief/rt-prep/src/lib.rs @@ -96,10 +96,15 @@ pub fn colonnes_tuile(mnt: &Mnt, o: &WorldOrigin, id: TileId) -> Option 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); + } }