From ddd016f657ed116cec824365fd489cc4c9e4043d Mon Sep 17 00:00:00 2001 From: luboslenco Date: Sun, 12 Jan 2025 15:57:03 +0100 Subject: [PATCH] Cleanup --- armorlab/sources/layers_ext.ts | 18 +++++++++--------- armorlab/sources/ui_nodes_ext.ts | 12 ++++++------ base/sources/export_texture.ts | 8 ++++---- base/sources/layers.ts | 4 ++-- base/sources/tab_meshes.ts | 2 +- base/sources/uniforms_ext.ts | 8 ++++---- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/armorlab/sources/layers_ext.ts b/armorlab/sources/layers_ext.ts index 863b0675..f89172a2 100644 --- a/armorlab/sources/layers_ext.ts +++ b/armorlab/sources/layers_ext.ts @@ -1,8 +1,8 @@ function layers_ext_flatten(height_to_normal: bool = false, layers: slot_layer_t[] = null): slot_layer_t { - let texpaint: image_t = brush_output_node_inst.texpaint; - let texpaint_nor: image_t = brush_output_node_inst.texpaint_nor; - let texpaint_pack: image_t = brush_output_node_inst.texpaint_pack; + let texpaint: image_t = context_raw.brush_output_node_inst.texpaint; + let texpaint_nor: image_t = context_raw.brush_output_node_inst.texpaint_nor; + let texpaint_pack: image_t = context_raw.brush_output_node_inst.texpaint_pack; let nodes: ui_nodes_t = ui_nodes_get_nodes(); let canvas: ui_node_canvas_t = ui_nodes_get_canvas(true); @@ -23,17 +23,17 @@ function layers_ext_flatten(height_to_normal: bool = false, layers: slot_layer_t } function layers_ext_on_resized() { - image_unload(brush_output_node_inst.texpaint); + image_unload(context_raw.brush_output_node_inst.texpaint); let texpaint_rt: render_target_t = map_get(render_path_render_targets, "texpaint"); - brush_output_node_inst.texpaint = texpaint_rt._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y()); + context_raw.brush_output_node_inst.texpaint = texpaint_rt._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y()); - image_unload(brush_output_node_inst.texpaint_nor); + image_unload(context_raw.brush_output_node_inst.texpaint_nor); let texpaint_nor_rt: render_target_t = map_get(render_path_render_targets, "texpaint_nor"); - brush_output_node_inst.texpaint_nor = texpaint_nor_rt._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y()); + context_raw.brush_output_node_inst.texpaint_nor = texpaint_nor_rt._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y()); - image_unload(brush_output_node_inst.texpaint_pack); + image_unload(context_raw.brush_output_node_inst.texpaint_pack); let texpaint_pack_rt: render_target_t = map_get(render_path_render_targets, "texpaint_pack"); - brush_output_node_inst.texpaint_pack = texpaint_pack_rt._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y()); + context_raw.brush_output_node_inst.texpaint_pack = texpaint_pack_rt._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y()); if (inpaint_node_image != null) { image_unload(inpaint_node_image); diff --git a/armorlab/sources/ui_nodes_ext.ts b/armorlab/sources/ui_nodes_ext.ts index 91ad765f..3d0b7522 100644 --- a/armorlab/sources/ui_nodes_ext.ts +++ b/armorlab/sources/ui_nodes_ext.ts @@ -17,11 +17,11 @@ function ui_nodes_ext_draw_buttons(ew: f32, start_y: f32) { parser_logic_parse(project_canvas); photo_to_pbr_node_cached_source = null; - let texbase: image_t = logic_node_get_as_image(brush_output_node_inst.base, channel_type_t.BASE_COLOR); - let texocc: image_t = logic_node_get_as_image(brush_output_node_inst.base, channel_type_t.OCCLUSION); - let texrough: image_t = logic_node_get_as_image(brush_output_node_inst.base, channel_type_t.ROUGHNESS); - let texnor: image_t = logic_node_get_as_image(brush_output_node_inst.base, channel_type_t.NORMAL_MAP); - let texheight: image_t = logic_node_get_as_image(brush_output_node_inst.base, channel_type_t.HEIGHT); + let texbase: image_t = logic_node_get_as_image(context_raw.brush_output_node_inst.base, channel_type_t.BASE_COLOR); + let texocc: image_t = logic_node_get_as_image(context_raw.brush_output_node_inst.base, channel_type_t.OCCLUSION); + let texrough: image_t = logic_node_get_as_image(context_raw.brush_output_node_inst.base, channel_type_t.ROUGHNESS); + let texnor: image_t = logic_node_get_as_image(context_raw.brush_output_node_inst.base, channel_type_t.NORMAL_MAP); + let texheight: image_t = logic_node_get_as_image(context_raw.brush_output_node_inst.base, channel_type_t.HEIGHT); if (texbase != null) { let texpaint: render_target_t = map_get(render_path_render_targets, "texpaint"); @@ -64,7 +64,7 @@ function ui_nodes_ext_draw_buttons(ew: f32, start_y: f32) { g4_draw(); g4_end(); - let is_float_node: bool = brush_output_node_inst.base.inputs[channel_type_t.HEIGHT].node.base.get == float_node_get; + let is_float_node: bool = context_raw.brush_output_node_inst.base.inputs[channel_type_t.HEIGHT].node.base.get == float_node_get; if (ui_header_worktab.position == space_type_t.SPACE3D && !is_float_node) { diff --git a/base/sources/export_texture.ts b/base/sources/export_texture.ts index 06b50940..87acb3ef 100644 --- a/base/sources/export_texture.ts +++ b/base/sources/export_texture.ts @@ -97,7 +97,7 @@ function export_texture_run(path: string, bake_material: bool = false) { ///end ///if is_lab - let layers: slot_layer_t[] = [brush_output_node_inst]; + let layers: slot_layer_t[] = [context_raw.brush_output_node_inst]; export_texture_run_layers(path, layers); ///end @@ -317,9 +317,9 @@ function export_texture_run_layers(path: string, layers: slot_layer_t[], object_ let texpaint_pack: image_t = layers_expc; ///if is_lab - texpaint = brush_output_node_inst.texpaint; - texpaint_nor = brush_output_node_inst.texpaint_nor; - texpaint_pack = brush_output_node_inst.texpaint_pack; + texpaint = context_raw.brush_output_node_inst.texpaint; + texpaint_nor = context_raw.brush_output_node_inst.texpaint_nor; + texpaint_pack = context_raw.brush_output_node_inst.texpaint_pack; ///end let pixpaint: buffer_t = null; diff --git a/base/sources/layers.ts b/base/sources/layers.ts index 627ceaa7..c17871bd 100644 --- a/base/sources/layers.ts +++ b/base/sources/layers.ts @@ -131,7 +131,7 @@ function layers_make_temp_img() { let l: slot_layer_t = project_layers[0]; ///end ///if is_lab - let l: brush_output_node_t = brush_output_node_inst; + let l: brush_output_node_t = context_raw.brush_output_node_inst; ///end if (layers_temp_image != null && (layers_temp_image.width != l.texpaint.width || layers_temp_image.height != l.texpaint.height || layers_temp_image.format != l.texpaint.format)) { @@ -178,7 +178,7 @@ function layers_make_export_img() { let l: slot_layer_t = project_layers[0]; ///end ///if is_lab - let l: brush_output_node_t = brush_output_node_inst; + let l: brush_output_node_t = context_raw.brush_output_node_inst; ///end if (layers_expa != null && (layers_expa.width != l.texpaint.width || layers_expa.height != l.texpaint.height || layers_expa.format != l.texpaint.format)) { diff --git a/base/sources/tab_meshes.ts b/base/sources/tab_meshes.ts index 75bfe356..e7a2c5d8 100644 --- a/base/sources/tab_meshes.ts +++ b/base/sources/tab_meshes.ts @@ -89,7 +89,7 @@ function tab_meshes_draw(htab: ui_handle_t) { ///if is_lab let displace_strength: f32 = config_raw.displace_strength > 0 ? config_raw.displace_strength : 1.0; let uv_scale: f32 = scene_meshes[0].data.scale_tex * context_raw.brush_scale; - util_mesh_apply_displacement(brush_output_node_inst.texpaint_pack, 0.05 * displace_strength, uv_scale); + util_mesh_apply_displacement(context_raw.brush_output_node_inst.texpaint_pack, 0.05 * displace_strength, uv_scale); ///end util_mesh_calc_normals(); diff --git a/base/sources/uniforms_ext.ts b/base/sources/uniforms_ext.ts index e3f6a8ab..62168338 100644 --- a/base/sources/uniforms_ext.ts +++ b/base/sources/uniforms_ext.ts @@ -403,7 +403,7 @@ function uniforms_ext_tex_link(object: object_t, mat: material_data_t, link: str ///end ///if is_lab - return brush_output_node_inst.texpaint; + return context_raw.brush_output_node_inst.texpaint; ///end } if (starts_with(link, "_texpaint_nor")) { @@ -413,7 +413,7 @@ function uniforms_ext_tex_link(object: object_t, mat: material_data_t, link: str ///end ///if is_lab - return brush_output_node_inst.texpaint_nor; + return context_raw.brush_output_node_inst.texpaint_nor; ///end } if (starts_with(link, "_texpaint_pack")) { @@ -423,7 +423,7 @@ function uniforms_ext_tex_link(object: object_t, mat: material_data_t, link: str ///end ///if is_lab - return brush_output_node_inst.texpaint_pack; + return context_raw.brush_output_node_inst.texpaint_pack; ///end } if (starts_with(link, "_texpaint")) { @@ -433,7 +433,7 @@ function uniforms_ext_tex_link(object: object_t, mat: material_data_t, link: str ///end ///if is_lab - return brush_output_node_inst.texpaint; + return context_raw.brush_output_node_inst.texpaint; ///end } if (starts_with(link, "_texblur_")) {