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

Merge pull request #1311 from MathemanFlo/SwatchImprovements

Browse Source 
Swatch improvements
This commit is contained in:
Lubos Lenco
2022-03-09 13:44:35 +01:00
committed by GitHub
parent 4ebd98f899 19e9d62f09
commit 696889d538
5 changed files with 86 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/App.hx
+9 -2
View File
@@ -388,6 +388,10 @@ class App {
var inNodes = UINodes.inst.show &&
mx > UINodes.inst.wx && mx < UINodes.inst.wx + UINodes.inst.ww &&
my > UINodes.inst.wy && my < UINodes.inst.wy + UINodes.inst.wh;
var inSwatches = UIStatus.inst.statustab.position == 4 &&
mx > iron.App.x() && mx < iron.App.x() + System.windowWidth() - UIToolbar.inst.toolbarw - Config.raw.layout[LayoutSidebarW] &&
my > System.windowHeight() - Config.raw.layout[LayoutStatusH];
if (dragAsset != null) {
if (inNodes) { // Create image texture
UINodes.inst.acceptAssetDrag(Project.assets.indexOf(dragAsset));
@@ -405,14 +409,17 @@ class App {
}
else if (dragSwatch != null) {
if (inNodes) { // Create RGB node
UINodes.inst.acceptSwatchDrag(Project.raw.swatches.indexOf(dragSwatch));
UINodes.inst.acceptSwatchDrag(dragSwatch);
}
else if (inMaterials) {
TabMaterials.acceptSwatchDrag(Project.raw.swatches.indexOf(dragSwatch));
TabMaterials.acceptSwatchDrag(dragSwatch);
}
else if (inLayers || inViewport) {
Layers.createColorLayer(dragSwatch.base.value);
}
else if (inSwatches) {
TabSwatches.acceptSwatchDrag(dragSwatch);
}
dragSwatch = null;
}
else if (dragMaterial != null) {
Sources/arm/ui/TabMaterials.hx
+3 -3
View File
@@ -10,6 +10,7 @@ import iron.object.MeshObject;
import iron.data.Data;
import arm.node.MakeMaterial;
import arm.data.MaterialSlot;
import arm.ProjectFormat.TSwatchColor;
import arm.util.RenderUtil;
import arm.sys.Path;
import arm.Enums;
@@ -234,12 +235,11 @@ class TabMaterials {
}
}
public static function acceptSwatchDrag(index: Int) {
public static function acceptSwatchDrag(swatch: TSwatchColor) {
Context.material = new MaterialSlot(Project.materials[0].data);
for (node in Context.material.canvas.nodes) {
if (node.type == "RGB" ) {
var color = Project.raw.swatches[index].base;
node.outputs[0].default_value = [color.R, color.G, color.B, color.A];
node.outputs[0].default_value = [swatch.base.R, swatch.base.G, swatch.base.B, swatch.base.A];
}
}
Project.materials.push(Context.material);
Sources/arm/ui/TabSwatches.hx
+58 -11
View File
@@ -9,7 +9,21 @@ import arm.ProjectFormat;
class TabSwatches {
public static var empty: kha.Image = null;
public static var empty(get, default): kha.Image = null;
public static function get_empty() {
if (empty == null) {
var b = haxe.io.Bytes.alloc(4);
b.set(0, 255);
b.set(1, 255);
b.set(2, 255);
b.set(3, 255);
empty = kha.Image.fromBytes(b, 1, 1);
}
return empty;
}
private static var dragPosition : Int = -1;
@:access(zui.Zui)
public static function draw() {
@@ -64,7 +78,10 @@ class TabSwatches {
var statusw = kha.System.windowWidth() - UIToolbar.inst.toolbarw - Config.raw.layout[LayoutSidebarW];
var slotw = Std.int(26 * ui.SCALE());
var num = Std.int(statusw / (slotw + 3));
var dragPositionSet = false;
var uix = 0.0;
var uiy = 0.0;
for (row in 0...Std.int(Math.ceil(Project.raw.swatches.length / num))) {
ui.row([for (i in 0...num) 1 / num]);
@@ -84,27 +101,29 @@ class TabSwatches {
ui.fill(-2, -2, w, w, ui.t.HIGHLIGHT_COL);
}
if (empty == null) {
var b = haxe.io.Bytes.alloc(4);
b.set(0, 255);
b.set(1, 255);
b.set(2, 255);
b.set(3, 255);
empty = kha.Image.fromBytes(b, 1, 1);
uix = ui._x;
uiy = ui._y;
// Draw the drag position indicator
if (App.dragSwatch != null && dragPosition == i) {
ui.fill(-1, -2 , 2, 32, ui.t.HIGHLIGHT_COL);
}
var uix = ui._x;
var uiy = ui._y;
var state = ui.image(empty, Project.raw.swatches[i].base, slotw);
if (state == State.Started) {
Context.setSwatch(Project.raw.swatches[i]);
var mouse = Input.getMouse();
App.dragOffX = -(mouse.x - uix - ui._windowX - 3);
App.dragOffX = -(mouse.x - uix - ui._windowX - 2 * slotw);
App.dragOffY = -(mouse.y - uiy - ui._windowY + 1);
App.dragSwatch = Context.swatch;
}
else if (state == State.Hovered) {
var mouse = Input.getMouse();
dragPosition = (mouse.x > uix + ui._windowX + slotw / 2) ? i + 1 : i; // Switch to the next position if the mouse crosses the swatch rectangle center
dragPositionSet = true;
}
else if (state == State.Released) {
if (Time.time() - Context.selectTime < 0.25) {
UIMenu.draw(function(ui) {
@@ -152,6 +171,17 @@ class TabSwatches {
}
}
// Draw the rightmost line next to the last swatch.
if (App.dragSwatch != null && dragPosition == Project.raw.swatches.length) {
ui._x = uix; // Reset the position because otherwise it would start in the row below
ui._y = uiy;
ui.fill(28, -2, 2, 32, ui.t.HIGHLIGHT_COL);
}
// Currently there is no valid dragPosition so reset it.
if (!dragPositionSet)
dragPosition = -1;
var inFocus = ui.inputX > ui._windowX && ui.inputX < ui._windowX + ui._windowW &&
ui.inputY > ui._windowY && ui.inputY < ui._windowY + ui._windowH;
if (inFocus && ui.isDeleteDown && Project.raw.swatches.length > 1) {
@@ -161,6 +191,23 @@ class TabSwatches {
}
}
public static function acceptSwatchDrag(swatch : TSwatchColor) {
// No valid position available
if (TabSwatches.dragPosition == -1) return;
var swatchPosition = Project.raw.swatches.indexOf(swatch);
// A new swatch from color picker.
if (swatchPosition == -1) {
Project.raw.swatches.insert(dragPosition, swatch);
}
else if (Math.abs(swatchPosition - dragPosition) > 0) { // Existing swatch is reordered
Project.raw.swatches.remove(swatch);
// If the new position is after the old one, decrease by one because the swatch has been deleted.
var newPosition = dragPosition - swatchPosition > 0 ? dragPosition -1 : dragPosition;
Project.raw.swatches.insert(newPosition, swatch);
}
}
static function deleteSwatch(swatch: TSwatchColor) {
var i = Project.raw.swatches.indexOf(swatch);
Context.setSwatch(Project.raw.swatches[i == Project.raw.swatches.length - 1 ? i - 1 : i + 1]);
Sources/arm/ui/UIHeader.hx
+13 -2
View File
@@ -4,10 +4,12 @@ import kha.System;
import zui.Zui;
import zui.Id;
import iron.RenderPath;
import iron.system.Input;
import arm.node.MakeMaterial;
import arm.util.UVUtil;
import arm.util.RenderUtil;
import arm.io.ImportFont;
import arm.ProjectFormat.TSwatchColor;
import arm.Enums;
class UIHeader {
@@ -60,7 +62,16 @@ class UIHeader {
h.color.R = baseRPicked;
h.color.G = baseGPicked;
h.color.B = baseBPicked;
ui.text("", 0, h.color);
var state = ui.text("", 0, h.color);
if (state == State.Started) {
var mouse = Input.getMouse();
var uix = ui._x;
var uiy = ui._y;
App.dragOffX = -(mouse.x - uix - ui._windowX - 3);
App.dragOffY = -(mouse.y - uiy - ui._windowY + 1);
App.dragSwatch = Project.makeSwatch(h.color.value);
}
if (ui.isHovered) ui.tooltip(tr("Drag and drop picked color to swatches, materials, layers or to the node editor."));
if (ui.isHovered && ui.inputReleased) {
UIMenu.draw(function(ui) {
ui.fill(0, 0, ui._w / ui.ops.scaleFactor, ui.t.ELEMENT_H * 9, ui.t.SEPARATOR_COL);
@@ -75,7 +86,7 @@ class UIHeader {
Project.raw.swatches.push(newSwatch);
UIStatus.inst.statusHandle.redraws = 1;
}
if (ui.isHovered) ui.tooltip(tr("Add picker color to swatches"));
if (ui.isHovered) ui.tooltip(tr("Add picked color to swatches"));
ui.text(tr("Base") + ' ($baseRPicked,$baseGPicked,$baseBPicked)');
ui.text(tr("Normal") + ' ($normalRPicked,$normalGPicked,$normalBPicked)');
Sources/arm/ui/UINodes.hx
+3 -3
View File
@@ -17,6 +17,7 @@ import arm.util.RenderUtil;
import arm.ui.UIHeader;
import arm.Enums;
import arm.Project;
import arm.ProjectFormat.TSwatchColor;
@:access(zui.Zui)
@:access(zui.Nodes)
@@ -1003,12 +1004,11 @@ class UINodes {
getNodes().nodesSelected = [n];
}
public function acceptSwatchDrag(index: Int) {
public function acceptSwatchDrag(swatch : TSwatchColor) {
pushUndo();
var g = groupStack.length > 0 ? groupStack[groupStack.length - 1] : null;
var n = NodesMaterial.createNode("RGB", g);
var color = Project.raw.swatches[index].base;
n.outputs[0].default_value = [color.R, color.G, color.B, color.A];
n.outputs[0].default_value = [swatch.base.R, swatch.base.G, swatch.base.B, swatch.base.A];
getNodes().nodesSelected = [n];
}