griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Timeline: draw cache in overlay so that it stays in sync with actually cached data

Browse Source 
Before this, when the animation is playing and the set of cached frames
changes the timeline is out-of-date which can be confusing.

Now the cached frames are redrawn whenever the current-frame indicator is
redrawn. This fixes the issue but also causes redraws when they are not necessary.
Currently, that does not seem to be an issue,

Pull Request: https://projects.blender.org/blender/blender/pulls/105986
This commit is contained in:
Jacques Lucke
2023-03-27 11:00:42 +02:00
parent 3b4725fb62
commit 7a1f2fd680
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_action/action_draw.cc
View File

@@ -480,7 +480,7 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *region
/** \name Timeline - Caches
* \{ */
static bool timeline_cache_is_hidden_by_setting(SpaceAction *saction, PTCacheID *pid)
static bool timeline_cache_is_hidden_by_setting(const SpaceAction *saction, const PTCacheID *pid)
{
switch (pid->type) {
case PTCACHE_TYPE_SOFTBODY:
@@ -674,14 +674,14 @@ static void timeline_cache_draw_single(PTCacheID *pid, float y_offset, float hei
GPU_matrix_pop();
}
void timeline_draw_cache(SpaceAction *saction, Object *ob, Scene *scene)
void timeline_draw_cache(const SpaceAction *saction, const Object *ob, const Scene *scene)
{
if ((saction->cache_display & TIME_CACHE_DISPLAY) == 0 || ob == nullptr) {
return;
}
ListBase pidlist;
BKE_ptcache_ids_from_object(&pidlist, ob, scene, 0);
BKE_ptcache_ids_from_object(&pidlist, const_cast<Object *>(ob), const_cast<Scene *>(scene), 0);
uint pos_id = GPU_vertformat_attr_add(
immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);

2
source/blender/editors/space_action/action_intern.hh
View File

@@ -35,7 +35,7 @@ void draw_channel_names(bContext *C, bAnimContext *ac, ARegion *region);
*/
void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *region);
void timeline_draw_cache(SpaceAction *saction, Object *ob, Scene *scene);
void timeline_draw_cache(const SpaceAction *saction, const Object *ob, const Scene *scene);
/* ***************************************** */
/* action_select.c */

16
source/blender/editors/space_action/space_action.cc
View File

@@ -44,6 +44,8 @@
#include "BLO_read_write.h"
#include "GPU_matrix.h"
#include "action_intern.hh" /* own include */
/* -------------------------------------------------------------------- */
@@ -212,11 +214,6 @@ static void action_main_region_draw(const bContext *C, ARegion *region)
ED_markers_draw(C, marker_flag);
}
/* caches */
if (saction->mode == SACTCONT_TIMELINE) {
timeline_draw_cache(saction, obact, scene);
}
/* preview range */
UI_view2d_view_ortho(v2d);
ANIM_draw_previewrange(C, v2d, 0);
@@ -240,8 +237,17 @@ static void action_main_region_draw_overlay(const bContext *C, ARegion *region)
/* draw entirely, view changes should be handled here */
const SpaceAction *saction = CTX_wm_space_action(C);
const Scene *scene = CTX_data_scene(C);
const Object *obact = CTX_data_active_object(C);
View2D *v2d = &region->v2d;
/* caches */
if (saction->mode == SACTCONT_TIMELINE) {
GPU_matrix_push_projection();
UI_view2d_view_orthoSpecial(region, v2d, 1);
timeline_draw_cache(saction, obact, scene);
GPU_matrix_pop_projection();
}
/* scrubbing region */
ED_time_scrub_draw_current_frame(region, scene, saction->flag & SACTION_DRAWTIME);