mirror of
https://github.com/storytold/texturecraft.git
synced 2026-11-19 22:10:42 +01:00
Add an offset to mesh-map generators
The generator panel had level, softness and noise but no way to lift or lower the finished mask. The new offset is added to the result and clamped to 0..1. The thresholding now lives in Generator::shape, shared by the compositor and the preview. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
9dc33d894e
commit
e59bf5569e
7 files changed
+69
-16
No files matched your search
@@ -1122,11 +1122,7 @@ impl<'a, 'b> Texel<'a, 'b> {
|
||||
GeneratorKind::Direction => c.nrm.dot(Vec3::from(g.direction).try_normalize().unwrap_or(Vec3::Y)) * 0.5 + 0.5,
|
||||
};
|
||||
let s = if g.noise_amount > 0.0 { s + (world_noise(c.pos, g.noise_scale, g.seed) - 0.5) * g.noise_amount } else { s };
|
||||
let th = 1.0 - g.level.clamp(0.0, 1.0);
|
||||
let soft = g.softness.max(1e-3);
|
||||
let t = ((s - (th - soft)) / (2.0 * soft)).clamp(0.0, 1.0);
|
||||
let v = t * t * (3.0 - 2.0 * t);
|
||||
if g.invert { 1.0 - v } else { v }
|
||||
g.shape(s)
|
||||
}
|
||||
|
||||
fn mask(&mut self, m: &MaskPlan) -> f32 {
|
||||
|
||||
@@ -537,6 +537,9 @@ pub struct Generator {
|
||||
pub noise_amount: f32,
|
||||
pub noise_scale: f32,
|
||||
pub seed: u32,
|
||||
/// Added to the finished mask value and clamped to 0..1 (−1..1; 0 = unchanged).
|
||||
#[serde(default)]
|
||||
pub offset: f32,
|
||||
/// Direction for `Position` / `Direction` generators (world space).
|
||||
pub direction: [f32; 3],
|
||||
pub invert: bool,
|
||||
@@ -550,7 +553,18 @@ impl Generator {
|
||||
GeneratorKind::ThinAreas => (0.3, 0.2, 0.0),
|
||||
_ => (0.5, 0.25, 0.0),
|
||||
};
|
||||
Generator { kind, level, softness, noise_amount, noise_scale: 8.0, seed: 7, direction: [0.0, 1.0, 0.0], invert: false }
|
||||
Generator { kind, level, softness, noise_amount, noise_scale: 8.0, seed: 7, offset: 0.0, direction: [0.0, 1.0, 0.0], invert: false }
|
||||
}
|
||||
|
||||
/// The mask value for a (noise-broken) signal `s`: the smooth threshold at `level` over
|
||||
/// `softness`, inverted if asked, then shifted by `offset`.
|
||||
pub fn shape(&self, s: f32) -> f32 {
|
||||
let th = 1.0 - self.level.clamp(0.0, 1.0);
|
||||
let soft = self.softness.max(1e-3);
|
||||
let t = ((s - (th - soft)) / (2.0 * soft)).clamp(0.0, 1.0);
|
||||
let v = t * t * (3.0 - 2.0 * t);
|
||||
let v = if self.invert { 1.0 - v } else { v };
|
||||
(v + self.offset).clamp(0.0, 1.0)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1050,6 +1064,19 @@ impl Effect {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn generator_offset_shifts_the_mask_value() {
|
||||
let mut g = Generator::new(GeneratorKind::Position);
|
||||
let base = g.shape(0.2);
|
||||
assert!(base < 0.5);
|
||||
g.offset = 0.3;
|
||||
assert!((g.shape(0.2) - (base + 0.3)).abs() < 1e-6, "the offset is added");
|
||||
g.offset = 1.0;
|
||||
assert_eq!(g.shape(0.2), 1.0, "and the result is clamped");
|
||||
g.offset = -1.0;
|
||||
assert_eq!(g.shape(0.9), 0.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn levels_map_range_and_gamma() {
|
||||
let l = Levels { in_low: 0.2, in_high: 0.6, gamma: 1.0, out_low: 0.0, out_high: 1.0 };
|
||||
|
||||
@@ -38,7 +38,7 @@ fn effect_json(s: &Session, e: &Effect, content: bool) -> Value {
|
||||
let mut ej = json!({ "id": e.id.0, "name": e.name, "kind": e.kind.name(), "visible": e.visible, "blend": e.blend.label(), "opacity": e.opacity });
|
||||
match &e.kind {
|
||||
EffectKind::Generator(g) => {
|
||||
ej["generator"] = json!({ "type": format!("{:?}", g.kind), "level": g.level, "softness": g.softness, "noise": g.noise_amount, "invert": g.invert })
|
||||
ej["generator"] = json!({ "type": format!("{:?}", g.kind), "level": g.level, "softness": g.softness, "noise": g.noise_amount, "offset": g.offset, "invert": g.invert })
|
||||
}
|
||||
EffectKind::Levels(lv) => ej["levels"] = json!([lv.in_low, lv.in_high, lv.gamma, lv.out_low, lv.out_high]),
|
||||
EffectKind::Path(paths) => {
|
||||
|
||||
@@ -49,7 +49,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Add generator",
|
||||
["Layers", "Effects"],
|
||||
None,
|
||||
"{layer?, name?, generator?: edgeWear|dirt|thinAreas|curvature|ambientOcclusion|position|direction, level?, softness?, noise?, invert?}",
|
||||
"{layer?, name?, generator?: edgeWear|dirt|thinAreas|curvature|ambientOcclusion|position|direction, level?, softness?, noise?, offset?: -1..1 added to the result, invert?}",
|
||||
has_layer,
|
||||
add_generator
|
||||
),
|
||||
@@ -94,7 +94,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Edit effect",
|
||||
[],
|
||||
None,
|
||||
"{effect, visible?, blend?, opacity?, name?, level?, softness?, noise?, noiseScale?, invert?, value?, anchor?, anchorChannel?, inLow?, inHigh?, gamma?, outLow?, outHigh?, tolerance?, filter parameters (see effect.add.filter)}",
|
||||
"{effect, visible?, blend?, opacity?, name?, level?, softness?, noise?, noiseScale?, offset?, invert?, value?, anchor?, anchorChannel?, inLow?, inHigh?, gamma?, outLow?, outHigh?, tolerance?, filter parameters (see effect.add.filter)}",
|
||||
has_layer,
|
||||
set
|
||||
),
|
||||
@@ -324,6 +324,9 @@ fn generator_from(p: &Value, g: &mut Generator) {
|
||||
if let Some(v) = f32p(p, "noise") {
|
||||
g.noise_amount = v.clamp(0.0, 2.0);
|
||||
}
|
||||
if let Some(v) = f32p(p, "offset") {
|
||||
g.offset = v.clamp(-1.0, 1.0);
|
||||
}
|
||||
if let Some(v) = f32p(p, "noiseScale") {
|
||||
g.noise_scale = v.clamp(0.01, 1000.0);
|
||||
}
|
||||
|
||||
@@ -63,10 +63,7 @@ fn generator(g: &Generator, c: &Coords) -> f32 {
|
||||
};
|
||||
// Same thresholding as the compositor.
|
||||
let s = if g.noise_amount > 0.0 { s + (world_noise(c.pos, g.noise_scale, g.seed) - 0.5) * g.noise_amount } else { s };
|
||||
let soft = g.softness.max(1e-3);
|
||||
let t = ((s - (1.0 - g.level.clamp(0.0, 1.0) - soft)) / (2.0 * soft)).clamp(0.0, 1.0);
|
||||
let v = t * t * (3.0 - 2.0 * t);
|
||||
if g.invert { 1.0 - v } else { v }
|
||||
g.shape(s)
|
||||
}
|
||||
|
||||
fn mask(m: &Mask, c: &Coords) -> f32 {
|
||||
|
||||
@@ -54,6 +54,32 @@ fn layers_masks_materials_and_bake() {
|
||||
assert_eq!(s.doc.project.walk(0).len(), 1, "back to the initial paint layer");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn generator_offset_is_settable_and_clamped() {
|
||||
let mut s = session();
|
||||
execute(&mut s, "layer.add.fill", &json!({})).unwrap();
|
||||
execute(&mut s, "mask.add.black", &Value::Null).unwrap();
|
||||
let r = execute(&mut s, "effect.add.generator", &json!({"generator": "position", "offset": 0.25})).unwrap();
|
||||
let eff = r["effect"].as_u64().unwrap();
|
||||
let offset = |s: &Session| {
|
||||
let layer = s.doc.project.layers.values().find(|l| l.mask.is_some()).unwrap();
|
||||
layer
|
||||
.mask
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.effects
|
||||
.iter()
|
||||
.find_map(|e| match &e.kind {
|
||||
texturecraft_engine::core::EffectKind::Generator(g) => Some(g.offset),
|
||||
_ => None,
|
||||
})
|
||||
.unwrap()
|
||||
};
|
||||
assert_eq!(offset(&s), 0.25);
|
||||
execute(&mut s, "effect.set", &json!({"effect": eff, "offset": 5.0})).unwrap();
|
||||
assert_eq!(offset(&s), 1.0, "clamped to 1");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn layer_rename_and_undo() {
|
||||
let mut s = session();
|
||||
|
||||
@@ -1875,15 +1875,19 @@ fn effect_properties(app: &mut TextureCraftApp, ui: &mut Ui, layer: &Layer, eid:
|
||||
}
|
||||
}
|
||||
});
|
||||
let (mut level, mut soft, mut noise, mut ns) = (g.level, g.softness, g.noise_amount, g.noise_scale);
|
||||
let (mut level, mut soft, mut noise, mut ns, mut off) = (g.level, g.softness, g.noise_amount, g.noise_scale, g.offset);
|
||||
let r1 = slider_edit(ui, tr("Level"), &mut level, 0.0..=1.0, 2);
|
||||
let r2 = slider_edit(ui, tr("Softness"), &mut soft, 0.0..=1.0, 2);
|
||||
let r3 = slider_edit(ui, tr("Noise amount"), &mut noise, 0.0..=2.0, 2);
|
||||
let r4 = slider_edit(ui, tr("Noise scale"), &mut ns, 0.1..=64.0, 1);
|
||||
let r6 = slider_edit(ui, tr("Offset"), &mut off, -1.0..=1.0, 2);
|
||||
let mut inv = g.invert;
|
||||
let r5 = ui.checkbox(&mut inv, tr("Invert"));
|
||||
if let Some(merge) = r1.or(r2).or(r3).or(r4).or(r5.changed().then_some(false)) {
|
||||
app.run("effect.set", json!({"effect": id, "level": level, "softness": soft, "noise": noise, "noiseScale": ns, "invert": inv, "merge": merge}));
|
||||
if let Some(merge) = r1.or(r2).or(r3).or(r4).or(r6).or(r5.changed().then_some(false)) {
|
||||
app.run(
|
||||
"effect.set",
|
||||
json!({"effect": id, "level": level, "softness": soft, "noise": noise, "noiseScale": ns, "offset": off, "invert": inv, "merge": merge}),
|
||||
);
|
||||
}
|
||||
if !app.session.doc.baked.contains_key(&app.session.ts()) {
|
||||
ui.label(
|
||||
|
||||
Reference in new issue
Block a user