This commit is contained in:
1 parent
293811aecd
commit
d1a56f77cc
23 files changed
+1730
-62
No files matched your search
@@ -856,6 +856,30 @@ impl BrushDesc {
|
||||
}
|
||||
|
||||
pub const TERRAIN_SCHEMA_VERSION: u32 = 1;
|
||||
pub const TERRAIN_MATERIAL_LAYER_LIMIT: usize = 4;
|
||||
|
||||
fn default_terrain_layer_uv_scale() -> f32 {
|
||||
8.0
|
||||
}
|
||||
|
||||
/// One shared project material assigned to a terrain blend channel.
|
||||
#[derive(Reflect, Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
#[reflect(Default, Debug, PartialEq, Serialize, Deserialize)]
|
||||
pub struct TerrainMaterialLayer {
|
||||
#[serde(default)]
|
||||
pub material: Option<EditorAssetRef>,
|
||||
#[serde(default = "default_terrain_layer_uv_scale")]
|
||||
pub uv_scale: f32,
|
||||
}
|
||||
|
||||
impl Default for TerrainMaterialLayer {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
material: None,
|
||||
uv_scale: default_terrain_layer_uv_scale(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Persistent height-grid terrain authoring data. Hydration partitions the grid into generated
|
||||
/// render/collider chunks; saved scenes retain only this descriptor.
|
||||
@@ -876,6 +900,13 @@ pub struct TerrainDesc {
|
||||
pub chunk_quads: u32,
|
||||
#[serde(default)]
|
||||
pub base_material: Option<EditorAssetRef>,
|
||||
/// Up to four project Material/Material Instance assignments. Empty retains the legacy
|
||||
/// `base_material` path and an empty weight map means 100% channel zero.
|
||||
#[serde(default)]
|
||||
pub material_layers: Vec<TerrainMaterialLayer>,
|
||||
/// RGBA8 weights per height sample. Channels correspond to `material_layers`.
|
||||
#[serde(default)]
|
||||
pub material_weights: Vec<[u8; TERRAIN_MATERIAL_LAYER_LIMIT]>,
|
||||
#[serde(default = "default_true")]
|
||||
pub generate_colliders: bool,
|
||||
#[serde(default = "default_true")]
|
||||
@@ -894,6 +925,8 @@ impl Default for TerrainDesc {
|
||||
height_scale: default_terrain_height_scale(),
|
||||
chunk_quads: default_terrain_chunk_quads(),
|
||||
base_material: None,
|
||||
material_layers: Vec::new(),
|
||||
material_weights: Vec::new(),
|
||||
generate_colliders: true,
|
||||
cast_shadows: true,
|
||||
receive_shadows: true,
|
||||
@@ -933,6 +966,44 @@ impl TerrainDesc {
|
||||
if self.heights.iter().any(|height| !height.is_finite()) {
|
||||
return Err("terrain height samples must all be finite".into());
|
||||
}
|
||||
if self.material_layers.len() > TERRAIN_MATERIAL_LAYER_LIMIT {
|
||||
return Err(format!(
|
||||
"terrain supports at most {TERRAIN_MATERIAL_LAYER_LIMIT} material layers"
|
||||
));
|
||||
}
|
||||
for (index, layer) in self.material_layers.iter().enumerate() {
|
||||
if !layer.uv_scale.is_finite() || layer.uv_scale <= 0.0 {
|
||||
return Err(format!(
|
||||
"terrain material layer {} UV scale must be finite and positive",
|
||||
index + 1
|
||||
));
|
||||
}
|
||||
}
|
||||
if !self.material_weights.is_empty() {
|
||||
if self.material_weights.len() != expected {
|
||||
return Err(format!(
|
||||
"terrain resolution {} requires {expected} material weights, found {}",
|
||||
self.resolution,
|
||||
self.material_weights.len()
|
||||
));
|
||||
}
|
||||
if self
|
||||
.material_weights
|
||||
.iter()
|
||||
.any(|weights| weights.iter().copied().map(u16::from).sum::<u16>() != 255)
|
||||
{
|
||||
return Err("terrain material weights must sum to 255 at every sample".into());
|
||||
}
|
||||
let active_channels = self.material_layers.len().max(1);
|
||||
if self.material_weights.iter().any(|weights| {
|
||||
weights
|
||||
.iter()
|
||||
.skip(active_channels)
|
||||
.any(|weight| *weight != 0)
|
||||
}) {
|
||||
return Err("terrain material weights use an unassigned layer channel".into());
|
||||
}
|
||||
}
|
||||
if !self.sample_spacing.is_finite() || self.sample_spacing <= 0.0 {
|
||||
return Err("terrain sample spacing must be finite and positive".into());
|
||||
}
|
||||
@@ -947,6 +1018,39 @@ impl TerrainDesc {
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Material channels used by hydration, including the legacy base-material fallback.
|
||||
pub fn effective_material_layers(&self) -> Vec<TerrainMaterialLayer> {
|
||||
if !self.material_layers.is_empty() {
|
||||
return self.material_layers.clone();
|
||||
}
|
||||
self.base_material
|
||||
.clone()
|
||||
.map(|material| TerrainMaterialLayer {
|
||||
material: Some(material),
|
||||
..Default::default()
|
||||
})
|
||||
.into_iter()
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Material weights for one sample, normalized for vertex transport.
|
||||
pub fn normalized_material_weights(&self, sample_index: usize) -> [f32; 4] {
|
||||
let weights = self
|
||||
.material_weights
|
||||
.get(sample_index)
|
||||
.copied()
|
||||
.unwrap_or([255, 0, 0, 0]);
|
||||
weights.map(|weight| f32::from(weight) / 255.0)
|
||||
}
|
||||
|
||||
/// Materializes the implicit channel-zero map before an editor paint operation.
|
||||
pub fn ensure_material_weights(&mut self) {
|
||||
let expected = self.resolution as usize * self.resolution as usize;
|
||||
if self.material_weights.len() != expected {
|
||||
self.material_weights = vec![[255, 0, 0, 0]; expected];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn default_terrain_schema_version() -> u32 {
|
||||
|
||||
Reference in new issue
Block a user