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:
luboslenco
2020-10-03 14:12:56 +02:00
parent 8d25fb41cf
commit 4fbaba64d2
4 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/shaderlib/Sources/arm/shader/MaterialParser.hx
+15 -20
View File
@@ -52,7 +52,7 @@ class MaterialParser {
public static var triplanar = false; // Sample using texCoord/1/2 & texCoordBlend
public static var sample_keep_aspect = false; // Adjust uvs to preserve texture aspect ratio
public static var sample_uv_scale = '1.0';
public static var blur_passthrough = false;
public static var warp_passthrough = false;
@@ -520,24 +520,18 @@ class MaterialParser {
var gamma = parse_value_input(node.inputs[1]);
return 'pow($out_col, ' + to_vec3('$gamma') + ")";
}
else if(node.type == "DIRECT_WARP"){
// Get the current rendered material texture
else if (node.type == "DIRECT_WARP") {
if (warp_passthrough) return parse_vector_input(node.inputs[0]);
var angle = parse_value_input(node.inputs[1], true);
var mask = parse_value_input(node.inputs[2], true);
var tex_name = "texwarp_" + node_name(node);
var tex_name = "texwarp_" + node_name(node);
curshader.add_uniform("sampler2D " + tex_name, "_" + tex_name);
curshader.write('float x = cos($angle * ${Math.PI} / 180);');
curshader.write('float y = sin($angle * ${Math.PI} / 180);');
curshader.write('vec3 res1 = vec3(0.0, 0.0, 0.0);');
curshader.write('res1 = texture($tex_name, texCoord + vec2(x, y) * $mask).rgb;');
return "res1;";
var store = store_var_name(node);
curshader.write('float ${store}_rad = $angle * (${Math.PI} / 180);');
curshader.write('float ${store}_x = cos(${store}_rad);');
curshader.write('float ${store}_y = sin(${store}_rad);');
return 'texture($tex_name, texCoord + vec2(${store}_x, ${store}_y) * $mask).rgb;';
}
else if (node.type == "BLUR") {
if (blur_passthrough) return parse_vector_input(node.inputs[0]);
var strength = parse_value_input(node.inputs[1]);
@@ -545,14 +539,15 @@ class MaterialParser {
var steps = 'int($strength * 10 + 1)';
var tex_name = "texblur_" + node_name(node);
curshader.add_uniform("sampler2D " + tex_name, "_" + tex_name);
curshader.write('vec3 res1 = vec3(0.0, 0.0, 0.0);');
var store = store_var_name(node);
curshader.write('vec3 ${store}_res = vec3(0.0, 0.0, 0.0);');
curshader.write('for (int i = -$steps; i <= $steps; ++i) {');
curshader.write('for (int j = -$steps; j <= $steps; ++j) {');
curshader.write('res1 += texture($tex_name, texCoord + vec2(i, j) / vec2(textureSize($tex_name, 0))).rgb;');
curshader.write('${store}_res += texture($tex_name, texCoord + vec2(i, j) / vec2(textureSize($tex_name, 0))).rgb;');
curshader.write('}');
curshader.write('}');
curshader.write('res1 /= ($steps * 2 + 1) * ($steps * 2 + 1);');
return "res1";
curshader.write('${store}_res /= ($steps * 2 + 1) * ($steps * 2 + 1);');
return '${store}_res';
}
else if (node.type == "HUE_SAT") {
curshader.add_function(ShaderFunctions.str_hue_sat);
@@ -990,7 +985,7 @@ class MaterialParser {
frag.write_normal--;
}
static function parse_value_input(inp: TNodeSocket, vector_as_grayscale: Bool = false) : String {
static function parse_value_input(inp: TNodeSocket, vector_as_grayscale = false) : String {
var l = getInputLink(inp);
var from_node = l != null ? getNode(l.from_id) : null;
if (from_node != null) {
@@ -1001,7 +996,7 @@ class MaterialParser {
var res_var = write_result(l);
var st = from_node.outputs[l.from_socket].type;
if (st == "RGB" || st == "RGBA" || st == "VECTOR") {
if(vector_as_grayscale) {
if (vector_as_grayscale) {
return 'dot($res_var.rbg, vec3(0.299, 0.587, 0.114))';
}
else {
Sources/arm/Context.hx
+1 -1
View File
@@ -48,7 +48,7 @@ class Context {
public static var nodePreviewSocket = 0;
public static var nodePreview: Image = null;
public static var nodePreviewsBlur: Map<String, Image> = null;
public static var nodePreviewsWrap: Map<String, Image> = null;
public static var nodePreviewsWarp: Map<String, Image> = null;
public static var colorIdPicked = false;
Sources/arm/node/MakeMaterial.hx
+8 -11
View File
@@ -174,19 +174,17 @@ class MakeMaterial {
}
static function bakeBlurNodes() {
// Clean Blur nodes
if (Context.nodePreviewsBlur != null) {
for (image in Context.nodePreviewsBlur) {
image.unload();
}
Context.nodePreviewsBlur = null;
}
// Clean Wrap Nodes
if (Context.nodePreviewsWrap != null) {
for (img in Context.nodePreviewsWrap) {
if (Context.nodePreviewsWarp != null) {
for (img in Context.nodePreviewsWarp) {
img.unload();
}
Context.nodePreviewsWrap = null;
Context.nodePreviewsWarp = null;
}
for (node in UINodes.inst.getCanvasMaterial().nodes) {
if (node.type == "BLUR") {
@@ -200,14 +198,13 @@ class MakeMaterial {
MaterialParser.blur_passthrough = false;
}
if (node.type == "DIRECT_WARP") {
if (Context.nodePreviewsWrap == null) {
Context.nodePreviewsWrap = new Map();
if (Context.nodePreviewsWarp == null) {
Context.nodePreviewsWarp = new Map();
}
// Crate render target for the original image
var wimage = kha.Image.createRenderTarget(Std.int(Config.getTextureResX() / 4), Std.int(Config.getTextureResY() / 4));
Context.nodePreviewsWrap.set(MaterialParser.node_name(node), wimage);
var image = kha.Image.createRenderTarget(Std.int(Config.getTextureResX()), Std.int(Config.getTextureResY()));
Context.nodePreviewsWarp.set(MaterialParser.node_name(node), image);
MaterialParser.warp_passthrough = true;
RenderUtil.makeNodePreview(UINodes.inst.getCanvasMaterial(), node, wimage);
RenderUtil.makeNodePreview(UINodes.inst.getCanvasMaterial(), node, image);
MaterialParser.warp_passthrough = false;
}
}
Sources/arm/render/Uniforms.hx
+1 -1
View File
@@ -465,7 +465,7 @@ class Uniforms {
// Warp uniforms
if (link.startsWith("_texwarp_")) {
var id = link.substr(9);
return Context.nodePreviewsWrap != null ? Context.nodePreviewsWrap.get(id) : RenderPath.active.renderTargets.get("empty_black").image;
return Context.nodePreviewsWarp != null ? Context.nodePreviewsWarp.get(id) : RenderPath.active.renderTargets.get("empty_black").image;
}
#end