Compile fixes

armory3d · Nov 30, 2023 · 075b440 · 075b440
1 parent 226862e
commit 075b440
Show file tree

Hide file tree

Showing 22 changed files with 68 additions and 54 deletions.
diff --git a/armorforge/Sources/arm/ui/TabObjects.hx b/armorforge/Sources/arm/ui/TabObjects.hx
@@ -26,7 +26,7 @@ class TabObjects {
 			ui.endSticky();
 
 			if (ui.panel(Zui.handle("tabobjects_0", {selected: true}), "Outliner")) {
-				ui.indent();
+				// ui.indent();
 				ui._y -= ui.ELEMENT_OFFSET();
 
 				var listX = ui._x;
@@ -112,9 +112,9 @@ class TabObjects {
 					if (b) {
 						var currentY = ui._y;
 						for (child in currentObject.children) {
-							ui.indent();
+							// ui.indent();
 							drawList(listHandle, child);
-							ui.unindent();
+							// ui.unindent();
 						}
 
 						// Draw line that shows parent relations
@@ -127,11 +127,11 @@ class TabObjects {
 					drawList(Zui.handle("tabobjects_1"), c);
 				}
 
-				ui.unindent();
+				// ui.unindent();
 			}
 
 			if (ui.panel(Zui.handle("tabobjects_2", {selected: true}), 'Properties')) {
-				ui.indent();
+				// ui.indent();
 
 				if (Context.raw.selectedObject != null) {
 					var h = Zui.handle("tabobjects_3");
@@ -253,7 +253,7 @@ class TabObjects {
 					}
 				}
 
-				ui.unindent();
+				// ui.unindent();
 			}
 		}
 	}

diff --git a/armorlab/Sources/arm/logic/ImageTextureNode.hx b/armorlab/Sources/arm/logic/ImageTextureNode.hx
@@ -1,6 +1,6 @@
 package arm.logic;
 
-import zui.Nodes;
+import zui.Zui.Nodes;
 import arm.logic.LogicNode;
 import arm.logic.LogicParser.f32;
 import arm.Translator._tr;
@@ -27,7 +27,7 @@ class ImageTextureNode extends LogicNode {
 		return image;
 	}
 
-	public static var def: TNode = {
+	public static var def: zui.Zui.TNode = {
 		id: 0,
 		name: _tr("Image Texture"),
 		type: "ImageTextureNode",

diff --git a/armorlab/Sources/arm/logic/InpaintNode.hx b/armorlab/Sources/arm/logic/InpaintNode.hx
@@ -1,6 +1,6 @@
 package arm.logic;
 
-import zui.Nodes;
+import zui.Zui.Nodes;
 import arm.logic.LogicNode;
 import arm.logic.LogicParser.f32;
 import arm.Translator._tr;
@@ -46,11 +46,11 @@ class InpaintNode extends LogicNode {
 		}
 	}
 
-	public static function buttons(ui: zui.Zui, nodes: zui.Nodes, node: zui.Nodes.TNode) {
+	public static function buttons(ui: zui.Zui, nodes: zui.Zui.Nodes, node: zui.Zui.TNode) {
 		auto = node.buttons[0].default_value;
 		if (!auto) {
 			strength = ui.slider(zui.Zui.handle("inpaintnode_0", {value: strength}), tr("strength"), 0, 1, true);
-			prompt = zui.Ext.textArea(ui, zui.Zui.handle("inpaintnode_1"), true, tr("prompt"), true);
+			prompt = ui.textArea(zui.Zui.handle("inpaintnode_1"), true, tr("prompt"), true);
 			node.buttons[1].height = 1 + prompt.split("\n").length;
 		}
 		else node.buttons[1].height = 0;
@@ -181,7 +181,7 @@ class InpaintNode extends LogicNode {
 		});
 	}
 
-	public static var def: TNode = {
+	public static var def: zui.Zui.TNode = {
 		id: 0,
 		name: _tr("Inpaint"),
 		type: "InpaintNode",

diff --git a/armorlab/Sources/arm/logic/NodesBrush.hx b/armorlab/Sources/arm/logic/NodesBrush.hx
@@ -1,13 +1,13 @@
 package arm.logic;
 
-import zui.Nodes;
+import zui.Zui.Nodes;
 import arm.Translator._tr;
 
 class NodesBrush {
 
 	public static var categories = [_tr("Input"), _tr("Model")];
 
-	public static var list: Array<Array<TNode>> = [
+	public static var list: Array<Array<zui.Zui.TNode>> = [
 		[ // Input
 			ImageTextureNode.def,
 			RGBNode.def,
@@ -22,7 +22,7 @@ class NodesBrush {
 		]
 	];
 
-	public static function createNode(nodeType: String): TNode {
+	public static function createNode(nodeType: String): zui.Zui.TNode {
 		for (c in list) {
 			for (n in c) {
 				if (n.type == nodeType) {

diff --git a/armorlab/Sources/arm/logic/PhotoToPBRNode.hx b/armorlab/Sources/arm/logic/PhotoToPBRNode.hx
@@ -1,6 +1,6 @@
 package arm.logic;
 
-import zui.Nodes;
+import zui.Zui.Nodes;
 import arm.logic.LogicNode;
 import arm.logic.LogicParser.f32;
 import arm.Translator._tr;
@@ -174,7 +174,7 @@ class PhotoToPBRNode extends LogicNode {
 	}
 	#end
 
-	public static var def: TNode = {
+	public static var def: zui.Zui.TNode = {
 		id: 0,
 		name: _tr("Photo to PBR"),
 		type: "PhotoToPBRNode",

diff --git a/armorlab/Sources/arm/logic/RGBNode.hx b/armorlab/Sources/arm/logic/RGBNode.hx
@@ -1,6 +1,6 @@
 package arm.logic;
 
-import zui.Nodes;
+import zui.Zui.Nodes;
 import iron.math.Vec4;
 import arm.logic.LogicNode;
 import arm.logic.LogicParser.f32;
@@ -38,7 +38,7 @@ class RGBNode extends LogicNode {
 		return image;
 	}
 
-	public static var def: TNode = {
+	public static var def: zui.Zui.TNode = {
 		id: 0,
 		name: _tr("RGB"),
 		type: "RGBNode",

diff --git a/armorlab/Sources/arm/logic/TextToPhotoNode.hx b/armorlab/Sources/arm/logic/TextToPhotoNode.hx
@@ -1,6 +1,6 @@
 package arm.logic;
 
-import zui.Nodes;
+import zui.Zui.Nodes;
 import arm.logic.LogicNode;
 import arm.logic.LogicParser.f32;
 import arm.Translator._tr;
@@ -30,9 +30,9 @@ class TextToPhotoNode extends LogicNode {
 		return image;
 	}
 
-	public static function buttons(ui: zui.Zui, nodes: zui.Nodes, node: zui.Nodes.TNode) {
+	public static function buttons(ui: zui.Zui, nodes: zui.Zui.Nodes, node: zui.Zui.TNode) {
 		tiling = node.buttons[0].default_value;
-		prompt = zui.Ext.textArea(ui, zui.Zui.handle("texttophotonode_0"), true, tr("prompt"), true);
+		prompt = ui.textArea(zui.Zui.handle("texttophotonode_0"), true, tr("prompt"), true);
 		node.buttons[1].height = prompt.split("\n").length;
 	}
 
@@ -248,7 +248,7 @@ class TextToPhotoNode extends LogicNode {
 		});
 	}
 
-	public static var def: TNode = {
+	public static var def: zui.Zui.TNode = {
 		id: 0,
 		name: _tr("Text to Photo"),
 		type: "TextToPhotoNode",

diff --git a/armorlab/Sources/arm/logic/TilingNode.hx b/armorlab/Sources/arm/logic/TilingNode.hx
@@ -1,6 +1,6 @@
 package arm.logic;
 
-import zui.Nodes;
+import zui.Zui.Nodes;
 import arm.logic.LogicNode;
 import arm.logic.LogicParser.f32;
 import arm.Translator._tr;
@@ -26,11 +26,11 @@ class TilingNode extends LogicNode {
 		}
 	}
 
-	public static function buttons(ui: zui.Zui, nodes: zui.Nodes, node: zui.Nodes.TNode) {
+	public static function buttons(ui: zui.Zui, nodes: zui.Zui.Nodes, node: zui.Zui.TNode) {
 		auto = node.buttons[0].default_value;
 		if (!auto) {
 			strength = ui.slider(zui.Zui.handle("tilingnode_0", {value: strength}), tr("strength"), 0, 1, true);
-			prompt = zui.Ext.textArea(ui, zui.Zui.handle("tilingnode_1"), true, tr("prompt"), true);
+			prompt = ui.textArea(zui.Zui.handle("tilingnode_1"), true, tr("prompt"), true);
 			node.buttons[1].height = 1 + prompt.split("\n").length;
 		}
 		else node.buttons[1].height = 0;
@@ -93,7 +93,7 @@ class TilingNode extends LogicNode {
 		InpaintNode.sdInpaint(tile, mask, done);
 	}
 
-	public static var def: TNode = {
+	public static var def: zui.Zui.TNode = {
 		id: 0,
 		name: _tr("Tiling"),
 		type: "TilingNode",

diff --git a/armorlab/Sources/arm/logic/UpscaleNode.hx b/armorlab/Sources/arm/logic/UpscaleNode.hx
@@ -1,6 +1,6 @@
 package arm.logic;
 
-import zui.Nodes;
+import zui.Zui.Nodes;
 import arm.logic.LogicNode;
 import arm.logic.LogicParser.f32;
 import arm.Translator._tr;
@@ -126,7 +126,7 @@ class UpscaleNode extends LogicNode {
 		return result;
 	}
 
-	public static var def: TNode = {
+	public static var def: zui.Zui.TNode = {
 		id: 0,
 		name: _tr("Upscale"),
 		type: "UpscaleNode",

diff --git a/armorlab/Sources/arm/logic/VarianceNode.hx b/armorlab/Sources/arm/logic/VarianceNode.hx
@@ -1,6 +1,6 @@
 package arm.logic;
 
-import zui.Nodes;
+import zui.Zui.Nodes;
 import arm.logic.LogicNode;
 import arm.logic.LogicParser.f32;
 import arm.Translator._tr;
@@ -27,8 +27,8 @@ class VarianceNode extends LogicNode {
 		}
 	}
 
-	public static function buttons(ui: zui.Zui, nodes: zui.Nodes, node: zui.Nodes.TNode) {
-		prompt = zui.Ext.textArea(ui, zui.Zui.handle("variancenode_0"), true, tr("prompt"), true);
+	public static function buttons(ui: zui.Zui, nodes: zui.Zui.Nodes, node: zui.Zui.TNode) {
+		prompt = ui.textArea(zui.Zui.handle("variancenode_0"), true, tr("prompt"), true);
 		node.buttons[0].height = prompt.split("\n").length;
 	}
 
@@ -84,7 +84,7 @@ class VarianceNode extends LogicNode {
 		return image;
 	}
 
-	public static var def: TNode = {
+	public static var def: zui.Zui.TNode = {
 		id: 0,
 		name: _tr("Variance"),
 		type: "VarianceNode",

diff --git a/armorlab/Sources/arm/render/RenderPathPaint.hx b/armorlab/Sources/arm/render/RenderPathPaint.hx
@@ -175,7 +175,9 @@ class RenderPathPaint {
 			return;
 		}
 
-		var inpaint = UINodes.inst.getNodes().nodesSelected.length > 0 && UINodes.inst.getNodes().nodesSelected[0].type == "InpaintNode";
+		var nodes = UINodes.inst.getNodes();
+		var canvas = UINodes.inst.getCanvas(true);
+		var inpaint = nodes.nodesSelectedId.length > 0 && nodes.getNode(canvas.nodes, nodes.nodesSelectedId[0]).type == "InpaintNode";
 
 		if (!App.uiEnabled || App.isDragging || !inpaint) {
 			return;
@@ -265,8 +267,10 @@ class RenderPathPaint {
 
 	public static function bindLayers() {
 		var image: kha.Image = null;
-		if (UINodes.inst.getNodes().nodesSelected.length > 0) {
-			var node = UINodes.inst.getNodes().nodesSelected[0];
+		var nodes = UINodes.inst.getNodes();
+		var canvas = UINodes.inst.getCanvas(true);
+		if (nodes.nodesSelectedId.length > 0) {
+			var node = nodes.getNode(canvas.nodes, nodes.nodesSelectedId[0]);
 			var brushNode = arm.logic.LogicParser.getLogicNode(node);
 			if (brushNode != null) {
 				image = brushNode.getCachedImage();
@@ -296,7 +300,9 @@ class RenderPathPaint {
 			path.bindTarget("texpaint_nor_empty", "texpaint_nor");
 			path.bindTarget("texpaint_pack_empty", "texpaint_pack");
 
-			var node = UINodes.inst.getNodes().nodesSelected[0];
+			var nodes = UINodes.inst.getNodes();
+			var canvas = UINodes.inst.getCanvas(true);
+			var node = nodes.getNode(canvas.nodes, nodes.nodesSelectedId[0]);
 			var inpaint = node.type == "InpaintNode";
 			if (inpaint) {
 				var brushNode = arm.logic.LogicParser.getLogicNode(node);

diff --git a/armorlab/Sources/arm/shader/MakeMaterial.hx b/armorlab/Sources/arm/shader/MakeMaterial.hx
@@ -1,6 +1,6 @@
 package arm.shader;
 
-import zui.Nodes;
+import zui.Zui.Nodes;
 import iron.data.SceneFormat;
 import iron.data.ShaderData;
 import iron.data.MaterialData;

diff --git a/armorlab/Sources/arm/shader/MakePaint.hx b/armorlab/Sources/arm/shader/MakePaint.hx
@@ -1,7 +1,7 @@
 package arm.shader;
 
 import iron.data.SceneFormat;
-import zui.Nodes;
+import zui.Zui.Nodes;
 import arm.shader.MaterialParser;
 import arm.shader.NodeShaderContext;
 import arm.shader.NodeShaderData;

diff --git a/armorsculpt/Sources/arm/shader/MakeMaterial.hx b/armorsculpt/Sources/arm/shader/MakeMaterial.hx
@@ -1,6 +1,7 @@
 package arm.shader;
 
-import zui.Nodes;
+import zui.Zui;
+import zui.Zui.Nodes;
 import iron.data.SceneFormat;
 import iron.data.ShaderData;
 import iron.data.MaterialData;

diff --git a/armorsculpt/Sources/arm/shader/MakeSculpt.hx b/armorsculpt/Sources/arm/shader/MakeSculpt.hx
@@ -1,7 +1,7 @@
 package arm.shader;
 
 import iron.data.SceneFormat;
-import zui.Nodes;
+import zui.Zui.Nodes;
 import arm.ui.UINodes;
 import arm.shader.MaterialParser;
 import arm.shader.NodeShaderContext;

diff --git a/armorsculpt/Sources/arm/ui/TabLayers.hx b/armorsculpt/Sources/arm/ui/TabLayers.hx
@@ -1,7 +1,7 @@
 package arm.ui;
 
 import zui.Zui;
-import zui.Nodes;
+import zui.Zui.Nodes;
 import iron.system.Time;
 import iron.system.Input;
 import iron.object.MeshObject;
@@ -252,10 +252,10 @@ class TabLayers {
 		if (layerNameEdit == l.id) {
 			layerNameHandle.text = l.name;
 			l.name = ui.textInput(layerNameHandle);
-			if (ui.textSelectedHandle != layerNameHandle) layerNameEdit = -1;
+			if (ui.textSelectedHandle_ptr != layerNameHandle.ptr) layerNameEdit = -1;
 		}
 		else {
-			if (ui.enabled && ui.inputEnabled && ui.comboSelectedHandle == null &&
+			if (ui.enabled && ui.inputEnabled && ui.comboSelectedHandle_ptr == null &&
 				ui.inputX > ui._windowX + ui._x && ui.inputX < ui._windowX + ui._windowW &&
 				ui.inputY > ui._windowY + ui._y - center && ui.inputY < ui._windowY + ui._y - center + (step * ui.SCALE()) * 2) {
 				if (ui.inputStarted) {

diff --git a/base/Sources/arm/App.hx b/base/Sources/arm/App.hx
@@ -2146,8 +2146,10 @@ class App {
 		var texpaint_nor = arm.logic.BrushOutputNode.inst.texpaint_nor;
 		var texpaint_pack = arm.logic.BrushOutputNode.inst.texpaint_pack;
 
-		if (UINodes.inst.getNodes().nodesSelected.length > 0) {
-			var node = UINodes.inst.getNodes().nodesSelected[0];
+		var nodes = UINodes.inst.getNodes();
+		var canvas = UINodes.inst.getCanvas(true);
+		if (nodes.nodesSelectedId.length > 0) {
+			var node = nodes.getNode(canvas.nodes, nodes.nodesSelectedId[0]);
 			var brushNode = arm.logic.LogicParser.getLogicNode(node);
 			if (brushNode != null && brushNode.getCachedImage() != null) {
 				texpaint = brushNode.getCachedImage();

diff --git a/base/Sources/arm/Context.hx b/base/Sources/arm/Context.hx
@@ -367,7 +367,9 @@ class Context {
 			raw.lastPaintVecY = raw.paintVec.y;
 		}
 
-		var inpaint = UINodes.inst.getNodes().nodesSelected.length > 0 && UINodes.inst.getNodes().nodesSelected[0].type == "InpaintNode";
+		var nodes = UINodes.inst.getNodes();
+		var canvas = UINodes.inst.getCanvas(true);
+		var inpaint = nodes.nodesSelectedId.length > 0 && nodes.getNode(canvas.nodes, nodes.nodesSelectedId[0]).type == "InpaintNode";
 
 		// Paint bounds
 		if (inpaint &&

diff --git a/base/Sources/arm/logic/LogicParser.hx b/base/Sources/arm/logic/LogicParser.hx
@@ -111,7 +111,8 @@ class LogicParser {
 		// Expose button values in node class
 		for (b in node.buttons) {
 			if (b.type == "ENUM") {
-				var arrayData = Std.isOfType(b.data, Array);
+				// var arrayData = Std.isOfType(b.data, Array);
+				var arrayData = b.data.length > 1;
 				var texts = arrayData ? b.data : Nodes.enumTextsHaxe(node.type);
 				Reflect.setProperty(v, b.name, texts[b.default_value]);
 			}

diff --git a/base/Sources/arm/ui/UIBase.hx b/base/Sources/arm/ui/UIBase.hx
@@ -28,7 +28,7 @@ import arm.data.MaterialSlot;
 #end
 #if is_lab
 import kha.Blob;
-import zui.Nodes;
+import zui.Zui.Nodes;
 #end
 
 @:access(zui.Zui)