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

paint: append from .arm

Browse Source
This commit is contained in:
luboslenco
2026-08-24 09:35:30 +02:00
parent 9dd01cfcf2
commit afb00dc33a
5 changed files with 265 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paint/sources/functions.h
+3
View File
@@ -120,6 +120,7 @@ bool config_is_iphone();
bool config_is_raytrace_fast();
bool config_is_raytrace_multi();
void config_apply_raytrace_multi();
void box_append_show(char *path);
void box_export_show_textures();
void box_export_show_bake_material();
void box_export_show_mesh();
@@ -389,6 +390,8 @@ void logic_node_input_set(logic_node_input_t *self, f32_arr
void import_arm_run_project(char *path);
void import_arm_run_material(char *path);
void import_arm_run_mesh_append(char *path);
project_t *import_arm_decode_project(buffer_t *b);
void import_arm_append(project_t *project, char *path, i32_array_t *mesh_selected, i32_array_t *material_selected);
void import_arm_run_brush(char *path);
void import_arm_run_brush_from_project(project_t *project, char *path);
void import_arm_run_swatches(char *path, bool replace_existing);
paint/sources/io/import_arm.c
+112 -19
View File
@@ -82,7 +82,7 @@ void import_arm_run_mesh(project_t *raw) {
history_reset();
}
static project_t *import_arm_decode_project(buffer_t *b) {
project_t *import_arm_decode_project(buffer_t *b) {
if (!import_arm_has_version(b)) { // Mesh only
scene_t *scene = armpack_decode(b);
return ALLOC_INIT(project_t, {.mesh_datas = scene->mesh_datas});
@@ -93,18 +93,43 @@ static project_t *import_arm_decode_project(buffer_t *b) {
return armpack_decode(b);
}
void import_arm_run_mesh_append(char *path) {
buffer_t *b = data_get_blob(path);
project_t *project = import_arm_decode_project(b);
static bool import_arm_is_selected(i32_array_t *selected, i32 i) {
return selected == NULL || (i < selected->length && selected->buffer[i] != 0);
}
static bool import_arm_has_selected(i32_array_t *selected) {
if (selected == NULL) {
return true;
}
for (i32 i = 0; i < selected->length; ++i) {
if (selected->buffer[i] != 0) {
return true;
}
}
return false;
}
static i32 import_arm_mesh_material_index(project_t *project, i32 mesh_i) {
if (project->mesh_materials == NULL || mesh_i < 0 || mesh_i >= project->mesh_materials->length) {
return -1;
}
return project->mesh_materials->buffer[mesh_i];
}
static void import_arm_run_mesh_append_from_project(project_t *project, i32_array_t *selected, i32_array_t *src_to_dest_mat) {
if (project->mesh_datas == NULL || project->mesh_datas->length == 0) {
data_delete_blob(path);
return;
}
string_array_t *mesh_names = string_array_create(0);
mesh_data_t_array_t *mesh_datas = import_arm_get_mesh_datas(project, mesh_names);
i32 appended = 0;
bool assigned = false;
for (i32 i = 0; i < mesh_datas->length; ++i) {
if (!import_arm_is_selected(selected, i)) {
continue;
}
mesh_data_t *md = mesh_datas->buffer[i];
mesh_object_t *object = scene_add_mesh_object(md, g_context->paint_object->material, NULL);
object->skip_context = "paint";
@@ -117,6 +142,26 @@ void import_arm_run_mesh_append(char *path) {
any_array_push(g_project->_->paint_objects, object);
tab_stages_add_object(object->base->name);
appended++;
if (src_to_dest_mat != NULL) {
i32 src_mat = import_arm_mesh_material_index(project, i);
if (src_mat >= 0 && src_mat < src_to_dest_mat->length) {
i32 dest_mat = src_to_dest_mat->buffer[src_mat];
if (dest_mat >= 0) {
tab_meshes_set_override(object, dest_mat);
assigned = true;
}
}
}
}
if (appended == 0) {
return;
}
if (assigned) {
g_project->mesh_materials = i32_array_create(0);
}
if (g_project->_->paint_objects->length > 1) {
@@ -135,6 +180,12 @@ void import_arm_run_mesh_append(char *path) {
util_uv_dilatemap_cached = false;
g_context->ddirty = 4;
ui_base_hwnds->buffer[TAB_AREA_SIDEBAR0]->redraws = 2;
}
void import_arm_run_mesh_append(char *path) {
buffer_t *b = data_get_blob(path);
project_t *project = import_arm_decode_project(b);
import_arm_run_mesh_append_from_project(project, NULL, NULL);
data_delete_blob(path);
}
@@ -250,25 +301,34 @@ void import_arm_unpack_asset(project_t *project, char *abs, char *file, bool cop
}
}
void import_arm_run_material_from_project(project_t *project, char *path) {
static void import_arm_import_materials(project_t *project, char *path, i32_array_t *selected, bool delete_blob) {
if (project->material_nodes == NULL || project->material_nodes->length == 0) {
if (delete_blob) {
data_delete_blob(path);
}
return;
}
char *base = path_base_dir(path);
for (i32 i = 0; i < project->assets->length; ++i) {
char *file = project->assets->buffer[i];
if (project->assets != NULL) {
for (i32 i = 0; i < project->assets->length; ++i) {
char *file = project->assets->buffer[i];
#ifdef IRON_WINDOWS
file = string_copy(string_replace_all(file, "/", "\\"));
file = string_copy(string_replace_all(file, "/", "\\"));
#else
file = string_copy(string_replace_all(file, "\\", "/"));
file = string_copy(string_replace_all(file, "\\", "/"));
#endif
// Convert image path from relative to absolute
char *abs = data_is_abs(file) ? file : string("%s%s", base, file);
if (project->packed_assets != NULL) {
abs = string_copy(path_normalize(abs));
import_arm_unpack_asset(project, abs, file, true);
// Convert image path from relative to absolute
char *abs = data_is_abs(file) ? file : string("%s%s", base, file);
if (project->packed_assets != NULL) {
abs = string_copy(path_normalize(abs));
import_arm_unpack_asset(project, abs, file, true);
}
if (any_map_get(data_cached_textures, abs) == NULL && !iron_file_exists(abs)) {
import_arm_make_pink(abs);
}
import_texture_run(abs, true);
}
if (any_map_get(data_cached_textures, abs) == NULL && !iron_file_exists(abs)) {
import_arm_make_pink(abs);
}
import_texture_run(abs, true);
}
shader_data_t *m0 = data_get_shader("Scene", "Material");
@@ -276,6 +336,9 @@ void import_arm_run_material_from_project(project_t *project, char *path) {
slot_material_t_array_t *imported = any_array_create_from_raw((void *[]){}, 0);
for (i32 i = 0; i < project->material_nodes->length; ++i) {
if (!import_arm_is_selected(selected, i)) {
continue;
}
ui_node_canvas_t *c = util_clone_canvas(project->material_nodes->buffer[i]); // Project data is temporary
import_arm_init_nodes(c->nodes);
g_context->material = slot_material_create(m0, c);
@@ -302,6 +365,36 @@ void import_arm_run_material_from_project(project_t *project, char *path) {
sys_notify_on_next_frame(&import_arm_run_material_from_project_on_next_frame, imported);
ui_nodes_group_stack = any_array_create_from_raw((void *[]){}, 0);
ui_base_hwnds->buffer[TAB_AREA_SIDEBAR1]->redraws = 2;
if (delete_blob) {
data_delete_blob(path);
}
}
void import_arm_run_material_from_project(project_t *project, char *path) {
import_arm_import_materials(project, path, NULL, true);
}
void import_arm_append(project_t *project, char *path, i32_array_t *mesh_selected, i32_array_t *material_selected) {
i32_array_t *src_to_dest_mat = NULL;
i32 mat_base = g_project->_->materials->length;
if (project->material_nodes != NULL && import_arm_has_selected(material_selected)) {
import_arm_import_materials(project, path, material_selected, false);
src_to_dest_mat = i32_array_create(project->material_nodes->length);
i32 dest = mat_base;
for (i32 i = 0; i < src_to_dest_mat->length; ++i) {
if (import_arm_is_selected(material_selected, i)) {
src_to_dest_mat->buffer[i] = dest++;
}
else {
src_to_dest_mat->buffer[i] = -1;
}
}
}
if (project->mesh_datas != NULL && import_arm_has_selected(mesh_selected)) {
import_arm_run_mesh_append_from_project(project, mesh_selected, src_to_dest_mat);
}
data_delete_blob(path);
}
paint/sources/main.c
+1
View File
@@ -145,6 +145,7 @@
#include "traits/trait_point_and_click_controller.c"
#include "traits/trait_third_person_controller.c"
#include "ui/box_append.c"
#include "ui/box_export.c"
#include "ui/box_import_mesh.c"
#include "ui/box_new_project.c"
paint/sources/ui/box_append.c
+145
View File
@@ -0,0 +1,145 @@
#include "../global.h"
char *box_append_path = NULL;
project_t *box_append_project = NULL;
i32_array_t *box_append_mesh_selected = NULL;
i32_array_t *box_append_material_selected = NULL;
static i32_array_t *box_append_zeros(i32 count) {
i32_array_t *a = i32_array_create(count);
for (i32 i = 0; i < count; ++i) {
a->buffer[i] = 0;
}
return a;
}
static bool box_append_has_selection() {
if (box_append_mesh_selected != NULL) {
for (i32 i = 0; i < box_append_mesh_selected->length; ++i) {
if (box_append_mesh_selected->buffer[i] != 0) {
return true;
}
}
}
if (box_append_material_selected != NULL) {
for (i32 i = 0; i < box_append_material_selected->length; ++i) {
if (box_append_material_selected->buffer[i] != 0) {
return true;
}
}
}
return false;
}
static i32 box_append_mesh_material_index(i32 mesh_i) {
if (box_append_project == NULL || box_append_project->mesh_materials == NULL) {
return -1;
}
if (mesh_i < 0 || mesh_i >= box_append_project->mesh_materials->length) {
return -1;
}
return box_append_project->mesh_materials->buffer[mesh_i];
}
static void box_append_select_mesh_material(i32 mesh_i) {
i32 mat_i = box_append_mesh_material_index(mesh_i);
if (mat_i < 0 || box_append_material_selected == NULL || mat_i >= box_append_material_selected->length) {
return;
}
box_append_material_selected->buffer[mat_i] = 1;
}
static char *box_append_mesh_name(mesh_data_t *raw, i32 i) {
if (raw == NULL || raw->name == NULL || string_equals(raw->name, "")) {
return string("%s %s", tr("Mesh"), i32_to_string(i + 1));
}
i32 source_index;
char *object_name;
if (util_mesh_link_parse(raw->name, &source_index, &object_name)) {
return object_name;
}
return raw->name;
}
static char *box_append_material_name(ui_node_canvas_t *c, i32 i) {
if (c == NULL || c->name == NULL || string_equals(c->name, "")) {
return string("%s %s", tr("Material"), i32_to_string(i + 1));
}
return c->name;
}
void box_append_on_hide() {
if (box_append_path != NULL) {
data_delete_blob(box_append_path);
}
box_append_path = NULL;
box_append_project = NULL;
box_append_mesh_selected = NULL;
box_append_material_selected = NULL;
}
void box_append_draw() {
if (box_append_project == NULL) {
return;
}
if (box_append_mesh_selected != NULL && box_append_mesh_selected->length > 0) {
ui_text(tr("Meshes"), UI_ALIGN_LEFT, 0);
ui_handle_t *hmeshes = ui_handle(__ID__);
for (i32 i = 0; i < box_append_mesh_selected->length; ++i) {
ui_handle_t *h = ui_nest(hmeshes, i);
h->b = box_append_mesh_selected->buffer[i] != 0;
ui_check(h, box_append_mesh_name(box_append_project->mesh_datas->buffer[i], i), "");
if (h->changed) {
box_append_mesh_selected->buffer[i] = h->b ? 1 : 0;
if (h->b) {
box_append_select_mesh_material(i);
}
}
}
}
if (box_append_material_selected != NULL && box_append_material_selected->length > 0) {
ui_text(tr("Materials"), UI_ALIGN_LEFT, 0);
ui_handle_t *hmats = ui_handle(__ID__);
for (i32 i = 0; i < box_append_material_selected->length; ++i) {
ui_handle_t *h = ui_nest(hmats, i);
h->b = box_append_material_selected->buffer[i] != 0;
ui_check(h, box_append_material_name(box_append_project->material_nodes->buffer[i], i), "");
if (h->changed) {
box_append_material_selected->buffer[i] = h->b ? 1 : 0;
}
}
}
ui_end_element();
ui_row2();
if (ui_icon_button(tr("Cancel"), ICON_CLOSE, UI_ALIGN_CENTER)) {
ui_box_hide();
}
bool has_sel = box_append_has_selection();
g_ui->enabled = has_sel;
if ((ui_icon_button(tr("Append"), ICON_CHECK, UI_ALIGN_CENTER) || g_ui->is_return_down) && has_sel) {
import_arm_append(box_append_project, box_append_path, box_append_mesh_selected, box_append_material_selected);
ui_box_hide();
}
g_ui->enabled = true;
}
void box_append_show(char *path) {
box_append_path = string_copy(path);
buffer_t *b = data_get_blob(path);
box_append_project = import_arm_decode_project(b);
if (box_append_project == NULL) {
data_delete_blob(path);
box_append_path = NULL;
return;
}
i32 mesh_count = box_append_project->mesh_datas != NULL ? box_append_project->mesh_datas->length : 0;
i32 mat_count = box_append_project->material_nodes != NULL ? box_append_project->material_nodes->length : 0;
box_append_mesh_selected = box_append_zeros(mesh_count);
box_append_material_selected = box_append_zeros(mat_count);
ui_box_show_custom(&box_append_draw, 600, 420, &box_append_on_hide, true, tr("Append"));
}
paint/sources/ui/tab_browser.c
+4 -11
View File
@@ -91,12 +91,8 @@ void tab_browser_draw_context_menu_draw_import(void (*done)(void)) {
import_asset_run(file, -1.0, -1.0, true, true, done);
}
void tab_browser_draw_import_meshes(void *_) {
import_arm_run_mesh_append(_tab_browser_draw_file);
}
void tab_browser_draw_import_materials(void *_) {
import_arm_run_material(_tab_browser_draw_file);
void tab_browser_draw_append(void *_) {
box_append_show(_tab_browser_draw_file);
}
void tab_browser_draw_context_menu_draw() {
@@ -105,11 +101,8 @@ void tab_browser_draw_context_menu_draw() {
sys_notify_on_next_frame(&tab_browser_draw_context_menu_draw_import, NULL);
}
if (path_is_project(file)) {
if (ui_menu_button(tr("Import Meshes"), "", ICON_NONE)) {
sys_notify_on_next_frame(&tab_browser_draw_import_meshes, NULL);
}
if (ui_menu_button(tr("Import Materials"), "", ICON_NONE)) {
sys_notify_on_next_frame(&tab_browser_draw_import_materials, NULL);
if (ui_menu_button(tr("Append"), "", ICON_PLUS)) {
sys_notify_on_next_frame(&tab_browser_draw_append, NULL);
}
}
if (path_is_texture(file)) {