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

Fix combo unroll

Browse Source
This commit is contained in:
luboslenco
2023-06-09 23:43:56 +02:00
parent d406e9e922
commit 85b0ff278c
1 changed files with 107 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/Sources/arm/ui/UINodes.hx
+107 -101
View File
@@ -654,7 +654,6 @@ class UINodes {
public function render(g: kha.graphics2.Graphics) {
if (recompileMat) {
#if (is_paint || is_sculpt)
if (canvasType == CanvasBrush) {
MakeMaterial.parseBrush();
@@ -981,106 +980,8 @@ class UINodes {
#end
#if is_lab
if (ui.button(tr("Run"))) {
Console.progress(tr("Processing"));
function delayIdleSleep(_) {
Krom.delayIdleSleep();
}
iron.App.notifyOnRender2D(delayIdleSleep);
App.notifyOnNextFrame(function() {
var timer = iron.system.Time.realTime();
arm.logic.LogicParser.parse(Project.canvas, false);
arm.logic.PhotoToPBRNode.cachedSource = null;
@:privateAccess arm.logic.BrushOutputNode.inst.getAsImage(ChannelBaseColor, function(texbase: kha.Image) {
@:privateAccess arm.logic.BrushOutputNode.inst.getAsImage(ChannelOcclusion, function(texocc: kha.Image) {
@:privateAccess arm.logic.BrushOutputNode.inst.getAsImage(ChannelRoughness, function(texrough: kha.Image) {
@:privateAccess arm.logic.BrushOutputNode.inst.getAsImage(ChannelNormalMap, function(texnor: kha.Image) {
@:privateAccess arm.logic.BrushOutputNode.inst.getAsImage(ChannelHeight, function(texheight: kha.Image) {
if (texbase != null) {
var texpaint = iron.RenderPath.active.renderTargets.get("texpaint").image;
texpaint.g2.begin(false);
texpaint.g2.drawScaledImage(texbase, 0, 0, Config.getTextureResX(), Config.getTextureResY());
texpaint.g2.end();
}
if (texnor != null) {
var texpaint_nor = iron.RenderPath.active.renderTargets.get("texpaint_nor").image;
texpaint_nor.g2.begin(false);
texpaint_nor.g2.drawScaledImage(texnor, 0, 0, Config.getTextureResX(), Config.getTextureResY());
texpaint_nor.g2.end();
}
if (App.pipeCopy == null) App.makePipe();
if (App.pipeCopyA == null) App.makePipeCopyA();
if (iron.data.ConstData.screenAlignedVB == null) iron.data.ConstData.createScreenAlignedData();
var texpaint_pack = iron.RenderPath.active.renderTargets.get("texpaint_pack").image;
if (texocc != null) {
texpaint_pack.g2.begin(false);
texpaint_pack.g2.pipeline = App.pipeCopyR;
texpaint_pack.g2.drawScaledImage(texocc, 0, 0, Config.getTextureResX(), Config.getTextureResY());
texpaint_pack.g2.pipeline = null;
texpaint_pack.g2.end();
}
if (texrough != null) {
texpaint_pack.g2.begin(false);
texpaint_pack.g2.pipeline = App.pipeCopyG;
texpaint_pack.g2.drawScaledImage(texrough, 0, 0, Config.getTextureResX(), Config.getTextureResY());
texpaint_pack.g2.pipeline = null;
texpaint_pack.g2.end();
}
if (texheight != null) {
texpaint_pack.g4.begin();
texpaint_pack.g4.setPipeline(App.pipeCopyA);
texpaint_pack.g4.setTexture(App.pipeCopyATex, texheight);
texpaint_pack.g4.setVertexBuffer(iron.data.ConstData.screenAlignedVB);
texpaint_pack.g4.setIndexBuffer(iron.data.ConstData.screenAlignedIB);
texpaint_pack.g4.drawIndexedVertices();
texpaint_pack.g4.end();
// arm.util.MeshUtil.applyDisplacement(texpaint_pack, 0.08, Context.raw.brushScale);
// arm.util.MeshUtil.calcNormals();
}
Context.raw.ddirty = 2;
#if (kha_direct3d12 || kha_vulkan)
arm.render.RenderPathRaytrace.ready = false;
#end
Console.log("Processing finished in " + (iron.system.Time.realTime() - timer));
Console.progress(null);
Krom.mlUnload();
iron.App.removeRender2D(delayIdleSleep);
});
});
});
});
});
});
}
ui._x += ew + 3;
ui._y = 2 + startY;
#if (krom_android || krom_ios)
ui.combo(App.resHandle, ["2K", "4K"], tr("Resolution"));
#else
ui.combo(App.resHandle, ["2K", "4K", "8K", "16K"], tr("Resolution"));
#end
if (App.resHandle.changed) {
App.onLayersResized();
}
ui._x += ew + 3;
ui._y = 2 + startY;
ui.windowBorderTop = 0;
drawLabButtons(ew, startY);
#end
var _BUTTON_COL = ui.t.BUTTON_COL;
@@ -1414,4 +1315,109 @@ class UINodes {
for (c in canvases) if (c.name == name) return c;
return null;
}
#if is_lab
function drawLabButtons(ew: Float, startY: Float) {
if (ui.button(tr("Run"))) {
Console.progress(tr("Processing"));
function delayIdleSleep(_) {
Krom.delayIdleSleep();
}
iron.App.notifyOnRender2D(delayIdleSleep);
App.notifyOnNextFrame(function() {
var timer = iron.system.Time.realTime();
arm.logic.LogicParser.parse(Project.canvas, false);
arm.logic.PhotoToPBRNode.cachedSource = null;
@:privateAccess arm.logic.BrushOutputNode.inst.getAsImage(ChannelBaseColor, function(texbase: kha.Image) {
@:privateAccess arm.logic.BrushOutputNode.inst.getAsImage(ChannelOcclusion, function(texocc: kha.Image) {
@:privateAccess arm.logic.BrushOutputNode.inst.getAsImage(ChannelRoughness, function(texrough: kha.Image) {
@:privateAccess arm.logic.BrushOutputNode.inst.getAsImage(ChannelNormalMap, function(texnor: kha.Image) {
@:privateAccess arm.logic.BrushOutputNode.inst.getAsImage(ChannelHeight, function(texheight: kha.Image) {
if (texbase != null) {
var texpaint = iron.RenderPath.active.renderTargets.get("texpaint").image;
texpaint.g2.begin(false);
texpaint.g2.drawScaledImage(texbase, 0, 0, Config.getTextureResX(), Config.getTextureResY());
texpaint.g2.end();
}
if (texnor != null) {
var texpaint_nor = iron.RenderPath.active.renderTargets.get("texpaint_nor").image;
texpaint_nor.g2.begin(false);
texpaint_nor.g2.drawScaledImage(texnor, 0, 0, Config.getTextureResX(), Config.getTextureResY());
texpaint_nor.g2.end();
}
if (App.pipeCopy == null) App.makePipe();
if (App.pipeCopyA == null) App.makePipeCopyA();
if (iron.data.ConstData.screenAlignedVB == null) iron.data.ConstData.createScreenAlignedData();
var texpaint_pack = iron.RenderPath.active.renderTargets.get("texpaint_pack").image;
if (texocc != null) {
texpaint_pack.g2.begin(false);
texpaint_pack.g2.pipeline = App.pipeCopyR;
texpaint_pack.g2.drawScaledImage(texocc, 0, 0, Config.getTextureResX(), Config.getTextureResY());
texpaint_pack.g2.pipeline = null;
texpaint_pack.g2.end();
}
if (texrough != null) {
texpaint_pack.g2.begin(false);
texpaint_pack.g2.pipeline = App.pipeCopyG;
texpaint_pack.g2.drawScaledImage(texrough, 0, 0, Config.getTextureResX(), Config.getTextureResY());
texpaint_pack.g2.pipeline = null;
texpaint_pack.g2.end();
}
if (texheight != null) {
texpaint_pack.g4.begin();
texpaint_pack.g4.setPipeline(App.pipeCopyA);
texpaint_pack.g4.setTexture(App.pipeCopyATex, texheight);
texpaint_pack.g4.setVertexBuffer(iron.data.ConstData.screenAlignedVB);
texpaint_pack.g4.setIndexBuffer(iron.data.ConstData.screenAlignedIB);
texpaint_pack.g4.drawIndexedVertices();
texpaint_pack.g4.end();
// arm.util.MeshUtil.applyDisplacement(texpaint_pack, 0.08, Context.raw.brushScale);
// arm.util.MeshUtil.calcNormals();
}
Context.raw.ddirty = 2;
#if (kha_direct3d12 || kha_vulkan)
arm.render.RenderPathRaytrace.ready = false;
#end
Console.log("Processing finished in " + (iron.system.Time.realTime() - timer));
Console.progress(null);
Krom.mlUnload();
iron.App.removeRender2D(delayIdleSleep);
});
});
});
});
});
});
}
ui._x += ew + 3;
ui._y = 2 + startY;
#if (krom_android || krom_ios)
ui.combo(App.resHandle, ["2K", "4K"], tr("Resolution"));
#else
ui.combo(App.resHandle, ["2K", "4K", "8K", "16K"], tr("Resolution"));
#end
if (App.resHandle.changed) {
App.onLayersResized();
}
ui._x += ew + 3;
ui._y = 2 + startY;
}
#end
}