From 3a949a1e9efd8ab5be9a9225d549f90c350a5452 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Sun, 3 Feb 2019 22:19:50 +0100 Subject: [PATCH] Parse opacity --- Sources/arm/MaterialBuilder.hx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Sources/arm/MaterialBuilder.hx b/Sources/arm/MaterialBuilder.hx index 3a2410ca..c30a15b8 100644 --- a/Sources/arm/MaterialBuilder.hx +++ b/Sources/arm/MaterialBuilder.hx @@ -200,18 +200,20 @@ class MaterialBuilder { var occ = sout.out_occlusion; var nortan = Cycles.out_normaltan; var height = sout.out_height; + var opac = sout.out_opacity; frag.write('vec3 basecol = $base;'); frag.write('float roughness = $rough;'); frag.write('float metallic = $met;'); frag.write('float occlusion = $occ;'); frag.write('vec3 nortan = $nortan;'); frag.write('float height = $height;'); + frag.write('float opacity = $opac * brushOpacity;'); - if (eraser) frag.write(' float str = 1.0 - brushOpacity;'); - else frag.write(' float str = clamp(brushOpacity * (brushRadius - dist) * brushStrength, 0.0, 1.0);'); + if (eraser) frag.write(' float str = 1.0 - opacity;'); + else frag.write(' float str = clamp(opacity * (brushRadius - dist) * brushStrength, 0.0, 1.0);'); if (UITrait.inst.mirrorX && UITrait.inst.brushType == 0) { // Draw - frag.write('str += clamp(brushOpacity * (brushRadius - dist2) * brushStrength, 0.0, 1.0);'); + frag.write('str += clamp(opacity * (brushRadius - dist2) * brushStrength, 0.0, 1.0);'); frag.write('str = clamp(str, 0.0, 1.0);'); }