From edf19ee4e27a9e144534975fbc5bca47dc71bb3d Mon Sep 17 00:00:00 2001 From: luboslenco Date: Thu, 10 Sep 2020 16:21:29 +0200 Subject: [PATCH] Translation support for nodes --- Sources/arm/App.hx | 1 + Sources/arm/data/BrushSlot.hx | 1 - Sources/arm/data/MaterialSlot.hx | 1 - Sources/arm/ui/UINodes.hx | 10 +--------- khafile.js | 1 + 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Sources/arm/App.hx b/Sources/arm/App.hx index a49712d8..42ebbb8f 100644 --- a/Sources/arm/App.hx +++ b/Sources/arm/App.hx @@ -143,6 +143,7 @@ class App { colorWheel = image; Nodes.enumTexts = enumTexts; + Nodes.tr = tr; uiBox = new Zui({ font: f, scaleFactor: Config.raw.window_scale, color_wheel: colorWheel }); uiMenu = new Zui({ font: f, scaleFactor: Config.raw.window_scale, color_wheel: colorWheel }); defaultElementH = uiMenu.t.ELEMENT_H; diff --git a/Sources/arm/data/BrushSlot.hx b/Sources/arm/data/BrushSlot.hx index ed7c39ff..ae5426eb 100644 --- a/Sources/arm/data/BrushSlot.hx +++ b/Sources/arm/data/BrushSlot.hx @@ -30,6 +30,5 @@ class BrushSlot { else { canvas = c; } - for (node in canvas.nodes) arm.ui.UINodes.translateNode(node); } } diff --git a/Sources/arm/data/MaterialSlot.hx b/Sources/arm/data/MaterialSlot.hx index ffb6bd87..5b863508 100644 --- a/Sources/arm/data/MaterialSlot.hx +++ b/Sources/arm/data/MaterialSlot.hx @@ -49,7 +49,6 @@ class MaterialSlot { else { canvas = c; } - for (node in canvas.nodes) arm.ui.UINodes.translateNode(node); } public function unload() { diff --git a/Sources/arm/ui/UINodes.hx b/Sources/arm/ui/UINodes.hx index 2dd34541..43e51dc5 100644 --- a/Sources/arm/ui/UINodes.hx +++ b/Sources/arm/ui/UINodes.hx @@ -198,7 +198,7 @@ class UINodes { var nodeList = canvasType == CanvasMaterial ? NodesMaterial.list : NodesBrush.list; for (list in nodeList) { for (n in list) { - if (n.name.toLowerCase().indexOf(search) >= 0) { + if (tr(n.name).toLowerCase().indexOf(search) >= 0) { ui.t.BUTTON_COL = count == nodeSearchOffset ? ui.t.HIGHLIGHT_COL : ui.t.WINDOW_BG_COL; if (ui.button(tr(n.name), Left) || (enter && count == nodeSearchOffset)) { var nodes = getNodes(); @@ -516,7 +516,6 @@ class UINodes { public static function makeNode(n: TNode, nodes: Nodes, canvas: TNodeCanvas): TNode { var node: TNode = Json.parse(Json.stringify(n)); - translateNode(node); node.id = nodes.getNodeId(canvas.nodes); node.x = UINodes.inst.getNodeX(); node.y = UINodes.inst.getNodeY(); @@ -530,11 +529,4 @@ class UINodes { } return node; } - - public static function translateNode(node: TNode) { - node.name = tr(node.name); - for (inp in node.inputs) inp.name = tr(inp.name); - for (out in node.outputs) out.name = tr(out.name); - for (but in node.buttons) but.name = tr(but.name); - } } diff --git a/khafile.js b/khafile.js index 3ad947b1..0968c9e8 100644 --- a/khafile.js +++ b/khafile.js @@ -30,6 +30,7 @@ project.addAssets("Assets/meshes/*", { notinlist: true, destination: "data/meshe project.addDefine("arm_taa"); project.addDefine("arm_veloc"); project.addDefine("arm_particles"); +project.addDefine("zui_translate"); if (!android) { project.addDefine("arm_data_dir");