edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix mask blend

Browse Source
This commit is contained in:
luboslenco
2025-08-03 23:26:10 +02:00
parent 20696247fd
commit c98e564c11
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
armorpaint/sources/make_material.ts
+11 -11
View File
@@ -460,31 +460,31 @@ function make_material_blend_mode(kong: node_shader_t, blending: i32, cola: stri
function make_material_blend_mode_mask(blending: i32, cola: string, colb: string, opac: string): string {
if (blending == blend_type_t.MIX) {
return "lerp3(" + cola + ", " + colb + ", " + opac + ")";
return "lerp(" + cola + ", " + colb + ", " + opac + ")";
}
else if (blending == blend_type_t.DARKEN) {
return "lerp3(" + cola + ", min3(" + cola + ", " + colb + "), " + opac + ")";
return "lerp(" + cola + ", min(" + cola + ", " + colb + "), " + opac + ")";
}
else if (blending == blend_type_t.MULTIPLY) {
return "lerp3(" + cola + ", " + cola + " * " + colb + ", " + opac + ")";
return "lerp(" + cola + ", " + cola + " * " + colb + ", " + opac + ")";
}
else if (blending == blend_type_t.BURN) {
return "lerp3(" + cola + ", 1.0 - (1.0 - " + cola + ") / " + colb + ", " + opac + ")";
return "lerp(" + cola + ", 1.0 - (1.0 - " + cola + ") / " + colb + ", " + opac + ")";
}
else if (blending == blend_type_t.LIGHTEN) {
return "max3(" + cola + ", " + colb + " * " + opac + ")";
return "max(" + cola + ", " + colb + " * " + opac + ")";
}
else if (blending == blend_type_t.SCREEN) {
return "(1.0 - ((1.0 - " + opac + ") + " + opac + " * (1.0 - " + colb + ")) * (1.0 - " + cola + "))";
}
else if (blending == blend_type_t.DODGE) {
return "lerp3(" + cola + ", " + cola + " / (1.0 - " + colb + "), " + opac + ")";
return "lerp(" + cola + ", " + cola + " / (1.0 - " + colb + "), " + opac + ")";
}
else if (blending == blend_type_t.ADD) {
return "lerp3(" + cola + ", " + cola + " + " + colb + ", " + opac + ")";
return "lerp(" + cola + ", " + cola + " + " + colb + ", " + opac + ")";
}
else if (blending == blend_type_t.OVERLAY) {
return "lerp3(" + cola + ", " + cola + " < 0.5 ? 2.0 * " + cola + " * " + colb + " : 1.0 - 2.0 * (1.0 - " + cola + ") * (1.0 - " + colb + "), " + opac + ")";
return "lerp(" + cola + ", " + cola + " < 0.5 ? 2.0 * " + cola + " * " + colb + " : 1.0 - 2.0 * (1.0 - " + cola + ") * (1.0 - " + colb + "), " + opac + ")";
}
else if (blending == blend_type_t.SOFT_LIGHT) {
return "((1.0 - " + opac + ") * " + cola + " + " + opac + " * ((1.0 - " + cola + ") * " + colb + " * " + cola + " + " + cola + " * (1.0 - (1.0 - " + colb + ") * (1.0 - " + cola + "))))";
@@ -493,16 +493,16 @@ function make_material_blend_mode_mask(blending: i32, cola: string, colb: string
return "(" + cola + " + " + opac + " * (2.0 * (" + colb + " - 0.5)))";
}
else if (blending == blend_type_t.DIFFERENCE) {
return "lerp3(" + cola + ", abs3(" + cola + " - " + colb + "), " + opac + ")";
return "lerp(" + cola + ", abs(" + cola + " - " + colb + "), " + opac + ")";
}
else if (blending == blend_type_t.SUBTRACT) {
return "lerp3(" + cola + ", " + cola + " - " + colb + ", " + opac + ")";
return "lerp(" + cola + ", " + cola + " - " + colb + ", " + opac + ")";
}
else if (blending == blend_type_t.DIVIDE) {
return "(1.0 - " + opac + ") * " + cola + " + " + opac + " * " + cola + " / " + colb + "";
}
else { // BlendHue, BlendSaturation, BlendColor, BlendValue
return "lerp3(" + cola + ", " + colb + ", " + opac + ")";
return "lerp(" + cola + ", " + colb + ", " + opac + ")";
}
}
base/sources/ts/tab_layers.ts
+9 -3
View File
@@ -110,7 +110,9 @@ function tab_layers_button_new(text: string) {
}, m);
context_raw.layer_preview_dirty = true;
history_new_black_mask();
layers_update_fill_layers();
sys_notify_on_init(function () {
layers_update_fill_layers();
});
}
if (ui_menu_button(tr("White Mask"))) {
if (slot_layer_is_mask(l)) {
@@ -124,7 +126,9 @@ function tab_layers_button_new(text: string) {
}, m);
context_raw.layer_preview_dirty = true;
history_new_white_mask();
layers_update_fill_layers();
sys_notify_on_init(function () {
layers_update_fill_layers();
});
}
if (ui_menu_button(tr("Fill Mask"))) {
if (slot_layer_is_mask(l)) {
@@ -138,7 +142,9 @@ function tab_layers_button_new(text: string) {
}, m);
context_raw.layer_preview_dirty = true;
history_new_fill_mask();
layers_update_fill_layers();
sys_notify_on_init(function () {
layers_update_fill_layers();
});
}
ui.enabled = !slot_layer_is_group(context_raw.layer) && !slot_layer_is_in_group(context_raw.layer);
if (ui_menu_button(tr("Group"))) {