From 9da935e3394c5b937b0b6bc8a5743999c5b6c77f Mon Sep 17 00:00:00 2001 From: luboslenco Date: Sat, 24 Oct 2020 13:30:23 +0200 Subject: [PATCH] Decal paint -> decal mask --- Assets/painter/keymap_presets/blender.json | 2 +- Assets/painter/keymap_presets/default.json | 2 +- Sources/arm/node/MakeBrush.hx | 2 +- Sources/arm/node/MakePaint.hx | 4 ++-- Sources/arm/node/MakeTexcoord.hx | 6 +++--- Sources/arm/node/brush/InputNode.hx | 4 ++-- Sources/arm/render/RenderPathPaint.hx | 8 ++++---- Sources/arm/render/Uniforms.hx | 10 +++++----- Sources/arm/ui/UISidebar.hx | 6 +++--- Sources/arm/ui/UIView2D.hx | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Assets/painter/keymap_presets/blender.json b/Assets/painter/keymap_presets/blender.json index 4b734be4..049d6869 100644 --- a/Assets/painter/keymap_presets/blender.json +++ b/Assets/painter/keymap_presets/blender.json @@ -8,7 +8,7 @@ "set_clone_source": "alt", "stencil_transform": "ctrl", "stencil_hide": "z", - "decal_paint": "ctrl", + "decal_mask": "ctrl", "select_material": "shift+number", "cycle_layers": "ctrl+tab", "brush_radius": "f", diff --git a/Assets/painter/keymap_presets/default.json b/Assets/painter/keymap_presets/default.json index ee6f208b..3876233d 100644 --- a/Assets/painter/keymap_presets/default.json +++ b/Assets/painter/keymap_presets/default.json @@ -8,7 +8,7 @@ "set_clone_source": "alt", "stencil_transform": "ctrl", "stencil_hide": "z", - "decal_paint": "ctrl", + "decal_mask": "ctrl", "select_material": "shift+number", "cycle_layers": "ctrl+tab", "brush_radius": "f", diff --git a/Sources/arm/node/MakeBrush.hx b/Sources/arm/node/MakeBrush.hx index 423f2e4f..03b3cb2a 100644 --- a/Sources/arm/node/MakeBrush.hx +++ b/Sources/arm/node/MakeBrush.hx @@ -14,7 +14,7 @@ class MakeBrush { if (Context.tool == ToolParticle) return; var decal = Context.tool == ToolDecal || Context.tool == ToolText; - if (decal) frag.write('if (decalPaint.z > 0) {'); + if (decal) frag.write('if (decalMask.z > 0) {'); if (Config.raw.brush_3d) { frag.write('vec4 inpLocal = inp;'); // TODO: spirv workaround diff --git a/Sources/arm/node/MakePaint.hx b/Sources/arm/node/MakePaint.hx index 136df49f..5b78f5d4 100644 --- a/Sources/arm/node/MakePaint.hx +++ b/Sources/arm/node/MakePaint.hx @@ -72,8 +72,8 @@ class MakePaint { vert.write('vec2 subtex = tex;'); if (decal) { vert.add_uniform('vec2 sub', '_sub'); - vert.add_uniform('vec4 decalPaint', '_decalPaint'); - vert.write('if (decalPaint.z > 0.0) subtex += sub;'); + vert.add_uniform('vec4 decalMask', '_decalMask'); + vert.write('if (decalMask.z > 0.0) subtex += sub;'); } } diff --git a/Sources/arm/node/MakeTexcoord.hx b/Sources/arm/node/MakeTexcoord.hx index d79746ae..cfa73d8b 100644 --- a/Sources/arm/node/MakeTexcoord.hx +++ b/Sources/arm/node/MakeTexcoord.hx @@ -23,10 +23,10 @@ class MakeTexcoord { //frag.write_attrib('if (uvsp.x < 0.0 || uvsp.y < 0.0 || uvsp.x > 1.0 || uvsp.y > 1.0) discard;'); } else if (decal) { - frag.add_uniform('vec4 decalPaint', '_decalPaint'); - frag.write_attrib('uvsp -= decalPaint.xy;'); + frag.add_uniform('vec4 decalMask', '_decalMask'); + frag.write_attrib('uvsp -= decalMask.xy;'); frag.write_attrib('uvsp.x *= aspectRatio;'); - frag.write_attrib('uvsp *= 0.21 / (decalPaint.w * 0.9);'); // Decal radius + frag.write_attrib('uvsp *= 0.21 / (decalMask.w * 0.9);'); // Decal radius if (Context.brushDirectional) { frag.add_uniform('vec3 brushDirection', '_brushDirection'); diff --git a/Sources/arm/node/brush/InputNode.hx b/Sources/arm/node/brush/InputNode.hx index 9e9e1468..67072d74 100644 --- a/Sources/arm/node/brush/InputNode.hx +++ b/Sources/arm/node/brush/InputNode.hx @@ -36,12 +36,12 @@ class InputNode extends LogicNode { } var decal = Context.tool == ToolDecal || Context.tool == ToolText; - var decalPaint = decal && Operator.shortcut(Config.keymap.decal_paint + "+" + Config.keymap.action_paint, ShortcutDown); + var decalMask = decal && Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.action_paint, ShortcutDown); var lazyPaint = Context.brushLazyRadius > 0 && (Operator.shortcut(Config.keymap.action_paint, ShortcutDown) || Operator.shortcut(Config.keymap.brush_ruler + "+" + Config.keymap.action_paint, ShortcutDown) || - decalPaint); + decalMask); var mouse = iron.system.Input.getMouse(); var paintX = mouse.viewX / iron.App.w(); diff --git a/Sources/arm/render/RenderPathPaint.hx b/Sources/arm/render/RenderPathPaint.hx index a4148e3c..efcfc3ce 100644 --- a/Sources/arm/render/RenderPathPaint.hx +++ b/Sources/arm/render/RenderPathPaint.hx @@ -361,14 +361,14 @@ class RenderPathPaint { public static function commandsCursor() { var decal = Context.tool == ToolDecal || Context.tool == ToolText; - var decalPaint = decal && Operator.shortcut(Config.keymap.decal_paint); + var decalMask = decal && Operator.shortcut(Config.keymap.decal_mask); var tool = Context.tool; if (tool != ToolBrush && tool != ToolEraser && tool != ToolClone && tool != ToolBlur && tool != ToolParticle && - !decalPaint) { + !decalMask) { return; } if (!App.uiEnabled || UIHeader.inst.worktab.position == SpaceRender) { @@ -408,8 +408,8 @@ class RenderPathPaint { path.setTarget(""); g.setPipeline(Layers.pipeCursor); var decal = Context.tool == ToolDecal || Context.tool == ToolText; - var decalPaint = decal && Operator.shortcut(Config.keymap.decal_paint); - var img = (decal && !decalPaint) ? Context.decalImage : Res.get("cursor.k"); + var decalMask = decal && Operator.shortcut(Config.keymap.decal_mask); + var img = (decal && !decalMask) ? Context.decalImage : Res.get("cursor.k"); g.setTexture(Layers.cursorTex, img); var gbuffer0 = path.renderTargets.get("gbuffer0").image; g.setTextureDepth(Layers.cursorGbufferD, gbuffer0); diff --git a/Sources/arm/render/Uniforms.hx b/Sources/arm/render/Uniforms.hx index dcdaba72..b584eab6 100644 --- a/Sources/arm/render/Uniforms.hx +++ b/Sources/arm/render/Uniforms.hx @@ -33,8 +33,8 @@ class Uniforms { #if arm_painter case "_brushRadius": { var val = radiusUniform(); - var decalPaint = Operator.shortcut(Config.keymap.decal_paint + "+" + Config.keymap.action_paint, ShortcutDown); - return decalPaint ? val * 2 : val; + var decalMask = Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.action_paint, ShortcutDown); + return decalMask ? val * 2 : val; } case "_brushScaleX": { return 1 / Context.brushScaleX; @@ -360,9 +360,9 @@ class Uniforms { vec.set(Context.envmapAngle, Math.sin(-Context.envmapAngle), Math.cos(-Context.envmapAngle), Context.showEnvmap ? Scene.active.world.probe.raw.strength : 4.0); return vec; } - case "_decalPaint": { - var decalPaint = Operator.shortcut(Config.keymap.decal_paint + "+" + Config.keymap.action_paint, ShortcutDown); - vec.set(Context.decalX, Context.decalY, decalPaint ? 1 : 0, radiusUniform()); + case "_decalMask": { + var decalMask = Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.action_paint, ShortcutDown); + vec.set(Context.decalX, Context.decalY, decalMask ? 1 : 0, radiusUniform()); return vec; } } diff --git a/Sources/arm/ui/UISidebar.hx b/Sources/arm/ui/UISidebar.hx index 05350c1c..37ceaffb 100644 --- a/Sources/arm/ui/UISidebar.hx +++ b/Sources/arm/ui/UISidebar.hx @@ -489,11 +489,11 @@ class UISidebar { } var decal = Context.tool == ToolDecal || Context.tool == ToolText; - var decalPaint = decal && Operator.shortcut(Config.keymap.decal_paint + "+" + Config.keymap.action_paint, ShortcutDown); + var decalMask = decal && Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.action_paint, ShortcutDown); var setCloneSource = Context.tool == ToolClone && Operator.shortcut(Config.keymap.set_clone_source + "+" + Config.keymap.action_paint, ShortcutDown); var down = Operator.shortcut(Config.keymap.action_paint, ShortcutDown) || - decalPaint || + decalMask || setCloneSource || Operator.shortcut(Config.keymap.brush_ruler + "+" + Config.keymap.action_paint, ShortcutDown) || (Input.getPen().down() && !kb.down("alt")); @@ -744,7 +744,7 @@ class UISidebar { var psizex = Std.int(256 * ui.SCALE() * (Context.brushRadius * Context.brushNodesRadius * Context.brushScaleX)); var psizey = Std.int(256 * ui.SCALE() * (Context.brushRadius * Context.brushNodesRadius)); var decalAlpha = 0.5; - if (!Operator.shortcut(Config.keymap.decal_paint, ShortcutDown)) { + if (!Operator.shortcut(Config.keymap.decal_mask, ShortcutDown)) { Context.decalX = Context.paintVec.x; Context.decalY = Context.paintVec.y; decalAlpha = Context.brushOpacity; diff --git a/Sources/arm/ui/UIView2D.hx b/Sources/arm/ui/UIView2D.hx index 90c23509..b72e154a 100644 --- a/Sources/arm/ui/UIView2D.hx +++ b/Sources/arm/ui/UIView2D.hx @@ -276,13 +276,13 @@ class UIView2D { } var decal = Context.tool == ToolDecal || Context.tool == ToolText; - var decalPaint = decal && Operator.shortcut(Config.keymap.decal_paint + "+" + Config.keymap.action_paint, ShortcutDown); + var decalMask = decal && Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.action_paint, ShortcutDown); var setCloneSource = Context.tool == ToolClone && Operator.shortcut(Config.keymap.set_clone_source + "+" + Config.keymap.action_paint, ShortcutDown); if (type == View2DLayer && (Operator.shortcut(Config.keymap.action_paint, ShortcutDown) || Operator.shortcut(Config.keymap.brush_ruler + "+" + Config.keymap.action_paint, ShortcutDown) || - decalPaint || + decalMask || setCloneSource || Config.raw.brush_live)) { Context.paint2d = true;