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

Decal mask cleanup

Browse Source
This commit is contained in:
luboslenco
2020-03-10 14:09:26 +01:00
parent 3b90cfcd5a
commit bb9a2182a7
6 changed files with 6 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/node/MakeMeshPreview.hx
+1 -5
View File
@@ -76,11 +76,7 @@ class MakeMeshPreview {
var decal = UITrait.inst.decalPreview;
if (decal) {
if (Context.tool == ToolDecal) {
frag.add_uniform('sampler2D texdecalmask', '_texdecalmask');
frag.write('opacity *= textureLod(texdecalmask, texCoord, 0.0).r;');
}
else if (Context.tool == ToolText) {
if (Context.tool == ToolText) {
frag.add_uniform('sampler2D textexttool', '_textexttool');
frag.write('opacity *= textureLod(textexttool, texCoord, 0.0).r;');
}
Sources/arm/node/MakePaint.hx
+4 -4
View File
@@ -212,16 +212,16 @@ class MakePaint {
if (subs != "0") MaterialBuilder.subsUsed = true;
}
if (Context.tool == ToolDecal) {
frag.add_uniform('sampler2D texdecalmask', '_texdecalmask');
frag.write('opacity *= textureLod(texdecalmask, texCoord, 0.0).r;');
if (UITrait.inst.brushMaskImage != null && Context.tool == ToolDecal) {
frag.add_uniform('sampler2D texbrushmask', '_texbrushmask');
frag.write('opacity *= textureLod(texbrushmask, texCoord, 0.0).r;');
}
else if (Context.tool == ToolText) {
frag.add_uniform('sampler2D textexttool', '_textexttool');
frag.write('opacity *= textureLod(textexttool, texCoord, 0.0).r;');
}
if (UITrait.inst.brushMaskImage != null && Context.tool == ToolBrush) {
if (UITrait.inst.brushMaskImage != null && (Context.tool == ToolBrush || Context.tool == ToolEraser)) {
frag.add_uniform('sampler2D texbrushmask', '_texbrushmask');
frag.write('vec2 binp_mask = inp.xy * 2.0 - 1.0;');
frag.write('binp_mask.x *= aspectRatio;');