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

Cleanup

Browse Source
This commit is contained in:
luboslenco
2024-01-21 15:18:44 +01:00
parent 39b94bf642
commit a40793a6e0
60 changed files with 1315 additions and 1316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
armorlab/Sources/RenderPathPaint.ts
+7 -7
View File
@@ -84,7 +84,7 @@ class RenderPathPaint {
path.bindTarget("texpaint_nor" + tid, "texpaint_nor");
path.bindTarget("texpaint_pack" + tid, "texpaint_pack");
path.drawMeshes("paint");
UIHeader.inst.headerHandle.redraws = 2;
UIHeader.headerHandle.redraws = 2;
let texpaint_picker = path.renderTargets.get("texpaint_picker").image;
let texpaint_nor_picker = path.renderTargets.get("texpaint_nor_picker").image;
@@ -165,8 +165,8 @@ class RenderPathPaint {
return;
}
let nodes = UINodes.inst.getNodes();
let canvas = UINodes.inst.getCanvas(true);
let nodes = UINodes.getNodes();
let canvas = UINodes.getCanvas(true);
let inpaint = nodes.nodesSelectedId.length > 0 && nodes.getNode(canvas.nodes, nodes.nodesSelectedId[0]).type == "InpaintNode";
if (!Base.uiEnabled || Base.isDragging || !inpaint) {
@@ -256,8 +256,8 @@ class RenderPathPaint {
static bindLayers = () => {
let image: Image = null;
let nodes = UINodes.inst.getNodes();
let canvas = UINodes.inst.getCanvas(true);
let nodes = UINodes.getNodes();
let canvas = UINodes.getCanvas(true);
if (nodes.nodesSelectedId.length > 0) {
let node = nodes.getNode(canvas.nodes, nodes.nodesSelectedId[0]);
let brushNode = ParserLogic.getLogicNode(node);
@@ -289,8 +289,8 @@ class RenderPathPaint {
path.bindTarget("texpaint_nor_empty", "texpaint_nor");
path.bindTarget("texpaint_pack_empty", "texpaint_pack");
let nodes = UINodes.inst.getNodes();
let canvas = UINodes.inst.getCanvas(true);
let nodes = UINodes.getNodes();
let canvas = UINodes.getCanvas(true);
let node = nodes.getNode(canvas.nodes, nodes.nodesSelectedId[0]);
let inpaint = node.type == "InpaintNode";
if (inpaint) {
armorlab/Sources/UINodesExt.ts
+2 -2
View File
@@ -4,7 +4,7 @@ class UINodesExt {
static lastVertices: DataView = null; // Before displacement
static drawButtons = (ew: f32, startY: f32) => {
let ui = UINodes.inst.ui;
let ui = UINodes.ui;
if (ui.button(tr("Run"))) {
Console.progress(tr("Processing"));
@@ -84,7 +84,7 @@ class UINodesExt {
texpaint_pack.g4.drawIndexedVertices();
texpaint_pack.g4.end();
if (UIHeader.inst.worktab.position == Space3D &&
if (UIHeader.worktab.position == Space3D &&
BrushOutputNode.inst.inputs[ChannelHeight].node.constructor != FloatNode) {
// Make copy of vertices before displacement