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
2024-11-10 16:53:36 +01:00
parent fea777aed2
commit fcb5c90356
36 changed files with 1377 additions and 1413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/sources/export_texture.ts
+27 -27
View File
@@ -175,8 +175,8 @@ function export_texture_run_layers(path: string, layers: slot_layer_t[], object_
ext = object_name + ext;
}
base_make_temp_img();
base_make_export_img();
layers_make_temp_img();
layers_make_export_img();
let rt: render_target_t = map_get(render_path_render_targets, "empty_white");
let empty: image_t = rt._image;
@@ -190,13 +190,13 @@ function export_texture_run_layers(path: string, layers: slot_layer_t[], object_
}
// Clear export layer
g4_begin(base_expa);
g4_begin(layers_expa);
g4_clear(color_from_floats(0.0, 0.0, 0.0, 0.0));
g4_end();
g4_begin(base_expb);
g4_begin(layers_expb);
g4_clear(color_from_floats(0.5, 0.5, 1.0, 0.0));
g4_end();
g4_begin(base_expc);
g4_begin(layers_expc);
g4_clear(color_from_floats(1.0, 0.0, 0.0, 0.0));
g4_end();
@@ -224,7 +224,7 @@ function export_texture_run_layers(path: string, layers: slot_layer_t[], object_
let l1masks: slot_layer_t[] = slot_layer_get_masks(l1);
if (l1masks != null && !bake_material) {
if (l1masks.length > 1) {
base_make_temp_mask_img();
layers_make_temp_mask_img();
g2_begin(pipes_temp_mask_image);
g2_clear(0x00000000);
g2_end();
@@ -232,7 +232,7 @@ function export_texture_run_layers(path: string, layers: slot_layer_t[], object_
texpaint: pipes_temp_mask_image
};
for (let i: i32 = 0; i < l1masks.length; ++i) {
base_merge_layer(l1, l1masks[i]);
layers_merge_layer(l1, l1masks[i]);
}
mask = pipes_temp_mask_image;
}
@@ -242,18 +242,18 @@ function export_texture_run_layers(path: string, layers: slot_layer_t[], object_
}
if (l1.paint_base) {
g2_begin(base_temp_image); // Copy to temp
g2_begin(layers_temp_image); // Copy to temp
g2_set_pipeline(pipes_copy);
g2_draw_image(base_expa, 0, 0);
g2_draw_image(layers_expa, 0, 0);
g2_set_pipeline(null);
g2_end();
g4_begin(base_expa);
g4_begin(layers_expa);
g4_set_pipeline(pipes_merge);
g4_set_tex(pipes_tex0, l1.texpaint);
g4_set_tex(pipes_tex1, empty);
g4_set_tex(pipes_texmask, mask);
g4_set_tex(pipes_texa, base_temp_image);
g4_set_tex(pipes_texa, layers_temp_image);
g4_set_float(pipes_opac, slot_layer_get_opacity(l1));
g4_set_int(pipes_blending, layers.length > 1 ? l1.blending : 0);
g4_set_vertex_buffer(const_data_screen_aligned_vb);
@@ -263,18 +263,18 @@ function export_texture_run_layers(path: string, layers: slot_layer_t[], object_
}
if (l1.paint_nor) {
g2_begin(base_temp_image);
g2_begin(layers_temp_image);
g2_set_pipeline(pipes_copy);
g2_draw_image(base_expb, 0, 0);
g2_draw_image(layers_expb, 0, 0);
g2_set_pipeline(null);
g2_end();
g4_begin(base_expb);
g4_begin(layers_expb);
g4_set_pipeline(pipes_merge);
g4_set_tex(pipes_tex0, l1.texpaint);
g4_set_tex(pipes_tex1, l1.texpaint_nor);
g4_set_tex(pipes_texmask, mask);
g4_set_tex(pipes_texa, base_temp_image);
g4_set_tex(pipes_texa, layers_temp_image);
g4_set_float(pipes_opac, slot_layer_get_opacity(l1));
g4_set_int(pipes_blending, l1.paint_nor_blend ? -2 : -1);
g4_set_vertex_buffer(const_data_screen_aligned_vb);
@@ -284,37 +284,37 @@ function export_texture_run_layers(path: string, layers: slot_layer_t[], object_
}
if (l1.paint_occ || l1.paint_rough || l1.paint_met || l1.paint_height) {
g2_begin(base_temp_image);
g2_begin(layers_temp_image);
g2_set_pipeline(pipes_copy);
g2_draw_image(base_expc, 0, 0);
g2_draw_image(layers_expc, 0, 0);
g2_set_pipeline(null);
g2_end();
if (l1.paint_occ && l1.paint_rough && l1.paint_met && l1.paint_height) {
base_commands_merge_pack(pipes_merge, base_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask, l1.paint_height_blend ? -3 : -1);
layers_commands_merge_pack(pipes_merge, layers_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask, l1.paint_height_blend ? -3 : -1);
}
else {
if (l1.paint_occ) base_commands_merge_pack(pipes_merge_r, base_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask);
if (l1.paint_rough) base_commands_merge_pack(pipes_merge_g, base_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask);
if (l1.paint_met) base_commands_merge_pack(pipes_merge_b, base_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask);
if (l1.paint_occ) layers_commands_merge_pack(pipes_merge_r, layers_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask);
if (l1.paint_rough) layers_commands_merge_pack(pipes_merge_g, layers_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask);
if (l1.paint_met) layers_commands_merge_pack(pipes_merge_b, layers_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask);
}
}
}
///if arm_metal
// Flush command list
g2_begin(base_expa);
g2_begin(layers_expa);
g2_end();
g2_begin(base_expb);
g2_begin(layers_expb);
g2_end();
g2_begin(base_expc);
g2_begin(layers_expc);
g2_end();
///end
///end
let texpaint: image_t = base_expa;
let texpaint_nor: image_t = base_expb;
let texpaint_pack: image_t = base_expc;
let texpaint: image_t = layers_expa;
let texpaint_nor: image_t = layers_expb;
let texpaint_pack: image_t = layers_expc;
///if is_lab
texpaint = brush_output_node_inst.texpaint;