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

Handle brush scaling for decal mask

Browse Source
This commit is contained in:
luboslenco
2020-10-28 19:51:15 +01:00
parent 981173f7d6
commit a22ec67f83
6 changed files with 74 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/Context.hx
+2
View File
@@ -163,6 +163,8 @@ class Context {
public static var brushRadius = 0.5;
public static var brushRadiusHandle = new Handle({value: 0.5});
public static var brushDecalMaskRadius = 0.5;
public static var brushDecalMaskRadiusHandle = new Handle({value: 0.5});
public static var brushScaleX = 1.0;
public static var brushScaleXHandle = new Handle({value: 1.0});
public static var brushBlending = BlendMix;
Sources/arm/Operator.hx
+2 -1
View File
@@ -32,7 +32,7 @@ class Operator {
// Mouse
(type == ShortcutDown ? mouse.down(s) : mouse.started(s)) :
// Keyboard
(type == ShortcutRepeat ? kb.repeat(s) : type == ShortcutDown ? kb.down(s) : kb.started(s));
(type == ShortcutRepeat ? kb.repeat(s) : type == ShortcutDown ? kb.down(s) : type == ShortcutReleased ? kb.released(s) : kb.started(s));
return flag && key;
}
}
@@ -41,4 +41,5 @@ class Operator {
var ShortcutStarted = 0;
var ShortcutRepeat = 1;
var ShortcutDown = 2;
var ShortcutReleased = 3;
}
Sources/arm/render/RenderPathPaint.hx
+2 -1
View File
@@ -379,7 +379,8 @@ class RenderPathPaint {
mx = (Context.lockStartedX - iron.App.x()) / iron.App.w();
my = 1.0 - (Context.lockStartedY - iron.App.y()) / iron.App.h();
}
drawCursor(mx, my, Context.brushNodesRadius * Context.brushRadius / 3.4);
var radius = decalMask ? Context.brushDecalMaskRadius : Context.brushRadius;
drawCursor(mx, my, Context.brushNodesRadius * radius / 3.4);
// if (Context.brushLazyRadius > 0 && (Context.tool == ToolBrush || Context.tool == ToolEraser)) {
// var _brushRadius = Context.brushRadius;
Sources/arm/render/Uniforms.hx
+22 -21
View File
@@ -29,9 +29,23 @@ class Uniforms {
public static function linkFloat(object: Object, mat: MaterialData, link: String): Null<kha.FastFloat> {
switch (link) {
case "_brushRadius": {
var val = radiusUniform();
var decalMask = Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.action_paint, ShortcutDown);
return decalMask ? val * 2 : val;
var decal = Context.tool == ToolDecal || Context.tool == ToolText;
var decalMask = decal && Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.action_paint, ShortcutDown);
var radius = decalMask ? Context.brushDecalMaskRadius * 2.0 : Context.brushRadius;
var val = (radius * Context.brushNodesRadius) / 15.0;
var pen = Input.getPen();
if (Config.raw.pressure_radius && pen.down()) {
val *= pen.pressure * Config.raw.pressure_sensitivity;
}
var scale2d = (900 / App.h()) * Config.raw.window_scale;
if (Config.raw.brush_3d && !decal) {
val *= Context.paint2d ? 0.55 * scale2d : 2;
}
else {
val *= scale2d; // Projection ratio
}
return val;
}
case "_brushScaleX": {
return 1 / Context.brushScaleX;
@@ -86,23 +100,6 @@ class Uniforms {
return null;
}
static function radiusUniform(): Float {
var val = (Context.brushRadius * Context.brushNodesRadius) / 15.0;
var pen = Input.getPen();
if (Config.raw.pressure_radius && pen.down()) {
val *= pen.pressure * Config.raw.pressure_sensitivity;
}
var scale2d = (900 / App.h()) * Config.raw.window_scale;
var decal = Context.tool == ToolDecal || Context.tool == ToolText;
if (Config.raw.brush_3d && !decal) {
val *= Context.paint2d ? 0.55 * scale2d : 2;
}
else {
val *= scale2d; // Projection ratio
}
return val;
}
public static function linkVec2(object: Object, mat: MaterialData, link: String): iron.math.Vec4 {
switch (link) {
case "_sub": {
@@ -205,8 +202,12 @@ class Uniforms {
return vec;
}
case "_decalMask": {
var decal = Context.tool == ToolDecal || Context.tool == ToolText;
var decalMask = Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.action_paint, ShortcutDown);
vec.set(Context.decalX, Context.decalY, decalMask ? 1 : 0, radiusUniform());
var val = (Context.brushRadius * Context.brushNodesRadius) / 15.0;
var scale2d = (900 / App.h()) * Config.raw.window_scale;
val *= scale2d; // Projection ratio
vec.set(Context.decalX, Context.decalY, decalMask ? 1 : 0, val);
return vec;
}
}
Sources/arm/ui/UIHeader.hx
+8 -1
View File
@@ -149,7 +149,14 @@ class UIHeader {
Context.tool == ToolParticle) {
if (Context.tool != ToolFill) {
Context.brushRadius = ui.slider(Context.brushRadiusHandle, tr("Radius"), 0.01, 2.0, true);
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);
}
else {
Context.brushRadius = ui.slider(Context.brushRadiusHandle, tr("Radius"), 0.01, 2.0, true);
}
}
if (Context.tool == ToolDecal || Context.tool == ToolText) {
Sources/arm/ui/UISidebar.hx
+38 -5
View File
@@ -219,11 +219,14 @@ class UISidebar {
}
var mouse = Input.getMouse();
var decal = Context.tool == ToolDecal || Context.tool == ToolText;
var decalMask = decal && Operator.shortcut(Config.keymap.decal_mask, ShortcutDown);
if ((Context.brushCanLock || Context.brushLocked) && mouse.moved) {
if (Operator.shortcut(Config.keymap.brush_radius, ShortcutDown) ||
Operator.shortcut(Config.keymap.brush_opacity, ShortcutDown) ||
Operator.shortcut(Config.keymap.brush_angle, ShortcutDown)) {
Operator.shortcut(Config.keymap.brush_angle, ShortcutDown) ||
(decalMask && Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.brush_radius, ShortcutDown))) {
if (Context.brushLocked) {
if (Operator.shortcut(Config.keymap.brush_opacity, ShortcutDown)) {
Context.brushOpacity += mouse.movementX / 500;
@@ -238,6 +241,12 @@ class UISidebar {
Context.brushAngleHandle.value = Context.brushAngle;
MakeMaterial.parsePaintMaterial();
}
else if (decalMask && Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.brush_radius, ShortcutDown)) {
Context.brushDecalMaskRadius += mouse.movementX / 150;
Context.brushDecalMaskRadius = Math.max(0.05, Math.min(4.0, Context.brushDecalMaskRadius));
Context.brushDecalMaskRadius = Math.round(Context.brushDecalMaskRadius * 100) / 100;
Context.brushDecalMaskRadiusHandle.value = Context.brushDecalMaskRadius;
}
else {
Context.brushRadius += mouse.movementX / 150;
Context.brushRadius = Math.max(0.05, Math.min(4.0, Context.brushRadius));
@@ -256,6 +265,9 @@ class UISidebar {
var right = iron.App.w();
if (UIView2D.inst.show) right += UIView2D.inst.ww;
var decal = Context.tool == ToolDecal || Context.tool == ToolText;
var decalMask = decal && Operator.shortcut(Config.keymap.decal_mask, ShortcutDown);
// Viewport shortcuts
if (mouse.viewX > 0 && mouse.viewX < right &&
mouse.viewY > 0 && mouse.viewY < iron.App.h() &&
@@ -295,7 +307,8 @@ class UISidebar {
Context.tool == ToolParticle) {
if (Operator.shortcut(Config.keymap.brush_radius) ||
Operator.shortcut(Config.keymap.brush_opacity) ||
Operator.shortcut(Config.keymap.brush_angle)) {
Operator.shortcut(Config.keymap.brush_angle) ||
(decalMask && Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.brush_radius))) {
Context.brushCanLock = true;
if (!Input.getPen().connected) mouse.lock();
Context.lockStartedX = mouse.x;
@@ -313,6 +326,24 @@ class UISidebar {
Context.brushRadiusHandle.value = Context.brushRadius;
UIHeader.inst.headerHandle.redraws = 2;
}
else if (decalMask) {
if (Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.brush_radius_decrease, ShortcutRepeat)) {
Context.brushDecalMaskRadius -= getRadiusIncrement();
Context.brushDecalMaskRadius = Math.max(Math.round(Context.brushDecalMaskRadius * 100) / 100, 0.01);
Context.brushDecalMaskRadiusHandle.value = Context.brushDecalMaskRadius;
UIHeader.inst.headerHandle.redraws = 2;
}
else if (Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.brush_radius_increase, ShortcutRepeat)) {
Context.brushDecalMaskRadius += getRadiusIncrement();
Context.brushDecalMaskRadius = Math.round(Context.brushDecalMaskRadius * 100) / 100;
Context.brushDecalMaskRadiusHandle.value = Context.brushDecalMaskRadius;
UIHeader.inst.headerHandle.redraws = 2;
}
}
}
if (decalMask && (Operator.shortcut(Config.keymap.decal_mask, ShortcutStarted) || Operator.shortcut(Config.keymap.decal_mask, ShortcutReleased))) {
UIHeader.inst.headerHandle.redraws = 2;
}
}
@@ -349,7 +380,8 @@ class UISidebar {
if (Context.brushLocked &&
!Operator.shortcut(Config.keymap.brush_radius, ShortcutDown) &&
!Operator.shortcut(Config.keymap.brush_opacity, ShortcutDown) &&
!Operator.shortcut(Config.keymap.brush_angle, ShortcutDown)) {
!Operator.shortcut(Config.keymap.brush_angle, ShortcutDown) &&
!(decalMask && Operator.shortcut(Config.keymap.decal_mask + "+" + Config.keymap.brush_radius, ShortcutDown))) {
mouse.unlock();
Context.brushCanUnlock = true;
Context.lastPaintX = -1;
@@ -742,7 +774,8 @@ 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_mask, ShortcutDown)) {
var decalMask = Operator.shortcut(Config.keymap.decal_mask, ShortcutDown);
if (!decalMask) {
Context.decalX = Context.paintVec.x;
Context.decalY = Context.paintVec.y;
decalAlpha = Context.brushOpacity;
@@ -754,7 +787,7 @@ class UISidebar {
Context.viewIndex = -1;
// Radius being scaled
if (Context.brushLocked) {
if (Context.brushLocked && !decalMask) {
decalX += Context.lockStartedX - System.windowWidth() / 2;
decalY += Context.lockStartedY - System.windowHeight() / 2;
}