diff --git a/paint/sources/node_shader.ts b/paint/sources/node_shader.ts index 792b11fd..1fa590c5 100644 --- a/paint/sources/node_shader.ts +++ b/paint/sources/node_shader.ts @@ -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) { - // mytex: tex2d if (array_index_of(raw.textures, name) == -1) { array_push(raw.textures, name); node_shader_context_add_texture_unit(raw.context, name, link); diff --git a/paint/sources/parser_material.ts b/paint/sources/parser_material.ts index 81906a36..910ca615 100644 --- a/paint/sources/parser_material.ts +++ b/paint/sources/parser_material.ts @@ -889,7 +889,7 @@ function parser_material_parse_vector(node: ui_node_t, socket: ui_node_socket_t) return "vvec_cam"; } 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 node_shader_add_texture(parser_material_kong, "texpaint" + l, "_texpaint" + l); 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") { 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]); 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") { - let l: any = node.buttons[0].default_value; + let l: i32 = node.buttons[0].default_value[0]; if (socket == node.outputs[1]) { // Opac node_shader_add_texture(parser_material_kong, "texpaint" + l, "_texpaint" + l); 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") { 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); return "sample(texpaint" + l + ", sampler_linear, tex_coord).r"; }