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

Make hardness work for decal mask

Browse Source
This commit is contained in:
luboslenco
2020-11-27 14:19:49 +01:00
parent 3903bb3187
commit 02a54e519c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/render/Uniforms.hx
+3 -1
View File
@@ -63,7 +63,9 @@ class Uniforms {
return val;
}
case "_brushHardness": {
if (Context.tool != ToolBrush && Context.tool != ToolEraser) return 1.0;
var decal = Context.tool == ToolDecal || Context.tool == ToolText;
var decalMask = Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.action_paint, ShortcutDown);
if (Context.tool != ToolBrush && Context.tool != ToolEraser && !decalMask) return 1.0;
var val = Context.brushHardness * Context.brushNodesHardness;
var pen = Input.getPen();
if (Config.raw.pressure_hardness && pen.down()) {
Sources/arm/ui/UIHeader.hx
+3 -3
View File
@@ -148,9 +148,9 @@ class UIHeader {
Context.tool == ToolBlur ||
Context.tool == ToolParticle) {
var decal = Context.tool == ToolDecal || Context.tool == ToolText;
var decalMask = decal && Operator.shortcut(Config.keymap.decal_mask, ShortcutDown);
if (Context.tool != ToolFill) {
var decal = Context.tool == ToolDecal || Context.tool == ToolText;
var decalMask = decal && Operator.shortcut(Config.keymap.decal_mask, ShortcutDown);
if (decalMask) {
Context.brushDecalMaskRadius = ui.slider(Context.brushDecalMaskRadiusHandle, tr("Radius"), 0.01, 2.0, true);
}
@@ -185,7 +185,7 @@ class UIHeader {
Context.brushOpacity = ui.slider(Context.brushOpacityHandle, tr("Opacity"), 0.0, 1.0, true);
if (Context.tool == ToolBrush || Context.tool == ToolEraser) {
if (Context.tool == ToolBrush || Context.tool == ToolEraser || decalMask) {
Context.brushHardness = ui.slider(Id.handle({value: Context.brushHardness}), tr("Hardness"), 0.0, 1.0, true);
}