paint: arm append fixes

Author: luboslenco

paint/sources/functions.h

@@ -393,6 +393,8 @@ 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);
+bool                      import_arm_object_name_exists(char *name);
+i32                       import_arm_material_name_index(char *name);
 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

@@ -109,6 +109,50 @@ static bool import_arm_has_selected(i32_array_t *selected) {
 	return false;
 }
 
+bool import_arm_object_name_exists(char *name) {
+	if (name == NULL || g_project->_->paint_objects == NULL) {
+		return false;
+	}
+	for (i32 i = 0; i < g_project->_->paint_objects->length; ++i) {
+		mesh_object_t *o = g_project->_->paint_objects->buffer[i];
+		if (o->base->name != NULL && string_equals(o->base->name, name)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+i32 import_arm_material_name_index(char *name) {
+	if (name == NULL) {
+		return -1;
+	}
+	for (i32 i = 0; i < g_project->_->materials->length; ++i) {
+		slot_material_t *m = g_project->_->materials->buffer[i];
+		if (m->canvas->name != NULL && string_equals(m->canvas->name, name)) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+static i32 import_arm_mesh_parent_index(project_t *project, i32 mesh_i) {
+	if (project->mesh_parents != NULL && mesh_i < project->mesh_parents->length) {
+		return project->mesh_parents->buffer[mesh_i];
+	}
+	return mesh_i > 0 ? 0 : -1;
+}
+
+static mat4_t import_arm_mesh_world_matrix(project_t *project, i32 mesh_i) {
+	f32_array_t_array_t *transforms = project->mesh_transforms;
+	mat4_t               m          = mat4_from_f32_array(transforms->buffer[mesh_i], 0);
+	i32                  parent     = import_arm_mesh_parent_index(project, mesh_i);
+	for (i32 guard = 0; guard < transforms->length && parent >= 0 && parent < transforms->length; ++guard) {
+		m      = mat4_mult_mat3x4(m, mat4_from_f32_array(transforms->buffer[parent], 0));
+		parent = import_arm_mesh_parent_index(project, parent);
+	}
+	return m;
+}
+
 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;
@@ -130,15 +174,23 @@ static void import_arm_run_mesh_append_from_project(project_t *project, i32_arra
 		if (!import_arm_is_selected(selected, i)) {
 			continue;
 		}
+		if (import_arm_object_name_exists(mesh_names->buffer[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";
 		object->base->name    = mesh_names->buffer[i];
 		md->_->handle         = md->name;
 		any_map_set(data_cached_meshes, md->_->handle, md);
 
-		object->base->transform->scale = (vec4_t){1, 1, 1, 1.0};
-		transform_build_matrix(object->base->transform);
+		if (project->mesh_transforms != NULL && i < project->mesh_transforms->length) {
+			transform_set_matrix(object->base->transform, import_arm_mesh_world_matrix(project, i));
+		}
+		else {
+			object->base->transform->scale = (vec4_t){1, 1, 1, 1.0};
+			transform_build_matrix(object->base->transform);
+		}
 
 		any_array_push(g_project->_->paint_objects, object);
 		tab_stages_add_object(object->base->name);
@@ -378,18 +430,29 @@ void import_arm_append(project_t *project, char *path, i32_array_t *mesh_selecte
 	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;
+	if (project->material_nodes != NULL && project->material_nodes->length > 0) {
+		i32_array_t *to_import = i32_array_create(project->material_nodes->length);
+		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)) {
+			ui_node_canvas_t *c        = project->material_nodes->buffer[i];
+			i32               existing = import_arm_material_name_index(c != NULL ? c->name : NULL);
+			if (existing >= 0) {
+				to_import->buffer[i]       = 0;
+				src_to_dest_mat->buffer[i] = existing;
+			}
+			else if (import_arm_is_selected(material_selected, i)) {
+				to_import->buffer[i]       = 1;
 				src_to_dest_mat->buffer[i] = dest++;
 			}
 			else {
+				to_import->buffer[i]       = 0;
 				src_to_dest_mat->buffer[i] = -1;
 			}
 		}
+		if (import_arm_has_selected(to_import)) {
+			import_arm_import_materials(project, path, to_import, false);
+		}
 	}
 
 	if (project->mesh_datas != NULL && import_arm_has_selected(mesh_selected)) {

paint/sources/ui/box_append.c

@@ -32,6 +32,22 @@ static bool box_append_has_selection() {
 	return false;
 }
 
+static bool box_append_mesh_exists(i32 i) {
+	mesh_data_t *raw = box_append_project->mesh_datas->buffer[i];
+	if (raw == NULL || raw->name == NULL || string_equals(raw->name, "")) {
+		return false;
+	}
+	i32   source_index;
+	char *object_name;
+	char *name = (i > 0 && util_mesh_link_parse(raw->name, &source_index, &object_name)) ? object_name : raw->name;
+	return import_arm_object_name_exists(name);
+}
+
+static bool box_append_material_exists(i32 i) {
+	ui_node_canvas_t *c = box_append_project->material_nodes->buffer[i];
+	return c != NULL && import_arm_material_name_index(c->name) >= 0;
+}
+
 static i32 box_append_mesh_material_index(i32 mesh_i) {
 	if (box_append_project == NULL || box_append_project->mesh_materials == NULL) {
 		return -1;
@@ -47,6 +63,9 @@ static void box_append_select_mesh_material(i32 mesh_i) {
 	if (mat_i < 0 || box_append_material_selected == NULL || mat_i >= box_append_material_selected->length) {
 		return;
 	}
+	if (box_append_material_exists(mat_i)) {
+		return;
+	}
 	box_append_material_selected->buffer[mat_i] = 1;
 }
 
@@ -88,10 +107,16 @@ void box_append_draw() {
 		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) {
+			bool exists = box_append_mesh_exists(i);
+			if (exists) {
+				box_append_mesh_selected->buffer[i] = 0;
+			}
 			ui_handle_t *h = ui_nest(hmeshes, i);
 			h->b           = box_append_mesh_selected->buffer[i] != 0;
+			g_ui->enabled  = !exists;
 			ui_check(h, box_append_mesh_name(box_append_project->mesh_datas->buffer[i], i), "");
-			if (h->changed) {
+			g_ui->enabled = true;
+			if (!exists && h->changed) {
 				box_append_mesh_selected->buffer[i] = h->b ? 1 : 0;
 				if (h->b) {
 					box_append_select_mesh_material(i);
@@ -104,10 +129,16 @@ void box_append_draw() {
 		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) {
+			bool exists = box_append_material_exists(i);
+			if (exists) {
+				box_append_material_selected->buffer[i] = 0;
+			}
 			ui_handle_t *h = ui_nest(hmats, i);
 			h->b           = box_append_material_selected->buffer[i] != 0;
+			g_ui->enabled  = !exists;
 			ui_check(h, box_append_material_name(box_append_project->material_nodes->buffer[i], i), "");
-			if (h->changed) {
+			g_ui->enabled = true;
+			if (!exists && h->changed) {
 				box_append_material_selected->buffer[i] = h->b ? 1 : 0;
 			}
 		}
@@ -127,7 +158,21 @@ void box_append_draw() {
 	g_ui->enabled = true;
 }
 
+static void box_append_show_on_cache_cloud_done(char *abs) {
+	box_append_show(string_copy(abs));
+}
+
 void box_append_show(char *path) {
+	if (starts_with(path, "cloud")) {
+#ifdef IRON_ANDROID
+		console_toast(tr("Downloading"));
+#else
+		console_info(tr("Downloading"));
+#endif
+		file_cache_cloud(path, &box_append_show_on_cache_cloud_done, g_config->server);
+		return;
+	}
+
 	box_append_path    = string_copy(path);
 	buffer_t *b        = data_get_blob(path);
 	box_append_project = import_arm_decode_project(b);