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

Cleanup

Browse Source
This commit is contained in:
Lubos Lenco
2021-08-11 09:12:11 +02:00
parent c24047688c
commit 3fcb1de306
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/node/MakeBrush.hx
+2 -4
View File
@@ -78,8 +78,6 @@ class MakeBrush {
frag.write('float h = clamp(dot(pa, ba) / dot(ba, ba), 0.0, 1.0);');
frag.write('dist = length(pa - ba * h);');
}
frag.write('if (dist > brushRadius) discard;');
}
else { // !brush3d
frag.write('vec2 binp = inp.xy * 2.0 - 1.0;');
@@ -94,10 +92,10 @@ class MakeBrush {
frag.write('vec2 ba = binplast.xy - binp.xy;');
frag.write('float h = clamp(dot(pa, ba) / dot(ba, ba), 0.0, 1.0);');
frag.write('dist = length(pa - ba * h);');
frag.write('if (dist > brushRadius) discard;');
}
frag.write('if (dist > brushRadius) discard;');
if (decal) frag.write('}');
}
}
Sources/arm/node/MakePaint.hx
+1
View File
@@ -337,6 +337,7 @@ class MakePaint {
frag.add_uniform('sampler2D paintmask');
frag.write('float sample_mask = textureLod(paintmask, sample_tc, 0.0).r;');
frag.write('str = max(str, sample_mask);');
// frag.write('str = clamp(str + sample_mask, 0.0, 1.0);');
frag.add_uniform('sampler2D texpaint_undo', '_texpaint_undo');
frag.write('vec4 sample_undo = textureLod(texpaint_undo, sample_tc, 0.0);');