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

Update blend types

Browse Source
This commit is contained in:
luboslenco
2019-09-18 11:20:23 +02:00
parent 46e9dfec3d
commit e4f32f3d3c
2 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/nodes/Cycles.hx
+43 -34
View File
@@ -737,58 +737,67 @@ class Cycles {
if (blend == 'MIX') {
out_col = 'mix($col1, $col2, $fac_var)';
}
else if (blend == 'ADD') {
out_col = 'mix($col1, $col1 + $col2, $fac_var)';
//
else if (blend == 'DARKEN') {
out_col = 'min($col1, $col2 * $fac_var)';
}
else if (blend == 'MULTIPLY') {
out_col = 'mix($col1, $col1 * $col2, $fac_var)';
}
else if (blend == 'SUBTRACT') {
out_col = 'mix($col1, $col1 - $col2, $fac_var)';
}
else if (blend == 'SCREEN') {
out_col = '(vec3(1.0, 1.0, 1.0) - (' + to_vec3('1.0 - $fac_var') + ' + $fac_var * (vec3(1.0, 1.0, 1.0) - $col2)) * (vec3(1.0) - $col1))';
}
else if (blend == 'DIVIDE') {
out_col = '(' + to_vec3('(1.0 - $fac_var) * $col1 + $fac_var * $col1 / $col2') + ')';
}
else if (blend == 'DIFFERENCE') {
out_col = 'mix($col1, abs($col1 - $col2), $fac_var)';
}
else if (blend == 'DARKEN') {
out_col = 'min($col1, $col2 * $fac_var)';
else if (blend == 'BURN') {
out_col = 'mix($col1, vec3(1.0, 1.0, 1.0) - (vec3(1.0, 1.0, 1.0) - $col1) / $col2, $fac_var)';
}
//
else if (blend == 'LIGHTEN') {
out_col = 'max($col1, $col2 * $fac_var)';
}
else if (blend == 'OVERLAY') {
out_col = 'mix($col1, $col2, $fac_var)'; // TODO
else if (blend == 'SCREEN') {
out_col = '(vec3(1.0, 1.0, 1.0) - (' + to_vec3('1.0 - $fac_var') + ' + $fac_var * (vec3(1.0, 1.0, 1.0) - $col2)) * (vec3(1.0, 1.0, 1.0) - $col1))';
}
else if (blend == 'DODGE') {
out_col = 'mix($col1, $col2, $fac_var)'; // TODO
out_col = 'mix($col1, $col1 / (vec3(1.0, 1.0, 1.0) - $col2), $fac_var)';
}
else if (blend == 'BURN') {
out_col = 'mix($col1, $col2, $fac_var)'; // TODO
else if (blend == 'ADD') {
out_col = 'mix($col1, $col1 + $col2, $fac_var)';
}
else if (blend == 'HUE') {
out_col = 'mix($col1, $col2, $fac_var)'; // TODO
}
else if (blend == 'SATURATION') {
out_col = 'mix($col1, $col2, $fac_var)'; // TODO
}
else if (blend == 'VALUE') {
out_col = 'mix($col1, $col2, $fac_var)'; // TODO
}
else if (blend == 'COLOR') {
out_col = 'mix($col1, $col2, $fac_var)'; // TODO
//
else if (blend == 'OVERLAY') {
out_col = '($col1 < vec3(0.5, 0.5, 0.5) ? vec3(2.0, 2.0, 2.0) * $col1 * $col2 : vec3(1.0, 1.0, 1.0) - vec3(2.0, 2.0, 2.0) * (vec3(1.0, 1.0, 1.0) - $col2) * (vec3(1.0, 1.0, 1.0) - $col1))';
}
else if (blend == 'SOFT_LIGHT') {
out_col = '((1.0 - $fac_var) * $col1 + $fac_var * ((vec3(1.0, 1.0, 1.0) - $col1) * $col2 * $col1 + $col1 * (vec3(1.0, 1.0, 1.0) - (vec3(1.0, 1.0, 1.0) - $col2) * (vec3(1.0, 1.0, 1.0) - $col1))));';
}
else if (blend == 'LINEAR_LIGHT') {
out_col = 'mix($col1, $col2, $fac_var)'; // TODO
// out_col = '($col1 + $fac_var * (2.0 * ($col2 - vec3(0.5, 0.5, 0.5))))'.format(col1, col2, fac_var)
out_col = '($col1 + $fac_var * (vec3(2.0, 2.0, 2.0) * ($col2 - vec3(0.5, 0.5, 0.5))))';
}
//
else if (blend == 'DIFFERENCE') {
out_col = 'mix($col1, abs($col1 - $col2), $fac_var)';
}
else if (blend == 'SUBTRACT') {
out_col = 'mix($col1, $col1 - $col2, $fac_var)';
}
else if (blend == 'DIVIDE') {
out_col = '(' + to_vec3('(1.0 - $fac_var) * $col1 + $fac_var * $col1 / $col2') + ')';
}
//
else if (blend == 'HUE') {
curshader.add_function(CyclesFunctions.str_hue_sat);
out_col = 'mix($col1, hsv_to_rgb(vec3(rgb_to_hsv($col2).r, rgb_to_hsv($col1).g, rgb_to_hsv($col1).b)), $fac_var)';
}
else if (blend == 'SATURATION') {
curshader.add_function(CyclesFunctions.str_hue_sat);
out_col = 'mix($col1, hsv_to_rgb(vec3(rgb_to_hsv($col1).r, rgb_to_hsv($col2).g, rgb_to_hsv($col1).b)), $fac_var)';
}
else if (blend == 'COLOR') {
curshader.add_function(CyclesFunctions.str_hue_sat);
out_col = 'mix($col1, hsv_to_rgb(vec3(rgb_to_hsv($col2).r, rgb_to_hsv($col2).g, rgb_to_hsv($col1).b)), $fac_var)';
}
else if (blend == 'VALUE') {
curshader.add_function(CyclesFunctions.str_hue_sat);
out_col = 'mix($col1, hsv_to_rgb(vec3(rgb_to_hsv($col1).r, rgb_to_hsv($col1).g, rgb_to_hsv($col2).b)), $fac_var)';
}
//
if (use_clamp) return 'clamp($out_col, vec3(0.0, 0.0, 0.0), vec3(1.0, 1.0, 1.0))';
else return out_col;
}
Sources/arm/nodes/NodesMaterial.hx
+1 -1
View File
@@ -1241,7 +1241,7 @@ class NodesMaterial {
{
name: "blend_type",
type: "ENUM",
data: ["Mix", "Add", "Multiply", "Subtract", "Screen", "Divide", "Difference", "Darken", "Lighten", "Overlay", "Dodge", "Burn", "Hue", "Saturation", "Value", "Color", "Soft Light", "Linear Light"],
data: ["Mix", "Darken", "Multiply", "Burn", "Lighten", "Screen", "Dodge", "Add", "Overlay", "Soft Light", "Linear Light", "Difference", "Subtract", "Divide", "Hue", "Saturation", "Color", "Value"],
default_value: 0,
output: 0
},