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

paint: timeline cleanup

Browse Source
This commit is contained in:
luboslenco
2026-08-11 14:57:47 +02:00
parent 1e1ff42188
commit a83d6ff9d4
3 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paint/sources/base.c
+3 -1
View File
@@ -398,10 +398,12 @@ void base_update(void *_) {
render_compass_update();
// if (g_config->workspace == WORKSPACE_PLAYER) {
if (args_player) {
player_update();
}
else {
tab_timeline_update();
}
ui_view2d_update(NULL);
ui_nodes_update(NULL);
paint/sources/player.c
+1 -1
View File
@@ -2,5 +2,5 @@
#include "global.h"
void player_update() {
tab_timeline_player_update();
tab_timeline_update();
}
paint/sources/ui/tab_timeline.c
+6 -26
View File
@@ -48,7 +48,6 @@ static i32 tab_timeline_pending_kf_frame = -1;
static i32 tab_timeline_pending_kf_layer = -1;
static i32 tab_timeline_pending_rm_frame = -1;
static i32 tab_timeline_pending_rm_layer = -1;
static f32 tab_timeline_pending_tween_f = -1.0f;
static i32 tab_timeline_pending_mesh_add_frame = -1;
static i32 tab_timeline_pending_mesh_add_index = -1;
static i32 tab_timeline_pending_mesh_rm_frame = -1;
@@ -321,15 +320,6 @@ static void tab_timeline_tween_from_keyframes(f32 frame_f) {
}
}
static void tab_timeline_tween_on_next_frame(void *_) {
f32 frame_f = tab_timeline_pending_tween_f;
tab_timeline_pending_tween_f = -1.0f;
if (frame_f < 0.0f) {
return;
}
tab_timeline_tween_from_keyframes(frame_f);
}
static i32 tab_timeline_find_mesh_keyframe(i32 frame, i32 mesh_index) {
for (i32 i = 0; i < tab_timeline_mesh_keyframes->length; i++) {
tab_timeline_mesh_keyframe_t *kf = tab_timeline_mesh_keyframes->buffer[i];
@@ -872,7 +862,7 @@ void tab_timeline_play() {
tab_timeline_last_frame = -1; // Ensure frame 0 scripts run
}
void tab_timeline_player_update() {
void tab_timeline_update() {
tab_timeline_init();
if (!tab_timeline_playing) {
return;
@@ -889,6 +879,10 @@ void tab_timeline_player_update() {
tab_timeline_selected_frame = frame_i;
if (g_config->workspace != WORKSPACE_PLAYER) {
ui_base_hwnds->buffer[TAB_AREA_STATUS]->redraws = 2;
}
if (tab_timeline_mesh_keyframes != NULL) {
tab_timeline_load_mesh_from_keyframes(frame_f);
}
@@ -897,6 +891,7 @@ void tab_timeline_player_update() {
tab_timeline_last_frame = frame_i;
tab_timeline_load_from_keyframes(frame_i);
tab_timeline_run_frame_scripts(frame_i);
project_reskin_mesh(frame_i);
}
if (tab_timeline_keyframes != NULL) {
@@ -1127,21 +1122,6 @@ void tab_timeline_draw(ui_handle_t *htab) {
i32 max_scroll = math_max(tab_timeline_max_frames - visible, 0);
tab_timeline_scroll = (i32)math_min(math_max(tab_timeline_scroll, 0), max_scroll);
if (tab_timeline_playing) {
iron_delay_idle_sleep();
f64 elapsed = sys_time() - tab_timeline_play_time;
float frame_f = (float)fmod(elapsed * tab_timeline_frame_rate, tab_timeline_max_frames);
tab_timeline_selected_frame = (i32)frame_f;
ui_base_hwnds->buffer[TAB_AREA_STATUS]->redraws = 2;
if (tab_timeline_mesh_keyframes != NULL) {
tab_timeline_load_mesh_from_keyframes(frame_f);
}
if (tab_timeline_keyframes != NULL && tab_timeline_pending_tween_f < 0.0f) {
tab_timeline_pending_tween_f = frame_f;
sys_notify_on_next_frame(&tab_timeline_tween_on_next_frame, NULL);
}
}
// Frame number labels every 5 frames
draw_set_color(g_theme->LABEL_COL);
i32 label_start = (tab_timeline_scroll / 5) * 5;