From 20ec554ff045a5408bb6fabb78b897757dcbf7b2 Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Fri, 10 Jan 2020 20:01:56 +0100
Subject: [PATCH] Improve channel viewing in 2D view

---
 Shaders/painter/glsl/layer_view.frag.glsl     |  17 ++++++++++++-
 Shaders/painter/hlsl/layer_merge.vert.glsl    | Bin 640 -> 650 bytes
 Shaders/painter/hlsl/layer_view.frag.glsl     | Bin 726 -> 1470 bytes
 Shaders/painter/hlsl/src/build.bat            |   7 ++++++
 Shaders/painter/hlsl/src/layer_view.frag.hlsl |  17 ++++++++++++-
 Shaders/raytrace/raytrace_bake_ao.cso         | Bin 6788 -> 6788 bytes
 Shaders/raytrace/raytrace_bake_bent.cso       | Bin 7116 -> 7116 bytes
 Shaders/raytrace/raytrace_bake_light.cso      | Bin 8924 -> 8924 bytes
 Shaders/raytrace/raytrace_bake_thick.cso      | Bin 7084 -> 7084 bytes
 Shaders/raytrace/src/raytrace_bake_ao.hlsl    |   2 +-
 Shaders/raytrace/src/raytrace_bake_bent.hlsl  |   2 +-
 Shaders/raytrace/src/raytrace_bake_light.hlsl |   2 +-
 Shaders/raytrace/src/raytrace_bake_thick.hlsl |   2 +-
 Sources/arm/Tool.hx                           |   4 ++-
 Sources/arm/ui/UIView2D.hx                    |  23 +++++++++++++++---
 15 files changed, 66 insertions(+), 10 deletions(-)
 create mode 100644 Shaders/painter/hlsl/src/build.bat

diff --git a/Shaders/painter/glsl/layer_view.frag.glsl b/Shaders/painter/glsl/layer_view.frag.glsl
index fb5ca02a..5d3fdd19 100644
--- a/Shaders/painter/glsl/layer_view.frag.glsl
+++ b/Shaders/painter/glsl/layer_view.frag.glsl
@@ -1,8 +1,23 @@
 #version 330
 uniform sampler2D tex;
+uniform int channel;
 in vec2 texCoord;
 in vec4 color;
 out vec4 FragColor;
 void main() {
-	FragColor = textureLod(tex, texCoord, 0) * color;
+	if (channel == 1) {
+		FragColor = textureLod(tex, texCoord, 0).rrra * color;
+	}
+	else if (channel == 2) {
+		FragColor = textureLod(tex, texCoord, 0).ggga * color;
+	}
+	else if (channel == 3) {
+		FragColor = textureLod(tex, texCoord, 0).bbba * color;
+	}
+	else if (channel == 4) {
+		FragColor = textureLod(tex, texCoord, 0).aaaa * color;
+	}
+	else {
+		FragColor = textureLod(tex, texCoord, 0).rgba * color;
+	}
 }
diff --git a/Shaders/painter/hlsl/layer_merge.vert.glsl b/Shaders/painter/hlsl/layer_merge.vert.glsl
index 64937e0e4c669e40aa9b28db1bf122f73075b039..38cf0b8fd9cb0ca6f4e03f6fb510984f57846bc6 100644
GIT binary patch
delta 25
gcmZo*?P3*RPR`F^U?|8hW?(Eytzcl<$X3M!08vi{KL7v#

delta 15
WcmeBTZD3_%EXXfrVAv>7#RLEy>I16)

diff --git a/Shaders/painter/hlsl/layer_view.frag.glsl b/Shaders/painter/hlsl/layer_view.frag.glsl
index e732fbcf778890d9dde5e88e8a0967e53dff4262..8ec76148fd3d09406886d5976d3808d00112f29c 100644
GIT binary patch
literal 1470
zcmcIkziSg=7=F)7wU%N+q0mXcp+f{Irie%>#Wt5~gw~Y1ONlP=QcshTCLy_@f=CxP
zb#n9{kfTE<ol9{R2XSyKI7=oc<MZD4edP@P$dZ>l`QGon_xE!Nnbk1ZulD@CPBZ8d
z;X*XO-fY+WW{=3&sr#)~&?J@=U>H_qEq}bQ?Re?h(etIJKTl3iKN)!PVuA=Cy1_aO
zUx4XzMBfqSSOt3vclLV^n7}eX6N3R8vw&mea%`Ie1ds*hfoXu{4Zv~3!Z}&q0w@>v
zz?}{tIO3X|<B%_Z5FP*99(WCBTZkf#WxtO=CXwTZ(zzbjPN`(Nwm$V18?7+*G~#S3
zc=$k$&Bji*-D^JzMb^10iW}~RaO?iVpeyq2y-ov6iQM&t9Nlr(?^<z2qDh>$61nuQ
z(rIbebF!Uv6N*=;<Vz*Tq9}?=$aPIU<6HvJa+V7Qcf0EO-N!+QAh%eke8u2fu)hO#
zC&{>nHQ28NZnDmOrtN{;T4fF|QAg_KGEpr<W<MkEtS>_6-U7t*g|yePTDA#{IHR^d
zb%2`^<F>4Gg;M5}dR`=Yc}#SWFVE7Vve_#4hbJ<x?up}Bu)7Po=J}NLu`kPW1tn$x
z@sA#u|51DRyg!~En5R*D_!f?*2mUSmtq0AY=HlikTxkA=xJYu`*FK74``Q0zvoA@X
oB*(MhI0@$6^;W&tm`MQq9<uPB`M-{5Ww{7wJvIz|vF|wK7XiAGlK=n!

delta 264
zcmdnTeT}uAfhoQuwIaSaF}ENmwTOWM$YEe$aEWko4!$s9(@kez6Wdyj|JNs!1uz1|
z4=^z>umWilApQcx4nV;YAXWj22f4Vq?Es3w08og*2E<|g|DOS<rWeQzaxpXniAeyl
z0uXCVoXyW#17t8y4rCSP1gZjq&WWex1yI}tbk^jljGD}=SFfJDkFiBy1yEf85NiQ(
u76$|4<Rm7K$-7uWRD(ktL#6-)nSmH)95Ndy3{+jnD$fWaeJ3}tasdE=?llzv

diff --git a/Shaders/painter/hlsl/src/build.bat b/Shaders/painter/hlsl/src/build.bat
new file mode 100644
index 00000000..cbc8dd4c
--- /dev/null
+++ b/Shaders/painter/hlsl/src/build.bat
@@ -0,0 +1,7 @@
+..\..\..\bin\hlslbin.exe cursor.vert.hlsl ..\cursor.vert.glsl vs_5_0 -i nor -i pos -i tex
+..\..\..\bin\hlslbin.exe cursor.frag.hlsl ..\cursor.frag.glsl ps_5_0
+..\..\..\bin\hlslbin.exe layer_view.vert.hlsl ..\layer_view.vert.glsl vs_5_0 -i col -i pos -i tex
+..\..\..\bin\hlslbin.exe layer_view.frag.hlsl ..\layer_view.frag.glsl ps_5_0
+..\..\..\bin\hlslbin.exe layer_merge.vert.hlsl ..\layer_merge.vert.glsl vs_5_0 -i col -i pos -i tex
+..\..\..\bin\hlslbin.exe layer_merge.frag.hlsl ..\layer_merge.frag.glsl ps_5_0
+..\..\..\bin\hlslbin.exe mask_merge.frag.hlsl ..\mask_merge.frag.glsl ps_5_0
diff --git a/Shaders/painter/hlsl/src/layer_view.frag.hlsl b/Shaders/painter/hlsl/src/layer_view.frag.hlsl
index efc657af..67b90127 100644
--- a/Shaders/painter/hlsl/src/layer_view.frag.hlsl
+++ b/Shaders/painter/hlsl/src/layer_view.frag.hlsl
@@ -1,5 +1,20 @@
 Texture2D<float4> tex;
 SamplerState _tex_sampler;
+uniform int channel;
 float4 main(float4 color : TEXCOORD0, float2 texCoord : TEXCOORD1) : SV_Target0 {
-	return tex.SampleLevel(_tex_sampler, texCoord, 0) * color;
+	if (channel == 1) {
+		return tex.SampleLevel(_tex_sampler, texCoord, 0).rrra * color;
+	}
+	else if (channel == 2) {
+		return tex.SampleLevel(_tex_sampler, texCoord, 0).ggga * color;
+	}
+	else if (channel == 3) {
+		return tex.SampleLevel(_tex_sampler, texCoord, 0).bbba * color;
+	}
+	else if (channel == 4) {
+		return tex.SampleLevel(_tex_sampler, texCoord, 0).aaaa * color;
+	}
+	else {
+		return tex.SampleLevel(_tex_sampler, texCoord, 0).rgba * color;
+	}
 }
diff --git a/Shaders/raytrace/raytrace_bake_ao.cso b/Shaders/raytrace/raytrace_bake_ao.cso
index 6ec8ae1cf65b48ca8aca07d760cf007935fb1856..89859ae8434f774921c9a292a8c91b92d5f42764 100644
GIT binary patch
delta 36
ucmV+<0NekBHH0-3L|8&Y+_#$g$|-6G`S_=Ul9=T@u@rI_0jslz7ySY>>JZ}q

delta 36
scmZoMZ7~&biEwi6?cx$%Ct0&S+~#4I{Nwj4H;NRAGp^X&F8-GZ0R4v!wEzGB

diff --git a/Shaders/raytrace/raytrace_bake_bent.cso b/Shaders/raytrace/raytrace_bake_bent.cso
index c349073847cb9cdca7c884ea6744eefc06bc8536..3e92e65c26305c18198a7077b3ac7af034d057d1 100644
GIT binary patch
delta 37
vcmV+=0NVe|H_SH_L|8&YMLn4hpP2C|(+8;5%$p4Lu@v|h0suU-4j8@zDaj8a

delta 37
vcmV+=0NVe|H_SH_L|8&YS4FD`TBgc6*0qd@sK2_ku@v|h0>C%34j8@zH~SE5

diff --git a/Shaders/raytrace/raytrace_bake_light.cso b/Shaders/raytrace/raytrace_bake_light.cso
index ab055dfb06aed01c11e1e11bb8194b6dab9b7ced..5febbfa85831c5aa977c39327a57fe765502d7a4 100644
GIT binary patch
delta 37
tcmccPddF47CBn&B$Hw4#G;bkid-IxW8`O9%Y!tDRW@60U93tJp4gd?14MqR}

delta 37
tcmccPddF47CBn&hVP=#}+26lr#v<p|thMn<-6&!w&E%M~IYhdH9RMhW4s`$k

diff --git a/Shaders/raytrace/raytrace_bake_thick.cso b/Shaders/raytrace/raytrace_bake_thick.cso
index 89e335f54ee80ae44923775ed69ab0ad7b80c83a..4506f3b997847f1fdf00f9a2b71fa79e53e285b2 100644
GIT binary patch
delta 84
zcmV-a0IUD3H>@`lL|8&YO<grH?9G^!>KUo5x2CbGu@w3e2?z>f1Rw~4_(!uB6A1wd
qm>MAQu{A*AV{Ef36hZ<4F|%zJIspZ2H46F|ldKm?0g$uz7qtUw5+4l!

delta 84
zcmV-a0IUD3H>@`lL|8&Yl<nQJ+IaMbo(eonVI0@ru@w3e3I2@{fFKBhpg^-16A1wd
qSQ;SlF*QKqV{5Z26hZ<4v9oO!IspZYH46GzldKm?0Z_B|7qtVzLm+AZ

diff --git a/Shaders/raytrace/src/raytrace_bake_ao.hlsl b/Shaders/raytrace/src/raytrace_bake_ao.hlsl
index 2493a772..51b68df0 100644
--- a/Shaders/raytrace/src/raytrace_bake_ao.hlsl
+++ b/Shaders/raytrace/src/raytrace_bake_ao.hlsl
@@ -77,7 +77,7 @@ void raygeneration() {
 		float b = 1.0 - a;
 		color = color * b + accum.xyz * a;
 	}
-	render_target[DispatchRaysIndex().xy] = float4(color.xyz, 0.0f);
+	render_target[DispatchRaysIndex().xy] = float4(color.xyz, 1.0f);
 }
 
 [shader("closesthit")]
diff --git a/Shaders/raytrace/src/raytrace_bake_bent.hlsl b/Shaders/raytrace/src/raytrace_bake_bent.hlsl
index 0e338b7d..991f9a63 100644
--- a/Shaders/raytrace/src/raytrace_bake_bent.hlsl
+++ b/Shaders/raytrace/src/raytrace_bake_bent.hlsl
@@ -79,7 +79,7 @@ void raygeneration() {
 		float b = 1.0 - a;
 		color = color * b + accum.xyz * a;
 	}
-	render_target[DispatchRaysIndex().xy] = float4(color.xyz, 0.0f);
+	render_target[DispatchRaysIndex().xy] = float4(color.xyz, 1.0f);
 }
 
 [shader("closesthit")]
diff --git a/Shaders/raytrace/src/raytrace_bake_light.hlsl b/Shaders/raytrace/src/raytrace_bake_light.hlsl
index d25a8e6a..51899f89 100644
--- a/Shaders/raytrace/src/raytrace_bake_light.hlsl
+++ b/Shaders/raytrace/src/raytrace_bake_light.hlsl
@@ -81,7 +81,7 @@ void raygeneration() {
 		float b = 1.0 - a;
 		color = color * b + accum.xyz * a;
 	}
-	render_target[DispatchRaysIndex().xy] = float4(color.xyz, 0.0f);
+	render_target[DispatchRaysIndex().xy] = float4(color.xyz, 1.0f);
 }
 
 [shader("closesthit")]
diff --git a/Shaders/raytrace/src/raytrace_bake_thick.hlsl b/Shaders/raytrace/src/raytrace_bake_thick.hlsl
index c72899f1..1596104d 100644
--- a/Shaders/raytrace/src/raytrace_bake_thick.hlsl
+++ b/Shaders/raytrace/src/raytrace_bake_thick.hlsl
@@ -78,7 +78,7 @@ void raygeneration() {
 		float b = 1.0 - a;
 		color = color * b + accum.xyz * a;
 	}
-	render_target[DispatchRaysIndex().xy] = float4(color.xyz, 0.0f);
+	render_target[DispatchRaysIndex().xy] = float4(color.xyz, 1.0f);
 }
 
 [shader("closesthit")]
diff --git a/Sources/arm/Tool.hx b/Sources/arm/Tool.hx
index 4ac679dc..b4f5e181 100644
--- a/Sources/arm/Tool.hx
+++ b/Sources/arm/Tool.hx
@@ -191,7 +191,9 @@ package arm;
 @:enum abstract PaintTex(Int) from Int to Int {
 	var TexBase = 0;
 	var TexNormal = 1;
-	var TexPack = 2;
+	var TexOcclusion = 2;
+	var TexRoughness = 3;
+	var TexMetallic = 4;
 }
 
 @:enum abstract ProjectModel(Int) from Int to Int {
diff --git a/Sources/arm/ui/UIView2D.hx b/Sources/arm/ui/UIView2D.hx
index 752584ab..b7f9df2f 100644
--- a/Sources/arm/ui/UIView2D.hx
+++ b/Sources/arm/ui/UIView2D.hx
@@ -6,6 +6,7 @@ import kha.graphics4.PipelineState;
 import kha.graphics4.VertexStructure;
 import kha.graphics4.VertexData;
 import kha.graphics4.BlendingFactor;
+import kha.graphics4.ConstantLocation;
 import zui.Zui;
 import zui.Id;
 import iron.system.Input;
@@ -28,6 +29,7 @@ class UIView2D {
 	public var panY = 0.0;
 	public var panScale = 1.0;
 	var pipe: PipelineState;
+	var channelLocation: ConstantLocation;
 	var texType = TexBase;
 	var uvmapShow = false;
 
@@ -46,6 +48,7 @@ class UIView2D {
 		pipe.blendDestination = BlendingFactor.BlendZero;
 		pipe.colorWriteMaskAlpha = false;
 		pipe.compile();
+		channelLocation = pipe.getConstantLocation("channel");
 
 		var scale = Config.raw.window_scale;
 		ui = new Zui({font: App.font, theme: App.theme, color_wheel: App.color_wheel, scaleFactor: scale});
@@ -94,22 +97,36 @@ class UIView2D {
 			ui.g.pipeline = pipe;
 			var l = Context.layer;
 			var tex: Image = null;
+			var channel = 0;
 
 			if (type == View2DLayer) {
-				tex = texType == TexBase ? l.texpaint : texType == TexNormal ? l.texpaint_nor : l.texpaint_pack;
-				if (Context.layerIsMask) tex = l.texpaint_mask;
+				tex =
+					Context.layerIsMask     ? l.texpaint_mask :
+					texType == TexBase      ? l.texpaint :
+					texType == TexNormal    ? l.texpaint_nor :
+										      l.texpaint_pack;
+
+				channel =
+					texType == TexOcclusion ? 1 :
+					texType == TexRoughness ? 2 :
+					texType == TexMetallic  ? 3 :
+											  0;
 			}
 			else { // View2DAsset
 				tex = UITrait.inst.getImage(Context.texture);
 			}
 
+			ui.currentWindow.texture.g4.setInt(channelLocation, channel);
+
 			var th = tw;
 			if (tex != null) {
 				th = tw * (tex.height / tex.width);
 				if (!UITrait.inst.textureFilter) {
 					ui.g.imageScaleQuality = kha.graphics2.ImageScaleQuality.Low;
 				}
+
 				ui.g.drawScaledImage(tex, tx, ty, tw, th);
+
 				if (!UITrait.inst.textureFilter) {
 					ui.g.imageScaleQuality = kha.graphics2.ImageScaleQuality.High;
 				}
@@ -165,7 +182,7 @@ class UIView2D {
 				ui._x = 2;
 				ui._y = 2;
 				ui._w = ew;
-				texType = ui.combo(Id.handle({position: texType}), ["Base", "Normal Map", "ORM"], "Texture");
+				texType = ui.combo(Id.handle({position: texType}), ["Base Color", "Normal Map", "Occlusion", "Roughness", "Metallic"], "Texture");
 				ui._x += ew + 3;
 				ui._y = 2;
 				uvmapShow = ui.check(Id.handle({selected: uvmapShow}), "UV Map");