paint: improve timeline skinning

paint/sources/functions.h

@@ -441,7 +441,7 @@ void                      project_import_mesh(bool replace_existing, void (*done
 void                      project_append_mesh();
 void                      project_import_mesh_box(char *path, bool replace_existing, bool clear_layers, bool keep_camera, void (*done)(void));
 void                      project_reimport_mesh();
-void                      project_reimport_mesh_skinned(int frame);
+bool                      project_reskin_mesh(int frame);
 void                      project_unwrap_mesh_box();
 void                      project_import_asset(char *filters, bool hdr_as_envmap);
 void                      project_import_swatches(bool replace_existing);
@@ -612,6 +612,9 @@ void                         import_keymap_run(char *path);
 void                         tab_plugins_draw(ui_handle_t *htab);
 void                         plugin_uv_unwrap_button();
 void                         plugin_uv_unwrap_per_object_button(mesh_object_t *mo);
+void                         plugins_skin_data_clear();
+bool                         plugins_skin_data_exists();
+bool                         plugins_skin_data_apply(int frame, i16_array_t *posa, i16_array_t *nora, float *scale_pos);
 void                         make_discard_color_id(node_shader_t *kong, char *tex_coord);
 void                         make_discard_face(node_shader_t *kong);
 void                         make_discard_uv_island(node_shader_t *kong);

paint/sources/io/import_mesh.c

@@ -19,6 +19,12 @@ void import_mesh_run(char *path, bool _clear_layers, bool replace_existing, bool
 	import_mesh_no_reset     = keep_camera;
 	g_context->layer_filter  = 0;
 
+#ifdef WITH_PLUGINS
+	if (replace_existing) {
+		plugins_skin_data_clear();
+	}
+#endif
+
 	char *p = to_lower_case(path);
 	if (ends_with(p, ".obj")) {
 		import_obj_run(path, replace_existing);

paint/sources/minic_api.c

@@ -44,7 +44,7 @@ void           project_save(bool save_and_quit);
 char          *project_filepath_get();
 char          *project_basepath_get();
 void           project_filepath_set(char *s);
-void           project_reimport_mesh_skinned(i32 frame);
+bool           project_reskin_mesh(int frame);
 void           context_set_viewport_shader(void *viewport_shader);
 void           context_set_viewport_mode(int mode);
 void           context_set_camera_controls(int i);
@@ -1252,7 +1252,7 @@ void minic_register_builtins() {
 	R(gpu_create_render_target, "p(i,i,i)");
 	R(viewport_capture_screenshot_to, "v(p,f,f,f,f)");
 	R(viewport_save_texture, "v(p)");
-	R(project_reimport_mesh_skinned, "v(i)");
+	R(project_reskin_mesh, "b(i)");
 	R(iron_delay_idle_sleep, "v()");
 
 	// json

paint/sources/project.c

@@ -376,18 +376,30 @@ void project_reimport_mesh() {
 	}
 }
 
-void project_reimport_mesh_skinned(int frame) {
-	extern bool import_mesh_no_scale;
-	extern bool import_mesh_keep_timeline;
-	extern int  plugins_skinning_frame;
-	if (g_project->mesh_assets != NULL && g_project->mesh_assets->length > 0 && iron_file_exists(g_project->mesh_assets->buffer[0])) {
-		plugins_skinning_frame    = frame;
-		import_mesh_no_scale      = true;
-		import_mesh_keep_timeline = true;
-		import_mesh_run(g_project->mesh_assets->buffer[0], false, true, true);
-		import_mesh_keep_timeline = false;
-		plugins_skinning_frame    = -1;
+bool project_reskin_mesh(int frame) {
+#ifdef WITH_PLUGINS
+	if (!plugins_skin_data_exists()) {
+		return false;
 	}
+
+	mesh_data_t    *md  = context_main_object()->data;
+	vertex_array_t *pos = mesh_data_get_vertex_array(md, "pos");
+	vertex_array_t *nor = mesh_data_get_vertex_array(md, "nor");
+	if (!plugins_skin_data_apply(frame, pos->values, nor->values, &md->scale_pos)) {
+		return false;
+	}
+
+	mesh_data_build_vertices(md->_->vertex_buffer, md->vertex_arrays);
+
+	if (g_context->merged_object != NULL) {
+		util_mesh_merge(NULL);
+	}
+	g_context->ddirty          = 4;
+	render_path_raytrace_ready = false;
+	return true;
+#else
+	return false;
+#endif
 }
 
 void project_unwrap_mesh(raw_mesh_t *mesh, void (*done)(raw_mesh_t *)) {

paint/sources/ui/tab_timeline.c

@@ -35,7 +35,6 @@ i32  tab_timeline_scroll_drag_v  = 0;
 
 static i32          tab_timeline_max_frames = 200;
 static i32          tab_timeline_frame_rate = 24;
-static bool         tab_timeline_skinning   = false;
 static any_array_t *tab_timeline_keyframes  = NULL;
 static any_array_t *tab_timeline_origins    = NULL;
 static i32          tab_timeline_last_frame = 0;
@@ -489,9 +488,7 @@ static void tab_timeline_frame_change_on_next_frame(void *_) {
 		to == 0 ? tab_timeline_load_mesh_origins() : tab_timeline_load_mesh_from_keyframes((float)to);
 	}
 
-	if (tab_timeline_skinning) {
-		project_reimport_mesh_skinned(to);
-	}
+	project_reskin_mesh(to);
 }
 
 static void tab_timeline_add_keyframe_on_next_frame(void *_) {
@@ -946,14 +943,6 @@ void tab_timeline_draw_edit() {
 		ui_menu_keep_open       = true;
 	}
 
-	ui_handle_t *hskin = ui_handle(__ID__);
-	hskin->b           = tab_timeline_skinning;
-	ui_check(hskin, tr("Skinning"), "");
-	if (hskin->changed) {
-		tab_timeline_skinning = hskin->b;
-		ui_menu_keep_open     = true;
-	}
-
 	if (ui_menu_button(tr("Clear"), "", ICON_ERASE)) {
 		sys_notify_on_next_frame(&tab_timeline_clear_on_next_frame, NULL);
 	}