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

Fix layer node

Browse Source
This commit is contained in:
luboslenco
2025-09-15 18:26:18 +02:00
parent da9776537b
commit 9cd3b1cdc3
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paint/sources/node_shader.ts
-1
View File
@@ -90,7 +90,6 @@ function node_shader_add_constant(raw: node_shader_t, s: string, link: string =
} }
function node_shader_add_texture(raw: node_shader_t, name: string, link: string = null) { function node_shader_add_texture(raw: node_shader_t, name: string, link: string = null) {
// mytex: tex2d
if (array_index_of(raw.textures, name) == -1) { if (array_index_of(raw.textures, name) == -1) {
array_push(raw.textures, name); array_push(raw.textures, name);
node_shader_context_add_texture_unit(raw.context, name, link); node_shader_context_add_texture_unit(raw.context, name, link);
paint/sources/parser_material.ts
+4 -4
View File
@@ -889,7 +889,7 @@ function parser_material_parse_vector(node: ui_node_t, socket: ui_node_socket_t)
return "vvec_cam"; return "vvec_cam";
} }
else if (node.type == "LAYER") { else if (node.type == "LAYER") {
let l: any = node.buttons[0].default_value; let l: i32 = node.buttons[0].default_value[0];
if (socket == node.outputs[0]) { // Base if (socket == node.outputs[0]) { // Base
node_shader_add_texture(parser_material_kong, "texpaint" + l, "_texpaint" + l); node_shader_add_texture(parser_material_kong, "texpaint" + l, "_texpaint" + l);
return "sample(texpaint" + l + ", sampler_linear, tex_coord).rgb"; return "sample(texpaint" + l + ", sampler_linear, tex_coord).rgb";
@@ -1275,7 +1275,7 @@ function parser_material_parse_value(node: ui_node_t, socket: ui_node_socket_t):
} }
else if (node.type == "WIREFRAME") { else if (node.type == "WIREFRAME") {
node_shader_add_texture(parser_material_kong, "texuvmap", "_texuvmap"); node_shader_add_texture(parser_material_kong, "texuvmap", "_texuvmap");
// let use_pixel_size: bool = node.buttons[0].default_value == "true"; // let use_pixel_size: bool = node.buttons[0].default_value[0] > 0.0;
// let pixel_size: f32 = parse_value_input(node.inputs[0]); // let pixel_size: f32 = parse_value_input(node.inputs[0]);
return "sample_lod(texuvmap, sampler_linear, tex_coord, 0.0).r"; return "sample_lod(texuvmap, sampler_linear, tex_coord, 0.0).r";
} }
@@ -1292,7 +1292,7 @@ function parser_material_parse_value(node: ui_node_t, socket: ui_node_socket_t):
} }
} }
else if (node.type == "LAYER") { else if (node.type == "LAYER") {
let l: any = node.buttons[0].default_value; let l: i32 = node.buttons[0].default_value[0];
if (socket == node.outputs[1]) { // Opac if (socket == node.outputs[1]) { // Opac
node_shader_add_texture(parser_material_kong, "texpaint" + l, "_texpaint" + l); node_shader_add_texture(parser_material_kong, "texpaint" + l, "_texpaint" + l);
return "sample(texpaint" + l + ", sampler_linear, tex_coord).a"; return "sample(texpaint" + l + ", sampler_linear, tex_coord).a";
@@ -1316,7 +1316,7 @@ function parser_material_parse_value(node: ui_node_t, socket: ui_node_socket_t):
} }
else if (node.type == "LAYER_MASK") { else if (node.type == "LAYER_MASK") {
if (socket == node.outputs[0]) { if (socket == node.outputs[0]) {
let l: any = node.buttons[0].default_value; let l: i32 = node.buttons[0].default_value[0];
node_shader_add_texture(parser_material_kong, "texpaint" + l, "_texpaint" + l); node_shader_add_texture(parser_material_kong, "texpaint" + l, "_texpaint" + l);
return "sample(texpaint" + l + ", sampler_linear, tex_coord).r"; return "sample(texpaint" + l + ", sampler_linear, tex_coord).r";
} }