OpenGL: convert NLA editor to new imm mode
Plus plenty of C99 cleanup. Part of T49043. Needs more testing, I don't really use the NLA editor.
This commit is contained in:
parent
24703c97a1
commit
09bfc37889
Notes:
blender-bot
2023-02-14 02:43:21 +01:00
Referenced by commit fc016dca41, Revert C99 "cleanups" from rB09bfc378895f
|
|
@ -54,7 +54,6 @@
|
|||
#include "ED_anim_api.h"
|
||||
#include "ED_keyframes_draw.h"
|
||||
|
||||
#include "BIF_gl.h"
|
||||
#include "BIF_glutil.h"
|
||||
|
||||
#include "GPU_immediate.h"
|
||||
|
|
@ -109,7 +108,7 @@ static void nla_action_draw_keyframes(AnimData *adt, bAction *act, float y, floa
|
|||
action_to_keylist(adt, act, &keys, NULL);
|
||||
BLI_dlrbTree_linkedlist_sync(&keys);
|
||||
|
||||
if (ELEM(NULL, act, keys.first))
|
||||
if (!(act && keys.first))
|
||||
return;
|
||||
|
||||
/* draw a darkened region behind the strips
|
||||
|
|
@ -168,57 +167,55 @@ static void nla_action_draw_keyframes(AnimData *adt, bAction *act, float y, floa
|
|||
/* Strip Markers ------------------------ */
|
||||
|
||||
/* Markers inside an action strip */
|
||||
static void nla_actionclip_draw_markers(NlaStrip *strip, float yminc, float ymaxc)
|
||||
static void nla_actionclip_draw_markers(NlaStrip *strip, float yminc, float ymaxc, int shade, unsigned int pos)
|
||||
{
|
||||
bAction *act = strip->act;
|
||||
TimeMarker *marker;
|
||||
|
||||
if (ELEM(NULL, strip->act, strip->act->markers.first))
|
||||
const bAction *act = strip->act;
|
||||
|
||||
if (!(act && act->markers.first))
|
||||
return;
|
||||
|
||||
for (marker = act->markers.first; marker; marker = marker->next) {
|
||||
|
||||
immUniformThemeColorShade(TH_STRIP_SELECT, shade);
|
||||
|
||||
immBeginAtMost(PRIM_POINTS, BLI_listbase_count(&act->markers));
|
||||
for (TimeMarker *marker = act->markers.first; marker; marker = marker->next) {
|
||||
if ((marker->frame > strip->actstart) && (marker->frame < strip->actend)) {
|
||||
float frame = nlastrip_get_frame(strip, marker->frame, NLATIME_CONVERT_MAP);
|
||||
|
||||
|
||||
/* just a simple line for now */
|
||||
// XXX: draw a triangle instead...
|
||||
fdrawline(frame, yminc + 1, frame, ymaxc - 1);
|
||||
/* XXX: draw a triangle instead... */
|
||||
immVertex2f(pos, frame, yminc + 1);
|
||||
immVertex2f(pos, frame, ymaxc - 1);
|
||||
}
|
||||
}
|
||||
immEnd();
|
||||
}
|
||||
|
||||
/* Markers inside a NLA-Strip */
|
||||
static void nla_strip_draw_markers(NlaStrip *strip, float yminc, float ymaxc)
|
||||
static void nla_strip_draw_markers(NlaStrip *strip, float yminc, float ymaxc, unsigned int pos)
|
||||
{
|
||||
glLineWidth(2.0f);
|
||||
|
||||
if (strip->type == NLASTRIP_TYPE_CLIP) {
|
||||
/* try not to be too conspicuous, while being visible enough when transforming */
|
||||
if (strip->flag & NLASTRIP_FLAG_SELECT)
|
||||
UI_ThemeColorShade(TH_STRIP_SELECT, -60);
|
||||
else
|
||||
UI_ThemeColorShade(TH_STRIP_SELECT, -40);
|
||||
|
||||
int shade = (strip->flag & NLASTRIP_FLAG_SELECT) ? -60 : -40;
|
||||
|
||||
setlinestyle(3);
|
||||
|
||||
/* just draw the markers in this clip */
|
||||
nla_actionclip_draw_markers(strip, yminc, ymaxc);
|
||||
nla_actionclip_draw_markers(strip, yminc, ymaxc, shade, pos);
|
||||
|
||||
setlinestyle(0);
|
||||
}
|
||||
else if (strip->flag & NLASTRIP_FLAG_TEMP_META) {
|
||||
/* just a solid color, so that it is very easy to spot */
|
||||
UI_ThemeColorShade(TH_STRIP_SELECT, 20);
|
||||
|
||||
int shade = 20;
|
||||
/* draw the markers in the first level of strips only (if they are actions) */
|
||||
for (NlaStrip *nls = strip->strips.first; nls; nls = nls->next) {
|
||||
if (nls->type == NLASTRIP_TYPE_CLIP) {
|
||||
nla_actionclip_draw_markers(nls, yminc, ymaxc);
|
||||
nla_actionclip_draw_markers(nls, yminc, ymaxc, shade, pos);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
glLineWidth(1.0);
|
||||
}
|
||||
|
||||
/* Strips (Proper) ---------------------- */
|
||||
|
|
@ -286,12 +283,8 @@ static void nla_strip_get_color_inside(AnimData *adt, NlaStrip *strip, float col
|
|||
}
|
||||
|
||||
/* helper call for drawing influence/time control curves for a given NLA-strip */
|
||||
static void nla_draw_strip_curves(NlaStrip *strip, float yminc, float ymaxc)
|
||||
static void nla_draw_strip_curves(NlaStrip *strip, float yminc, float ymaxc, unsigned int pos)
|
||||
{
|
||||
|
||||
VertexFormat *format = immVertexFormat();
|
||||
unsigned pos = add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT);
|
||||
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
|
||||
immUniformColor4f(0.7f, 0.7f, 0.7f, 1.0f);
|
||||
|
||||
const float yheight = ymaxc - yminc;
|
||||
|
|
@ -312,7 +305,7 @@ static void nla_draw_strip_curves(NlaStrip *strip, float yminc, float ymaxc)
|
|||
* - min y-val is yminc, max is y-maxc, so clamp in those regions
|
||||
*/
|
||||
for (cfra = strip->start; cfra <= strip->end; cfra += 1.0f) {
|
||||
float y = evaluate_fcurve(fcu, cfra); // assume this to be in 0-1 range
|
||||
float y = evaluate_fcurve(fcu, cfra); /* assume this to be in 0-1 range */
|
||||
immVertex2f(pos, cfra, ((y * yheight) + yminc));
|
||||
}
|
||||
|
||||
|
|
@ -346,9 +339,6 @@ static void nla_draw_strip_curves(NlaStrip *strip, float yminc, float ymaxc)
|
|||
/* turn off AA'd lines */
|
||||
glDisable(GL_LINE_SMOOTH);
|
||||
glDisable(GL_BLEND);
|
||||
|
||||
//Unbind GPU_SHADER_2D_UNIFORM_COLOR
|
||||
immUnbindProgram();
|
||||
}
|
||||
|
||||
/* main call for drawing a single NLA-strip */
|
||||
|
|
@ -356,10 +346,13 @@ static void nla_draw_strip(SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStri
|
|||
{
|
||||
const bool non_solo = ((adt && (adt->flag & ADT_NLA_SOLO_TRACK)) && (nlt->flag & NLATRACK_SOLO) == 0);
|
||||
float color[4] = {1.0f, 1.0f, 1.0f, 1.0f};
|
||||
|
||||
|
||||
/* get color of strip */
|
||||
nla_strip_get_color_inside(adt, strip, color);
|
||||
|
||||
|
||||
unsigned int pos = add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT);
|
||||
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
|
||||
|
||||
/* draw extrapolation info first (as backdrop)
|
||||
* - but this should only be drawn if track has some contribution
|
||||
*/
|
||||
|
|
@ -367,7 +360,7 @@ static void nla_draw_strip(SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStri
|
|||
/* enable transparency... */
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
glEnable(GL_BLEND);
|
||||
|
||||
|
||||
switch (strip->extendmode) {
|
||||
/* since this does both sides, only do the 'before' side, and leave the rest to the next case */
|
||||
case NLASTRIP_EXTEND_HOLD:
|
||||
|
|
@ -376,15 +369,10 @@ static void nla_draw_strip(SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStri
|
|||
*/
|
||||
if (strip->prev == NULL) {
|
||||
/* set the drawing color to the color of the strip, but with very faint alpha */
|
||||
glColor4f(color[0], color[1], color[2], 0.15f);
|
||||
|
||||
immUniformColor3fvAlpha(color, 0.15f);
|
||||
|
||||
/* draw the rect to the edge of the screen */
|
||||
glBegin(GL_QUADS);
|
||||
glVertex2f(v2d->cur.xmin, yminc);
|
||||
glVertex2f(v2d->cur.xmin, ymaxc);
|
||||
glVertex2f(strip->start, ymaxc);
|
||||
glVertex2f(strip->start, yminc);
|
||||
glEnd();
|
||||
immRectf(pos, v2d->cur.xmin, yminc, strip->start, ymaxc);
|
||||
}
|
||||
/* fall-through */
|
||||
|
||||
|
|
@ -393,121 +381,132 @@ static void nla_draw_strip(SpaceNla *snla, AnimData *adt, NlaTrack *nlt, NlaStri
|
|||
/* only need to try and draw if the next strip doesn't occur immediately after */
|
||||
if ((strip->next == NULL) || (IS_EQF(strip->next->start, strip->end) == 0)) {
|
||||
/* set the drawing color to the color of the strip, but this time less faint */
|
||||
glColor4f(color[0], color[1], color[2], 0.3f);
|
||||
immUniformColor3fvAlpha(color, 0.3f);
|
||||
|
||||
/* draw the rect to the next strip or the edge of the screen */
|
||||
glBegin(GL_QUADS);
|
||||
glVertex2f(strip->end, yminc);
|
||||
glVertex2f(strip->end, ymaxc);
|
||||
|
||||
if (strip->next) {
|
||||
glVertex2f(strip->next->start, ymaxc);
|
||||
glVertex2f(strip->next->start, yminc);
|
||||
}
|
||||
else {
|
||||
glVertex2f(v2d->cur.xmax, ymaxc);
|
||||
glVertex2f(v2d->cur.xmax, yminc);
|
||||
}
|
||||
glEnd();
|
||||
float x2 = strip->next ? strip->next->start : v2d->cur.xmax;
|
||||
immRectf(pos, strip->end, yminc, x2, ymaxc);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
glDisable(GL_BLEND);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/* draw 'inside' of strip itself */
|
||||
if (non_solo == 0) {
|
||||
immUnbindProgram();
|
||||
|
||||
/* strip is in normal track */
|
||||
UI_draw_roundbox_corner_set(UI_CNR_ALL); /* all corners rounded */
|
||||
|
||||
UI_draw_roundbox_shade_x(GL_TRIANGLE_FAN, strip->start, yminc, strip->end, ymaxc, 0.0, 0.5, 0.1, color);
|
||||
|
||||
/* restore current vertex format & program (roundbox trashes it) */
|
||||
pos = add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT);
|
||||
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
|
||||
}
|
||||
else {
|
||||
/* strip is in disabled track - make less visible */
|
||||
glColor4f(color[0], color[1], color[2], 0.1f);
|
||||
immUniformColor3fvAlpha(color, 0.1f);
|
||||
|
||||
glEnable(GL_BLEND);
|
||||
glRectf(strip->start, yminc, strip->end, ymaxc);
|
||||
immRectf(pos, strip->start, yminc, strip->end, ymaxc);
|
||||
glDisable(GL_BLEND);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/* draw strip's control 'curves'
|
||||
* - only if user hasn't hidden them...
|
||||
*/
|
||||
if ((snla->flag & SNLA_NOSTRIPCURVES) == 0)
|
||||
nla_draw_strip_curves(strip, yminc, ymaxc);
|
||||
|
||||
|
||||
nla_draw_strip_curves(strip, yminc, ymaxc, pos);
|
||||
|
||||
|
||||
/* draw markings indicating locations of local markers (useful for lining up different actions) */
|
||||
if ((snla->flag & SNLA_NOLOCALMARKERS) == 0)
|
||||
nla_strip_draw_markers(strip, yminc, ymaxc);
|
||||
|
||||
/* draw strip outline
|
||||
nla_strip_draw_markers(strip, yminc, ymaxc, pos);
|
||||
|
||||
immUnbindProgram();
|
||||
|
||||
/* draw strip outline
|
||||
* - color used here is to indicate active vs non-active
|
||||
*/
|
||||
if (strip->flag & NLASTRIP_FLAG_ACTIVE) {
|
||||
/* strip should appear 'sunken', so draw a light border around it */
|
||||
glColor3f(0.9f, 1.0f, 0.9f); // FIXME: hardcoded temp-hack colors
|
||||
color[0] = 0.9f;
|
||||
color[0] = 0.9f; /* FIXME: hardcoded temp-hack colors */
|
||||
color[1] = 1.0f;
|
||||
color[2] = 0.9f;
|
||||
}
|
||||
else {
|
||||
/* strip should appear to stand out, so draw a dark border around it */
|
||||
glColor3f(0.0f, 0.0f, 0.0f);
|
||||
color[0] = color[1] = color[2] = 1.0f;
|
||||
color[0] = color[1] = color[2] = 0.0f; /* FIXME: or 1.0f ?? */
|
||||
}
|
||||
|
||||
|
||||
/* - line style: dotted for muted */
|
||||
if ((nlt->flag & NLATRACK_MUTED) || (strip->flag & NLASTRIP_FLAG_MUTED))
|
||||
setlinestyle(4);
|
||||
|
||||
|
||||
/* draw outline */
|
||||
UI_draw_roundbox_shade_x(GL_LINE_LOOP, strip->start, yminc, strip->end, ymaxc, 0.0, 0.0, 0.1, color);
|
||||
|
||||
|
||||
/* restore current vertex format & program (roundbox trashes it) */
|
||||
pos = add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT);
|
||||
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
|
||||
|
||||
immUniformColor3fv(color);
|
||||
|
||||
/* if action-clip strip, draw lines delimiting repeats too (in the same color as outline) */
|
||||
if ((strip->type == NLASTRIP_TYPE_CLIP) && IS_EQF(strip->repeat, 1.0f) == 0) {
|
||||
float repeatLen = (strip->actend - strip->actstart) * strip->scale;
|
||||
int i;
|
||||
|
||||
|
||||
/* only draw lines for whole-numbered repeats, starting from the first full-repeat
|
||||
* up to the last full repeat (but not if it lies on the end of the strip)
|
||||
*/
|
||||
for (i = 1; i < strip->repeat; i++) {
|
||||
immBeginAtMost(PRIM_LINES, 2 * (strip->repeat - 1));
|
||||
for (int i = 1; i < strip->repeat; i++) {
|
||||
float repeatPos = strip->start + (repeatLen * i);
|
||||
|
||||
|
||||
/* don't draw if line would end up on or after the end of the strip */
|
||||
if (repeatPos < strip->end)
|
||||
fdrawline(repeatPos, yminc + 4, repeatPos, ymaxc - 4);
|
||||
if (repeatPos < strip->end) {
|
||||
immVertex2f(pos, repeatPos, yminc + 4);
|
||||
immVertex2f(pos, repeatPos, ymaxc - 4);
|
||||
}
|
||||
}
|
||||
immEnd();
|
||||
}
|
||||
/* or if meta-strip, draw lines delimiting extents of sub-strips (in same color as outline, if more than 1 exists) */
|
||||
else if ((strip->type == NLASTRIP_TYPE_META) && (strip->strips.first != strip->strips.last)) {
|
||||
NlaStrip *cs;
|
||||
float y = (ymaxc - yminc) / 2.0f + yminc;
|
||||
|
||||
float y = (ymaxc - yminc) * 0.5f + yminc;
|
||||
|
||||
immBeginAtMost(PRIM_LINES, 4 * BLI_listbase_count(&strip->strips)); /* up to 2 lines per strip */
|
||||
|
||||
/* only draw first-level of child-strips, but don't draw any lines on the endpoints */
|
||||
for (cs = strip->strips.first; cs; cs = cs->next) {
|
||||
for (NlaStrip *cs = strip->strips.first; cs; cs = cs->next) {
|
||||
/* draw start-line if not same as end of previous (and only if not the first strip)
|
||||
* - on upper half of strip
|
||||
*/
|
||||
if ((cs->prev) && IS_EQF(cs->prev->end, cs->start) == 0)
|
||||
fdrawline(cs->start, y, cs->start, ymaxc);
|
||||
|
||||
if ((cs->prev) && IS_EQF(cs->prev->end, cs->start) == 0) {
|
||||
immVertex2f(pos, cs->start, y);
|
||||
immVertex2f(pos, cs->start, ymaxc);
|
||||
}
|
||||
|
||||
/* draw end-line if not the last strip
|
||||
* - on lower half of strip
|
||||
*/
|
||||
if (cs->next)
|
||||
fdrawline(cs->end, yminc, cs->end, y);
|
||||
if (cs->next) {
|
||||
immVertex2f(pos, cs->end, yminc);
|
||||
immVertex2f(pos, cs->end, y);
|
||||
}
|
||||
}
|
||||
|
||||
immEnd();
|
||||
}
|
||||
|
||||
|
||||
/* reset linestyle */
|
||||
setlinestyle(0);
|
||||
}
|
||||
immUnbindProgram();
|
||||
}
|
||||
|
||||
/* add the relevant text to the cache of text-strings to draw in pixelspace */
|
||||
static void nla_draw_strip_text(
|
||||
|
|
@ -518,7 +517,6 @@ static void nla_draw_strip_text(
|
|||
char str[256];
|
||||
size_t str_len;
|
||||
char col[4];
|
||||
rctf rect;
|
||||
|
||||
/* just print the name and the range */
|
||||
if (strip->flag & NLASTRIP_FLAG_TEMP_META) {
|
||||
|
|
@ -545,12 +543,14 @@ static void nla_draw_strip_text(
|
|||
/* set bounding-box for text
|
||||
* - padding of 2 'units' on either side
|
||||
*/
|
||||
// TODO: make this centered?
|
||||
rect.xmin = xminc;
|
||||
rect.ymin = yminc;
|
||||
rect.xmax = xmaxc;
|
||||
rect.ymax = ymaxc;
|
||||
|
||||
/* TODO: make this centered? */
|
||||
rctf rect = {
|
||||
.xmin = xminc,
|
||||
.ymin = yminc,
|
||||
.xmax = xmaxc,
|
||||
.ymax = ymaxc
|
||||
};
|
||||
|
||||
/* add this string to the cache of texts to draw */
|
||||
UI_view2d_text_cache_add_rectf(v2d, &rect, str, str_len, col);
|
||||
}
|
||||
|
|
@ -563,9 +563,7 @@ static void nla_draw_strip_frames_text(NlaTrack *UNUSED(nlt), NlaStrip *strip, V
|
|||
const float ytol = 1.0f; /* small offset to vertical positioning of text, for legibility */
|
||||
const char col[4] = {220, 220, 220, 255}; /* light gray */
|
||||
char numstr[32];
|
||||
size_t numstr_len;
|
||||
|
||||
|
||||
|
||||
/* Always draw times above the strip, whereas sequencer drew below + above.
|
||||
* However, we should be fine having everything on top, since these tend to be
|
||||
* quite spaced out.
|
||||
|
|
@ -573,9 +571,9 @@ static void nla_draw_strip_frames_text(NlaTrack *UNUSED(nlt), NlaStrip *strip, V
|
|||
* while also preserving some accuracy, since we do use floats
|
||||
*/
|
||||
/* start frame */
|
||||
numstr_len = BLI_snprintf_rlen(numstr, sizeof(numstr), "%.1f", strip->start);
|
||||
size_t numstr_len = BLI_snprintf_rlen(numstr, sizeof(numstr), "%.1f", strip->start);
|
||||
UI_view2d_text_cache_add(v2d, strip->start - 1.0f, ymaxc + ytol, numstr, numstr_len, col);
|
||||
|
||||
|
||||
/* end frame */
|
||||
numstr_len = BLI_snprintf_rlen(numstr, sizeof(numstr), "%.1f", strip->end);
|
||||
UI_view2d_text_cache_add(v2d, strip->end, ymaxc + ytol, numstr, numstr_len, col);
|
||||
|
|
@ -585,20 +583,14 @@ static void nla_draw_strip_frames_text(NlaTrack *UNUSED(nlt), NlaStrip *strip, V
|
|||
|
||||
void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar)
|
||||
{
|
||||
ListBase anim_data = {NULL, NULL};
|
||||
bAnimListElem *ale;
|
||||
int filter;
|
||||
|
||||
View2D *v2d = &ar->v2d;
|
||||
float y = 0.0f;
|
||||
size_t items;
|
||||
int height;
|
||||
const float pixelx = BLI_rctf_size_x(&v2d->cur) / BLI_rcti_size_x(&v2d->mask);
|
||||
const float text_margin_x = (8 * UI_DPI_FAC) * pixelx;
|
||||
|
||||
/* build list of channels to draw */
|
||||
filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
|
||||
items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
|
||||
ListBase anim_data = {NULL, NULL};
|
||||
int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
|
||||
size_t items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
|
||||
|
||||
/* Update max-extent of channels here (taking into account scrollers):
|
||||
* - this is done to allow the channel list to be scrollable, but must be done here
|
||||
|
|
@ -606,16 +598,16 @@ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar)
|
|||
* - offset of NLACHANNEL_HEIGHT*2 is added to the height of the channels, as first is for
|
||||
* start of list offset, and the second is as a correction for the scrollers.
|
||||
*/
|
||||
height = ((items * NLACHANNEL_STEP(snla)) + (NLACHANNEL_HEIGHT(snla) * 2));
|
||||
int height = ((items * NLACHANNEL_STEP(snla)) + (NLACHANNEL_HEIGHT(snla) * 2));
|
||||
/* don't use totrect set, as the width stays the same
|
||||
* (NOTE: this is ok here, the configuration is pretty straightforward)
|
||||
*/
|
||||
v2d->tot.ymin = (float)(-height);
|
||||
|
||||
/* loop through channels, and set up drawing depending on their type */
|
||||
y = (float)(-NLACHANNEL_HEIGHT(snla));
|
||||
float y = (float)(-NLACHANNEL_HEIGHT(snla));
|
||||
|
||||
for (ale = anim_data.first; ale; ale = ale->next) {
|
||||
for (bAnimListElem *ale = anim_data.first; ale; ale = ale->next) {
|
||||
const float yminc = (float)(y - NLACHANNEL_HEIGHT_HALF(snla));
|
||||
const float ymaxc = (float)(y + NLACHANNEL_HEIGHT_HALF(snla));
|
||||
|
||||
|
|
@ -629,11 +621,10 @@ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar)
|
|||
{
|
||||
AnimData *adt = ale->adt;
|
||||
NlaTrack *nlt = (NlaTrack *)ale->data;
|
||||
NlaStrip *strip;
|
||||
int index;
|
||||
|
||||
/* draw each strip in the track (if visible) */
|
||||
for (strip = nlt->strips.first, index = 1; strip; strip = strip->next, index++) {
|
||||
int index = 1;
|
||||
for (NlaStrip *strip = nlt->strips.first; strip; strip = strip->next, index++) {
|
||||
if (BKE_nlastrip_within_bounds(strip, v2d->cur.xmin, v2d->cur.xmax)) {
|
||||
const float xminc = strip->start + text_margin_x;
|
||||
const float xmaxc = strip->end + text_margin_x;
|
||||
|
|
@ -658,45 +649,60 @@ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar)
|
|||
case ANIMTYPE_NLAACTION:
|
||||
{
|
||||
AnimData *adt = ale->adt;
|
||||
float color[4];
|
||||
|
||||
|
||||
unsigned int pos = add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT);
|
||||
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
|
||||
|
||||
/* just draw a semi-shaded rect spanning the width of the viewable area if there's data,
|
||||
* and a second darker rect within which we draw keyframe indicator dots if there's data
|
||||
*/
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
glEnable(GL_BLEND);
|
||||
|
||||
|
||||
/* get colors for drawing */
|
||||
float color[4];
|
||||
nla_action_get_color(adt, ale->data, color);
|
||||
glColor4fv(color);
|
||||
|
||||
immUniformColor4fv(color);
|
||||
|
||||
/* draw slightly shifted up for greater separation from standard channels,
|
||||
* but also slightly shorter for some more contrast when viewing the strips
|
||||
*/
|
||||
glRectf(v2d->cur.xmin, yminc + NLACHANNEL_SKIP, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
|
||||
|
||||
/* draw keyframes in the action */
|
||||
nla_action_draw_keyframes(adt, ale->data, y, yminc + NLACHANNEL_SKIP, ymaxc - NLACHANNEL_SKIP);
|
||||
immRectf(pos, v2d->cur.xmin, yminc + NLACHANNEL_SKIP, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
|
||||
|
||||
/* draw 'embossed' lines above and below the strip for effect */
|
||||
/* white base-lines */
|
||||
glLineWidth(2.0f);
|
||||
glColor4f(1.0f, 1.0f, 1.0f, 0.3);
|
||||
fdrawline(v2d->cur.xmin, yminc + NLACHANNEL_SKIP, v2d->cur.xmax, yminc + NLACHANNEL_SKIP);
|
||||
fdrawline(v2d->cur.xmin, ymaxc - NLACHANNEL_SKIP, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
|
||||
|
||||
immUniformColor4f(1.0f, 1.0f, 1.0f, 0.3);
|
||||
immBegin(PRIM_LINES, 4);
|
||||
immVertex2f(pos, v2d->cur.xmin, yminc + NLACHANNEL_SKIP);
|
||||
immVertex2f(pos, v2d->cur.xmax, yminc + NLACHANNEL_SKIP);
|
||||
immVertex2f(pos, v2d->cur.xmin, ymaxc - NLACHANNEL_SKIP);
|
||||
immVertex2f(pos, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
|
||||
immEnd();
|
||||
|
||||
/* black top-lines */
|
||||
glLineWidth(1.0f);
|
||||
glColor3f(0.0f, 0.0f, 0.0f);
|
||||
fdrawline(v2d->cur.xmin, yminc + NLACHANNEL_SKIP, v2d->cur.xmax, yminc + NLACHANNEL_SKIP);
|
||||
fdrawline(v2d->cur.xmin, ymaxc - NLACHANNEL_SKIP, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
|
||||
|
||||
immUniformColor3f(0.0f, 0.0f, 0.0f);
|
||||
immBegin(PRIM_LINES, 4);
|
||||
immVertex2f(pos, v2d->cur.xmin, yminc + NLACHANNEL_SKIP);
|
||||
immVertex2f(pos, v2d->cur.xmax, yminc + NLACHANNEL_SKIP);
|
||||
immVertex2f(pos, v2d->cur.xmin, ymaxc - NLACHANNEL_SKIP);
|
||||
immVertex2f(pos, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
|
||||
immEnd();
|
||||
|
||||
/* TODO: these lines but better --^ */
|
||||
|
||||
immUnbindProgram();
|
||||
|
||||
/* draw keyframes in the action */
|
||||
nla_action_draw_keyframes(adt, ale->data, y, yminc + NLACHANNEL_SKIP, ymaxc - NLACHANNEL_SKIP);
|
||||
|
||||
glDisable(GL_BLEND);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* adjust y-position for next one */
|
||||
y -= NLACHANNEL_STEP(snla);
|
||||
}
|
||||
|
|
@ -712,17 +718,14 @@ void draw_nla_channel_list(const bContext *C, bAnimContext *ac, ARegion *ar)
|
|||
{
|
||||
ListBase anim_data = {NULL, NULL};
|
||||
bAnimListElem *ale;
|
||||
int filter;
|
||||
|
||||
SpaceNla *snla = (SpaceNla *)ac->sl;
|
||||
View2D *v2d = &ar->v2d;
|
||||
float y = 0.0f;
|
||||
size_t items;
|
||||
int height;
|
||||
|
||||
/* build list of channels to draw */
|
||||
filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
|
||||
items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
|
||||
int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
|
||||
size_t items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
|
||||
|
||||
/* Update max-extent of channels here (taking into account scrollers):
|
||||
* - this is done to allow the channel list to be scrollable, but must be done here
|
||||
|
|
@ -730,7 +733,7 @@ void draw_nla_channel_list(const bContext *C, bAnimContext *ac, ARegion *ar)
|
|||
* - offset of NLACHANNEL_HEIGHT*2 is added to the height of the channels, as first is for
|
||||
* start of list offset, and the second is as a correction for the scrollers.
|
||||
*/
|
||||
height = ((items * NLACHANNEL_STEP(snla)) + (NLACHANNEL_HEIGHT(snla) * 2));
|
||||
int height = ((items * NLACHANNEL_STEP(snla)) + (NLACHANNEL_HEIGHT(snla) * 2));
|
||||
/* don't use totrect set, as the width stays the same
|
||||
* (NOTE: this is ok here, the configuration is pretty straightforward)
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue