From 56426dcb6f3afe4a8685ab3fa7960b58545f8b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Gastinel?= Date: Fri, 30 Oct 2026 09:06:15 +0100 Subject: [PATCH] rt-core: types partages proc (BiomeRelief, Roche, ClasseSol) Co-Authored-By: Claude Sonnet 5.5 --- relief/Cargo.lock | 68 ++++++++++++++++++++++++++++++++++++++ relief/rt-core/Cargo.toml | 3 ++ relief/rt-core/src/lib.rs | 1 + relief/rt-core/src/proc.rs | 26 +++++++++++++++ 4 files changed, 98 insertions(+) create mode 100644 relief/rt-core/src/proc.rs diff --git a/relief/Cargo.lock b/relief/Cargo.lock index 34d6367..4873c23 100644 --- a/relief/Cargo.lock +++ b/relief/Cargo.lock @@ -65,9 +65,30 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "proc-macro2" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" +dependencies = [ + "proc-macro2", +] + [[package]] name = "rt-core" version = "0.1.0" +dependencies = [ + "serde", +] [[package]] name = "rt-prep" @@ -87,12 +108,53 @@ dependencies = [ "rt-core", ] +[[package]] +name = "serde" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "simd-adler32" version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" +[[package]] +name = "syn" +version = "3.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "tiff" version = "0.9.1" @@ -104,6 +166,12 @@ dependencies = [ "weezl", ] +[[package]] +name = "unicode-ident" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563" + [[package]] name = "weezl" version = "0.1.12" diff --git a/relief/rt-core/Cargo.toml b/relief/rt-core/Cargo.toml index a50db61..9fa12d7 100644 --- a/relief/rt-core/Cargo.toml +++ b/relief/rt-core/Cargo.toml @@ -3,3 +3,6 @@ name = "rt-core" version = "0.1.0" edition = "2021" license = "MIT OR Apache-2.0" + +[dependencies] +serde = { version = "1", features = ["derive"] } diff --git a/relief/rt-core/src/lib.rs b/relief/rt-core/src/lib.rs index e52e659..339f5b7 100644 --- a/relief/rt-core/src/lib.rs +++ b/relief/rt-core/src/lib.rs @@ -1,4 +1,5 @@ //! Types de base sans dépendance : repère Lambert 93 -> bloc, tuiles, hauteur du monde. +pub mod proc; /// Paramètres de la dimension haute (rapport 09). /// Contrainte vanilla : min_y et height multiples de 16, height ∈ [16, 4064], diff --git a/relief/rt-core/src/proc.rs b/relief/rt-core/src/proc.rs new file mode 100644 index 0000000..c26c00e --- /dev/null +++ b/relief/rt-core/src/proc.rs @@ -0,0 +1,26 @@ +//! Types partagés du générateur procédural (rapport 20, § types partagés). +//! Placés ici pour éviter les dépendances circulaires entre `signature`, `proc-relief`, `calage`... +use serde::{Deserialize, Serialize}; + +#[repr(u8)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub enum BiomeRelief { Mer, Prealpes, Glaciaire, Karst, Gorges, Bocage, CoteRocheuse, Fjord, Plaine } + +#[repr(u8)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub enum Roche { Calcaire, Granite, Schiste, Gneiss, Alluvions, Basalte } + +#[repr(u8)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub enum ClasseSol { Feuillus, Coniferes, Prairie, Culture, RocheNue, Eboulis, Glace, Eau, Lande, Sable } + +#[cfg(test)] +mod tests { + use super::*; + #[test] + fn serde_roundtrip_et_repr() { + assert_eq!(BiomeRelief::Mer as u8, 0); + assert_eq!(ClasseSol::Sable as u8, 9); + assert_eq!(Roche::Basalte as u8, 5); + } +}