This commit is contained in:
1 parent
293811aecd
commit
d1a56f77cc
23 files changed
+1730
-62
No files matched your search
@@ -3496,12 +3496,23 @@ fn brush_editor_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
|
||||
}
|
||||
|
||||
fn terrain_editor_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
|
||||
let material_candidates = brush_face_material_ref_candidates(world);
|
||||
let dragging_selection = world
|
||||
.get_resource::<EditorAssets>()
|
||||
.and_then(|assets| assets.dragging_selection().cloned());
|
||||
let material_drop_candidate = dragging_selection.as_ref().and_then(|selection| {
|
||||
asset_ref_candidate_from_selection(world, selection, AssetRefCandidateKind::Material)
|
||||
});
|
||||
let Some(mut terrain) = world.get::<TerrainDesc>(entity).cloned() else {
|
||||
return;
|
||||
};
|
||||
let original = terrain.clone();
|
||||
let mut changed = false;
|
||||
let mut requested_resolution = terrain.resolution;
|
||||
let mut remove_layer = None;
|
||||
let mut swap_layers = None;
|
||||
let mut locate_layer = None;
|
||||
let mut accepted_drop = false;
|
||||
let card = component_card_context(
|
||||
world,
|
||||
entity,
|
||||
@@ -3526,6 +3537,7 @@ fn terrain_editor_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
|
||||
let replacement = TerrainDesc::flat(requested_resolution);
|
||||
terrain.resolution = replacement.resolution;
|
||||
terrain.heights = replacement.heights;
|
||||
terrain.material_weights.clear();
|
||||
terrain.chunk_quads = terrain.chunk_quads.min(terrain.resolution - 1).max(1);
|
||||
changed = true;
|
||||
}
|
||||
@@ -3573,16 +3585,132 @@ fn terrain_editor_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
|
||||
.changed();
|
||||
});
|
||||
});
|
||||
property_row(ui, "Base Material", |ui| {
|
||||
ui.label(
|
||||
terrain
|
||||
.base_material
|
||||
.as_ref()
|
||||
.map(|material| material.label.as_str())
|
||||
.filter(|label| !label.is_empty())
|
||||
.unwrap_or("Terrain fallback"),
|
||||
);
|
||||
ui.add_space(6.0);
|
||||
ui.separator();
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(egui::RichText::new("Material Layers").strong());
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
if ui
|
||||
.add_enabled(
|
||||
terrain.material_layers.len() < shared::TERRAIN_MATERIAL_LAYER_LIMIT,
|
||||
egui::Button::new(phosphor_icon(icons::PLUS, 16.0)),
|
||||
)
|
||||
.on_hover_text("Add a terrain blend channel")
|
||||
.clicked()
|
||||
{
|
||||
let material = if terrain.material_layers.is_empty() {
|
||||
terrain.base_material.take()
|
||||
} else {
|
||||
None
|
||||
};
|
||||
terrain.material_layers.push(shared::TerrainMaterialLayer {
|
||||
material,
|
||||
..Default::default()
|
||||
});
|
||||
changed = true;
|
||||
}
|
||||
});
|
||||
});
|
||||
if terrain.material_layers.is_empty() {
|
||||
ui.label(
|
||||
egui::RichText::new(
|
||||
terrain
|
||||
.base_material
|
||||
.as_ref()
|
||||
.map(|material| format!("Legacy base: {}", material.label))
|
||||
.unwrap_or_else(|| "No layers assigned; visible terrain fallback".into()),
|
||||
)
|
||||
.color(TEXT_DIM)
|
||||
.small(),
|
||||
);
|
||||
}
|
||||
for index in 0..terrain.material_layers.len() {
|
||||
ui.add_space(4.0);
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(
|
||||
egui::RichText::new(format!("Layer {}", index + 1))
|
||||
.strong()
|
||||
.color(if index == 0 {
|
||||
SELECTION_BG_MUTED
|
||||
} else {
|
||||
TEXT_DIM
|
||||
}),
|
||||
);
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
if icon_button_small(ui, icons::TRASH, "Remove layer").clicked() {
|
||||
remove_layer = Some(index);
|
||||
}
|
||||
if ui
|
||||
.add_enabled(
|
||||
index + 1 < terrain.material_layers.len(),
|
||||
egui::Button::new(phosphor_icon(icons::ARROW_DOWN, 15.0)).frame(false),
|
||||
)
|
||||
.on_hover_text("Move layer down")
|
||||
.clicked()
|
||||
{
|
||||
swap_layers = Some((index, index + 1));
|
||||
}
|
||||
if ui
|
||||
.add_enabled(
|
||||
index > 0,
|
||||
egui::Button::new(phosphor_icon(icons::ARROW_UP, 15.0)).frame(false),
|
||||
)
|
||||
.on_hover_text("Move layer up")
|
||||
.clicked()
|
||||
{
|
||||
swap_layers = Some((index, index - 1));
|
||||
}
|
||||
});
|
||||
});
|
||||
let response = asset_selector_row(
|
||||
ui,
|
||||
"Material",
|
||||
icons::PALETTE,
|
||||
terrain.material_layers[index].material.as_ref(),
|
||||
None,
|
||||
true,
|
||||
&material_candidates,
|
||||
material_drop_candidate.as_ref(),
|
||||
);
|
||||
if let Some(selected) = response.selected {
|
||||
terrain.material_layers[index].material = Some(selected);
|
||||
changed = true;
|
||||
}
|
||||
if response.clear {
|
||||
terrain.material_layers[index].material = None;
|
||||
changed = true;
|
||||
}
|
||||
if response.locate {
|
||||
locate_layer = Some(index);
|
||||
}
|
||||
accepted_drop |= response.accepted_drop;
|
||||
property_row(ui, "UV Tiling", |ui| {
|
||||
changed |= ui
|
||||
.add(
|
||||
egui::DragValue::new(&mut terrain.material_layers[index].uv_scale)
|
||||
.range(0.01..=1024.0)
|
||||
.speed(0.1)
|
||||
.suffix("×"),
|
||||
)
|
||||
.changed();
|
||||
});
|
||||
if !terrain.material_weights.is_empty() {
|
||||
let covered = terrain
|
||||
.material_weights
|
||||
.iter()
|
||||
.filter(|weights| weights[index] > 0)
|
||||
.count();
|
||||
ui.label(
|
||||
egui::RichText::new(format!(
|
||||
"{} / {} samples carry this layer",
|
||||
covered,
|
||||
terrain.material_weights.len()
|
||||
))
|
||||
.color(TEXT_DIM)
|
||||
.small(),
|
||||
);
|
||||
}
|
||||
}
|
||||
match terrain.validate() {
|
||||
Ok(()) => {
|
||||
ui.label(
|
||||
@@ -3602,6 +3730,31 @@ fn terrain_editor_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
|
||||
});
|
||||
apply_component_card_response(world, entity, card_response);
|
||||
|
||||
if let Some(index) = remove_layer {
|
||||
remove_terrain_material_layer(&mut terrain, index);
|
||||
changed = true;
|
||||
}
|
||||
if let Some((a, b)) = swap_layers {
|
||||
terrain.material_layers.swap(a, b);
|
||||
for weights in &mut terrain.material_weights {
|
||||
weights.swap(a, b);
|
||||
}
|
||||
changed = true;
|
||||
}
|
||||
if let Some(index) = locate_layer {
|
||||
locate_asset_ref(
|
||||
world,
|
||||
terrain
|
||||
.material_layers
|
||||
.get(index)
|
||||
.and_then(|layer| layer.material.as_ref()),
|
||||
&material_candidates,
|
||||
);
|
||||
}
|
||||
if accepted_drop {
|
||||
clear_asset_drag(world);
|
||||
}
|
||||
|
||||
if changed && terrain != original {
|
||||
let _ = reflected_component_transaction(
|
||||
world,
|
||||
@@ -3617,6 +3770,50 @@ fn terrain_editor_ui(world: &mut World, ui: &mut egui::Ui, entity: Entity) {
|
||||
}
|
||||
}
|
||||
|
||||
fn remove_terrain_material_layer(terrain: &mut TerrainDesc, index: usize) {
|
||||
if index >= terrain.material_layers.len() {
|
||||
return;
|
||||
}
|
||||
terrain.material_layers.remove(index);
|
||||
if terrain.material_layers.is_empty() {
|
||||
terrain.material_weights.clear();
|
||||
return;
|
||||
}
|
||||
for weights in &mut terrain.material_weights {
|
||||
for channel in index..3 {
|
||||
weights[channel] = weights[channel + 1];
|
||||
}
|
||||
weights[3] = 0;
|
||||
normalize_terrain_weights(weights, terrain.material_layers.len());
|
||||
}
|
||||
}
|
||||
|
||||
fn normalize_terrain_weights(weights: &mut [u8; 4], layer_count: usize) {
|
||||
for weight in weights.iter_mut().skip(layer_count) {
|
||||
*weight = 0;
|
||||
}
|
||||
let sum: u16 = weights
|
||||
.iter()
|
||||
.take(layer_count)
|
||||
.copied()
|
||||
.map(u16::from)
|
||||
.sum();
|
||||
if sum == 0 {
|
||||
*weights = [255, 0, 0, 0];
|
||||
return;
|
||||
}
|
||||
let source = *weights;
|
||||
let mut assigned = 0_u16;
|
||||
for index in 0..layer_count {
|
||||
weights[index] = ((u16::from(source[index]) * 255) / sum) as u8;
|
||||
assigned += u16::from(weights[index]);
|
||||
}
|
||||
let largest = (0..layer_count)
|
||||
.max_by_key(|index| source[*index])
|
||||
.unwrap_or(0);
|
||||
weights[largest] = weights[largest].saturating_add((255 - assigned) as u8);
|
||||
}
|
||||
|
||||
fn brush_validation_ui(ui: &mut egui::Ui, brush: &BrushDesc) {
|
||||
let report = validate_brush(brush);
|
||||
if report.diagnostics.is_empty() {
|
||||
|
||||
@@ -20,6 +20,7 @@ use crate::state::PlayPossession;
|
||||
use crate::viewport::actor_icons::ActorIconSettings;
|
||||
use crate::viewport::brush_edit::{BrushEditMode, BrushElementSelection};
|
||||
use crate::viewport::brush_tool::{BrushToolPhase, BrushToolState};
|
||||
use crate::viewport::terrain_paint::{TerrainPaintMode, TerrainPaintState};
|
||||
use crate::viewport::terrain_sculpt::{TerrainSculptMode, TerrainSculptState};
|
||||
use crate::viewport::{
|
||||
material_drop::is_surface_asset_selection, snap_translation, viewport_ground_position,
|
||||
@@ -149,6 +150,7 @@ pub fn viewport_tab_ui(
|
||||
scene_view_selection_hud(world, ui.ctx(), rect, selected_entities);
|
||||
scene_view_brush_draw_hints(world, ui.ctx(), rect);
|
||||
scene_view_terrain_sculpt_hints(world, ui.ctx(), rect);
|
||||
scene_view_terrain_paint_hints(world, ui.ctx(), rect);
|
||||
scene_view_render_badge(world, ui.ctx(), rect);
|
||||
scene_view_brush_mode_badge(world, ui.ctx(), rect);
|
||||
scene_view_volume_hud(world, ui.ctx(), rect);
|
||||
@@ -349,6 +351,52 @@ fn scene_view_terrain_sculpt_hints(world: &World, ctx: &egui::Context, scene_rec
|
||||
});
|
||||
}
|
||||
|
||||
fn scene_view_terrain_paint_hints(world: &World, ctx: &egui::Context, scene_rect: egui::Rect) {
|
||||
let Some(tool) = world.get_resource::<TerrainPaintState>() else {
|
||||
return;
|
||||
};
|
||||
if !tool.active {
|
||||
return;
|
||||
}
|
||||
egui::Area::new(egui::Id::new("scene_view_terrain_paint_hints"))
|
||||
.fixed_pos(scene_rect.left_top() + egui::vec2(8.0, 52.0))
|
||||
.interactable(false)
|
||||
.show(ctx, |ui| {
|
||||
overlay_chip_frame().show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(
|
||||
egui::RichText::new(format!(
|
||||
"Terrain {} • Layer {}",
|
||||
tool.mode.label(),
|
||||
tool.active_layer + 1
|
||||
))
|
||||
.color(SELECTION)
|
||||
.strong(),
|
||||
);
|
||||
ui.label(
|
||||
egui::RichText::new(format!("R {:.1}m", tool.radius))
|
||||
.color(TEXT_DIM)
|
||||
.monospace()
|
||||
.small(),
|
||||
);
|
||||
ui.label(
|
||||
egui::RichText::new(format!("S {:.0}%", tool.strength * 100.0))
|
||||
.color(SUCCESS)
|
||||
.monospace()
|
||||
.small(),
|
||||
);
|
||||
});
|
||||
ui.add_space(4.0);
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
key_hint(ui, "LMB Drag", tool.mode.label());
|
||||
key_hint(ui, "Esc", "Cancel stroke / close");
|
||||
key_hint(ui, "RMB", "Cancel stroke / close");
|
||||
key_hint(ui, "Ctrl+Z", "Undo stroke");
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
fn key_hint(ui: &mut egui::Ui, key: &str, label: &str) {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(
|
||||
@@ -541,6 +589,24 @@ fn scene_view_overlay_toolbar(world: &mut World, ctx: &egui::Context, scene_rect
|
||||
.resource::<crate::selection::SelectedEntity>()
|
||||
.0
|
||||
.filter(|entity| world.get::<shared::TerrainDesc>(*entity).is_some());
|
||||
let terrain_layer_labels = terrain_selected
|
||||
.and_then(|entity| world.get::<shared::TerrainDesc>(entity))
|
||||
.map(|terrain| {
|
||||
terrain
|
||||
.material_layers
|
||||
.iter()
|
||||
.enumerate()
|
||||
.map(|(index, layer)| {
|
||||
layer
|
||||
.material
|
||||
.as_ref()
|
||||
.map(|material| material.label.clone())
|
||||
.filter(|label| !label.trim().is_empty())
|
||||
.unwrap_or_else(|| format!("Layer {}", index + 1))
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
})
|
||||
.unwrap_or_default();
|
||||
|
||||
let toolbar_response = egui::Area::new(egui::Id::new("scene_view_toolbar"))
|
||||
.fixed_pos(scene_rect.left_top() + egui::vec2(6.0, 6.0))
|
||||
@@ -672,7 +738,8 @@ fn scene_view_overlay_toolbar(world: &mut World, ctx: &egui::Context, scene_rect
|
||||
}
|
||||
|
||||
let sculpt_active = world.resource::<TerrainSculptState>().active;
|
||||
if terrain_selected.is_some() || sculpt_active {
|
||||
let paint_active = world.resource::<TerrainPaintState>().active;
|
||||
if terrain_selected.is_some() || sculpt_active || paint_active {
|
||||
ui.separator();
|
||||
let stroking = world.resource::<TerrainSculptState>().is_stroking();
|
||||
let sculpt_button_clicked = tool_button_accent(
|
||||
@@ -698,6 +765,7 @@ fn scene_view_overlay_toolbar(world: &mut World, ctx: &egui::Context, scene_rect
|
||||
}
|
||||
let active = state.active;
|
||||
if active {
|
||||
world.resource_mut::<TerrainPaintState>().stop();
|
||||
world.resource_mut::<BrushToolState>().cancel();
|
||||
world
|
||||
.resource_mut::<crate::operators::ActiveOperator>()
|
||||
@@ -746,6 +814,95 @@ fn scene_view_overlay_toolbar(world: &mut World, ctx: &egui::Context, scene_rect
|
||||
state.strength = strength;
|
||||
state.clamp_settings();
|
||||
}
|
||||
|
||||
let paint_stroking = world.resource::<TerrainPaintState>().is_stroking();
|
||||
let can_paint = terrain_layer_labels.len() >= 2 || paint_active;
|
||||
let paint_button_clicked = ui
|
||||
.add_enabled(
|
||||
can_paint,
|
||||
egui::Button::new(phosphor_icon(icons::PAINT_BRUSH, 16.0))
|
||||
.selected(paint_active),
|
||||
)
|
||||
.on_hover_text(if can_paint {
|
||||
if paint_active {
|
||||
"Close terrain material paint tool"
|
||||
} else {
|
||||
"Paint selected terrain material layers"
|
||||
}
|
||||
} else {
|
||||
"Assign at least two terrain material layers first"
|
||||
})
|
||||
.clicked();
|
||||
if paint_button_clicked {
|
||||
world.resource_mut::<ViewportClick>().0 = None;
|
||||
}
|
||||
if paint_button_clicked && !paint_stroking {
|
||||
let layer_count = terrain_layer_labels.len();
|
||||
let state = &mut *world.resource_mut::<TerrainPaintState>();
|
||||
if state.active {
|
||||
state.stop();
|
||||
} else if let Some(entity) = terrain_selected {
|
||||
state.start(entity, layer_count);
|
||||
}
|
||||
let active = state.active;
|
||||
if active {
|
||||
world.resource_mut::<TerrainSculptState>().stop();
|
||||
world.resource_mut::<BrushToolState>().cancel();
|
||||
world
|
||||
.resource_mut::<crate::operators::ActiveOperator>()
|
||||
.status = Some(crate::operators::OperatorStatus {
|
||||
id: "terrain.paint".into(),
|
||||
label: "Terrain Paint".into(),
|
||||
phase: crate::operators::OperatorPhase::Preview,
|
||||
hint: "LMB drag paints weights; Esc or RMB cancels".into(),
|
||||
warnings: Vec::new(),
|
||||
});
|
||||
}
|
||||
}
|
||||
if paint_active {
|
||||
let mut mode = world.resource::<TerrainPaintState>().mode;
|
||||
ui.selectable_value(&mut mode, TerrainPaintMode::Paint, "Paint")
|
||||
.on_hover_text("Increase the selected layer weight");
|
||||
ui.selectable_value(&mut mode, TerrainPaintMode::Erase, "Erase")
|
||||
.on_hover_text("Reduce the selected layer weight");
|
||||
let mut active_layer =
|
||||
world.resource::<TerrainPaintState>().active_layer;
|
||||
egui::ComboBox::from_id_salt("terrain_paint_layer")
|
||||
.selected_text(
|
||||
terrain_layer_labels
|
||||
.get(active_layer)
|
||||
.cloned()
|
||||
.unwrap_or_else(|| "Layer".into()),
|
||||
)
|
||||
.show_ui(ui, |ui| {
|
||||
for (index, label) in terrain_layer_labels.iter().enumerate() {
|
||||
ui.selectable_value(&mut active_layer, index, label);
|
||||
}
|
||||
});
|
||||
let mut radius = world.resource::<TerrainPaintState>().radius;
|
||||
let mut strength = world.resource::<TerrainPaintState>().strength;
|
||||
ui.add(
|
||||
egui::DragValue::new(&mut radius)
|
||||
.range(0.25..=128.0)
|
||||
.speed(0.1)
|
||||
.prefix("R ")
|
||||
.suffix(" m"),
|
||||
)
|
||||
.on_hover_text("Brush radius");
|
||||
ui.add(
|
||||
egui::DragValue::new(&mut strength)
|
||||
.range(0.01..=1.0)
|
||||
.speed(0.02)
|
||||
.prefix("S "),
|
||||
)
|
||||
.on_hover_text("Weight strength per dab");
|
||||
let mut state = world.resource_mut::<TerrainPaintState>();
|
||||
state.mode = mode;
|
||||
state.active_layer = active_layer;
|
||||
state.radius = radius;
|
||||
state.strength = strength;
|
||||
state.clamp_settings();
|
||||
}
|
||||
}
|
||||
|
||||
let clean_game_view = world.resource::<ViewportDisplayMode>().clean_game_view;
|
||||
|
||||
Reference in new issue
Block a user