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

Merge minits

Browse Source
This commit is contained in:
luboslenco
2024-05-03 21:29:39 +02:00
parent 39bd1cdfe0
commit d2eb902125
87 changed files with 2524 additions and 1786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
armorsculpt/Sources/export_obj.ts
+6 -6
View File
@@ -35,7 +35,7 @@ function export_obj_run(path: string, paint_objects: mesh_object_t[], apply_disp
// Merge shared vertices and remap indices
let posa2: i16_array_t = i16_array_create(len * 3);
let posmap: map_t<i32, i32> = map_create();
let posmap: i32_array_t = i32_array_create(len);
let pi = 0;
for (let i: i32 = 0; i < len; ++i) {
@@ -44,13 +44,13 @@ function export_obj_run(path: string, paint_objects: mesh_object_t[], apply_disp
if (posa2[j * 3 ] == posa[i * 4 ] &&
posa2[j * 3 + 1] == posa[i * 4 + 1] &&
posa2[j * 3 + 2] == posa[i * 4 + 2]) {
map_set(posmap, i, j);
posmap[i] = j;
found = true;
break;
}
}
if (!found) {
map_set(posmap, i, pi);
posmap[i] = pi;
posa2[pi * 3 ] = posa[i * 4 ];
posa2[pi * 3 + 1] = posa[i * 4 + 1];
posa2[pi * 3 + 2] = posa[i * 4 + 2];
@@ -74,9 +74,9 @@ function export_obj_run(path: string, paint_objects: mesh_object_t[], apply_disp
// let inda = mesh.index_arrays[0].values;
for (let i: i32 = 0; i < math_floor(inda.length / 3); ++i) {
let pi1 = map_get(posmap, inda[i * 3 ]) + 1 + poff;
let pi2 = map_get(posmap, inda[i * 3 + 1]) + 1 + poff;
let pi3 = map_get(posmap, inda[i * 3 + 2]) + 1 + poff;
let pi1 = posmap[inda[i * 3 ]] + 1 + poff;
let pi2 = posmap[inda[i * 3 + 1]] + 1 + poff;
let pi3 = posmap[inda[i * 3 + 2]] + 1 + poff;
export_obj_write_string(o, "f ");
export_obj_write_string(o, pi1 + "");
export_obj_write_string(o, " ");
armorsculpt/Sources/tab_layers.ts
+4 -4
View File
@@ -237,7 +237,7 @@ function tab_layers_draw_layer_slot_full(l: slot_layer_t, i: i32) {
col -= 0x99000000;
}
if (zui_image(icons, col, -1.0, r.x, r.y, r.w, r.h) == zui_state_t.RELEASED) {
if (_zui_image(icons, col, -1.0, r.x, r.y, r.w, r.h) == zui_state_t.RELEASED) {
tab_layers_layer_toggle_visible(l);
}
ui._x -= 2;
@@ -252,12 +252,12 @@ function tab_layers_draw_layer_slot_full(l: slot_layer_t, i: i32) {
if (tab_layers_layer_name_edit == l.id) {
tab_layers_layer_name_handle.text = l.name;
l.name = zui_text_input(tab_layers_layer_name_handle);
if (ui.text_selected_handle_ptr != tab_layers_layer_name_handle.ptr) {
if (ui.text_selected_handle != tab_layers_layer_name_handle) {
tab_layers_layer_name_edit = -1;
}
}
else {
if (ui.enabled && ui.input_enabled && ui.combo_selected_handle_ptr == 0 &&
if (ui.enabled && ui.input_enabled && ui.combo_selected_handle == 0 &&
ui.input_x > ui._window_x + ui._x && ui.input_x < ui._window_x + ui._window_w &&
ui.input_y > ui._window_y + ui._y - center && ui.input_y < ui._window_y + ui._y - center + (step * zui_SCALE(ui)) * 2) {
if (ui.input_started) {
@@ -412,7 +412,7 @@ function tab_layers_draw_layer_context_menu(l: slot_layer_t, mini: bool) {
}
function tab_layers_can_drop_new_layer(position: i32) {
function tab_layers_can_drop_new_layer(position: i32): bool {
if (position > 0 && position < project_layers.length && slot_layer_is_mask(project_layers[position - 1])) {
// 1. The layer to insert is inserted in the middle
// 2. The layer below is a mask, i.e. the layer would have to be a (group) mask, too.