Page MenuHome
Differential D2274 Diff 7563 source/blender/editors/interface/interface_draw.c

Changeset View

Standalone View

View Options

source/blender/editors/interface/interface_draw.c

Context not available.
return roundboxtype; return roundboxtype;
} }
void UI_draw_roundbox_gl_mode(int mode, float minx, float miny, float maxx, float maxy, float rad) void UI_draw_roundbox_gl_mode_3ubAlpha(int mode, float minx, float miny, float maxx, float maxy, float rad, unsigned char col[3], unsigned char alpha)
{
float colv[4];
colv[0] = ((float)col[0]) / 255;
colv[1] = ((float)col[1]) / 255;
colv[2] = ((float)col[2]) / 255;
colv[3] = ((float)alpha) / 255;
UI_draw_roundbox_gl_mode(mode, minx, miny, maxx, maxy, rad, colv);
}
void UI_draw_roundbox_gl_mode_3fvAlpha(int mode, float minx, float miny, float maxx, float maxy, float rad, float col[3], float alpha)
{
float colv[4];
colv[0] = col[0];
colv[1] = col[1];
colv[2] = col[2];
colv[3] = alpha;
merwinUnsubmitted
Done
Inline Actions

Yes!

merwin: Yes!
UI_draw_roundbox_gl_mode(mode, minx, miny, maxx, maxy, rad, colv);
}
void UI_draw_roundbox_gl_mode(int mode, float minx, float miny, float maxx, float maxy, float rad, float col[4])
SeverinUnsubmitted
Done
Inline Actions

Not sure why 72? I only count 32 vertices.

Severin: Not sure why 72? I only count 32 vertices.
SeverinUnsubmitted
Done
Inline Actions

Eeeh, *36 :)

Severin: Eeeh, *36 :)
kgeogeoAuthorUnsubmitted
Done
Inline Actions

euh, not sure, we declare the vertex count or coordinate count??
36 vertex but 72 coordinate

kgeogeo: euh, not sure, we declare the vertex count or coordinate count?? 36 vertex but 72 coordinate
kgeogeoAuthorUnsubmitted
Done
Inline Actions

I try it and you're right... I've made the change.
thanks

kgeogeo: I try it and you're right... I've made the change. thanks
merwinUnsubmitted
Done
Inline Actions

vertex count or coordinate count?

Yep it's vertex count. Doesn't matter if coordinates are 2D or 3D. Also doesn't matter how many attributes each vertex has. I'll remember to explain this better in the docs.

merwin: > vertex count or coordinate count? Yep it's vertex count. Doesn't matter if coordinates are…
merwinUnsubmitted
Done
Inline Actions

@Julian Eisel (Severin) is trying to crash us! I count 36 too.

merwin: @Severin is trying to crash us! I count 36 too.
{ {
merwinUnsubmitted
Done
Inline Actions

Since color is set once for the whole roundbox, we can use GPU_SHADER_2D_UNIFORM_COLOR!

Color values still need to be passed into the function like you did. Just call immUniformColor4ubv right after binding the shader program.

merwin: Since color is set once for the whole roundbox, we can use GPU_SHADER_2D_UNIFORM_COLOR! Color…
float vec[7][2] = {{0.195, 0.02}, {0.383, 0.067}, {0.55, 0.169}, {0.707, 0.293}, float vec[7][2] = {{0.195, 0.02}, {0.383, 0.067}, {0.55, 0.169}, {0.707, 0.293},
{0.831, 0.45}, {0.924, 0.617}, {0.98, 0.805}}; {0.831, 0.45}, {0.924, 0.617}, {0.98, 0.805}};
int a; int a;
VertexFormat *format = immVertexFormat();
unsigned pos = add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT);
/* mult */ /* mult */
for (a = 0; a < 7; a++) { for (a = 0; a < 7; a++) {
mul_v2_fl(vec[a], rad); mul_v2_fl(vec[a], rad);
} }
glBegin(mode); if (mode == GL_POLYGON) {
mode = GL_TRIANGLE_FAN;
}
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniformColor4fv(col);
immBeginAtMost(mode, 36);
/* start with corner right-bottom */ /* start with corner right-bottom */
if (roundboxtype & UI_CNR_BOTTOM_RIGHT) { if (roundboxtype & UI_CNR_BOTTOM_RIGHT) {
glVertex2f(maxx - rad, miny); immVertex2f(pos, maxx - rad, miny);
for (a = 0; a < 7; a++) { for (a = 0; a < 7; a++) {
glVertex2f(maxx - rad + vec[a][0], miny + vec[a][1]); immVertex2f(pos, maxx - rad + vec[a][0], miny + vec[a][1]);
} }
glVertex2f(maxx, miny + rad); immVertex2f(pos, maxx, miny + rad);
} }
else { else {
glVertex2f(maxx, miny); immVertex2f(pos, maxx, miny);
} }
/* corner right-top */ /* corner right-top */
if (roundboxtype & UI_CNR_TOP_RIGHT) { if (roundboxtype & UI_CNR_TOP_RIGHT) {
glVertex2f(maxx, maxy - rad); immVertex2f(pos, maxx, maxy - rad);
for (a = 0; a < 7; a++) { for (a = 0; a < 7; a++) {
glVertex2f(maxx - vec[a][1], maxy - rad + vec[a][0]); immVertex2f(pos, maxx - vec[a][1], maxy - rad + vec[a][0]);
} }
glVertex2f(maxx - rad, maxy); immVertex2f(pos, maxx - rad, maxy);
} }
else { else {
glVertex2f(maxx, maxy); immVertex2f(pos, maxx, maxy);
} }
/* corner left-top */ /* corner left-top */
if (roundboxtype & UI_CNR_TOP_LEFT) { if (roundboxtype & UI_CNR_TOP_LEFT) {
glVertex2f(minx + rad, maxy); immVertex2f(pos, minx + rad, maxy);
for (a = 0; a < 7; a++) { for (a = 0; a < 7; a++) {
glVertex2f(minx + rad - vec[a][0], maxy - vec[a][1]); immVertex2f(pos, minx + rad - vec[a][0], maxy - vec[a][1]);
} }
glVertex2f(minx, maxy - rad); immVertex2f(pos, minx, maxy - rad);
} }
else { else {
glVertex2f(minx, maxy); immVertex2f(pos, minx, maxy);
} }
/* corner left-bottom */ /* corner left-bottom */
if (roundboxtype & UI_CNR_BOTTOM_LEFT) { if (roundboxtype & UI_CNR_BOTTOM_LEFT) {
glVertex2f(minx, miny + rad); immVertex2f(pos, minx, miny + rad);
for (a = 0; a < 7; a++) { for (a = 0; a < 7; a++) {
glVertex2f(minx + vec[a][1], miny + rad - vec[a][0]); immVertex2f(pos, minx + vec[a][1], miny + rad - vec[a][0]);
} }
glVertex2f(minx + rad, miny); immVertex2f(pos, minx + rad, miny);
} }
else { else {
glVertex2f(minx, miny); immVertex2f(pos, minx, miny);
} }
glEnd(); immEnd();
immUnbindProgram();
} }
static void round_box_shade_col(const float col1[3], float const col2[3], const float fac) static void round_box_shade_col(const float col1[3], float const col2[3], const float fac)
Context not available.
/* set antialias line */ /* set antialias line */
glEnable(GL_LINE_SMOOTH); glEnable(GL_LINE_SMOOTH);
glEnable(GL_BLEND); glEnable(GL_BLEND);
UI_draw_roundbox_gl_mode(GL_LINE_LOOP, minx, miny, maxx, maxy, rad, color);
UI_draw_roundbox_gl_mode(GL_LINE_LOOP, minx, miny, maxx, maxy, rad);
glDisable(GL_BLEND); glDisable(GL_BLEND);
glDisable(GL_LINE_SMOOTH); glDisable(GL_LINE_SMOOTH);
Context not available.
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
/* outline */ /* outline */
glColor4f(0.f, 0.f, 0.f, 0.5f);
UI_draw_roundbox_corner_set(UI_CNR_ALL); UI_draw_roundbox_corner_set(UI_CNR_ALL);
UI_draw_roundbox_gl_mode(GL_LINE_LOOP, rect->xmin - 1, rect->ymin, rect->xmax + 1, rect->ymax + 1, 3.0f); float color[4] = {0.0f, 0.0f, 0.0f, 0.5f};
UI_draw_roundbox_gl_mode(GL_LINE_LOOP, rect->xmin - 1, rect->ymin, rect->xmax + 1, rect->ymax + 1, 3.0f, color);
} }
static void histogram_draw_one( static void histogram_draw_one(
kgeogeoAuthorUnsubmitted
Not Done
Inline Actions

OK, I think I see what you mean (I hope ;-)))) )

unsigned char color[4];
UI_GetThemeColor4ubv(TH_PREVIEW_BACK, color)

UI_draw_roundbox_corner_set(UI_CNR_ALL);
UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f, color);

it would be good, that's what you mean/want??

if yes I have to make UI_GetThemeColorShade4ubv too for eg??

kgeogeo: OK, I think I see what you mean (I hope ;-)))) ) unsigned char color[4]; UI_GetThemeColor4ubv…
merwinUnsubmitted
Not Done
Inline Actions

Yes to all of that :)

merwin: Yes to all of that :)
Context not available.
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
UI_ThemeColor4(TH_PREVIEW_BACK); float color[4];
UI_GetThemeColor4fv(TH_PREVIEW_BACK, color);
UI_draw_roundbox_corner_set(UI_CNR_ALL); UI_draw_roundbox_corner_set(UI_CNR_ALL);
UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f); UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f, color);
/* need scissor test, histogram can draw outside of boundary */ /* need scissor test, histogram can draw outside of boundary */
GLint scissor[4]; GLint scissor[4];
Context not available.
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
UI_ThemeColor4(TH_PREVIEW_BACK); float color[4];
UI_GetThemeColor4fv(TH_PREVIEW_BACK, color);
UI_draw_roundbox_corner_set(UI_CNR_ALL); UI_draw_roundbox_corner_set(UI_CNR_ALL);
UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f); UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f, color);
/* need scissor test, waveform can draw outside of boundary */ /* need scissor test, waveform can draw outside of boundary */
glGetIntegerv(GL_VIEWPORT, scissor); glGetIntegerv(GL_VIEWPORT, scissor);
Context not available.
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
UI_ThemeColor4(TH_PREVIEW_BACK); float color[4];
UI_GetThemeColor4fv(TH_PREVIEW_BACK, color);
UI_draw_roundbox_corner_set(UI_CNR_ALL); UI_draw_roundbox_corner_set(UI_CNR_ALL);
UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f); UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin - 1, rect.xmax + 1, rect.ymax + 1, 3.0f, color);
/* need scissor test, hvectorscope can draw outside of boundary */ /* need scissor test, hvectorscope can draw outside of boundary */
GLint scissor[4]; GLint scissor[4];
Context not available.
float size; float size;
/* backdrop */ /* backdrop */
glColor3ubv((unsigned char *)wcol->inner);
UI_draw_roundbox_corner_set(UI_CNR_ALL); UI_draw_roundbox_corner_set(UI_CNR_ALL);
UI_draw_roundbox_gl_mode(GL_POLYGON, rect->xmin, rect->ymin, rect->xmax, rect->ymax, 5.0f); UI_draw_roundbox_gl_mode_3ubAlpha(GL_POLYGON, rect->xmin, rect->ymin, rect->xmax, rect->ymax, 5.0f, (unsigned char *)wcol->inner, 255);
/* sphere color */ /* sphere color */
glCullFace(GL_BACK); glCullFace(GL_BACK);
merwinUnsubmitted
Not Done
Inline Actions

Suggestion:

const unsigned char color[4] = { ... };
UI_draw_roundbox_gl_mode( ... , color);
merwin: Suggestion: ``` const unsigned char color[4] = { ... }; UI_draw_roundbox_gl_mode( ... , color)…
Context not available.
(rect.ymax + 1) - (rect.ymin - 1)); (rect.ymax + 1) - (rect.ymin - 1));
if (scopes->track_disabled) { if (scopes->track_disabled) {
glColor4f(0.7f, 0.3f, 0.3f, 0.3f); float color[4] = {0.7f, 0.3f, 0.3f, 0.3f};
UI_draw_roundbox_corner_set(UI_CNR_ALL); UI_draw_roundbox_corner_set(UI_CNR_ALL);
UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f); UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f, color);
ok = true; ok = true;
} }
Context not available.
ImBuf *drawibuf = scopes->track_preview; ImBuf *drawibuf = scopes->track_preview;
if (scopes->use_track_mask) { if (scopes->use_track_mask) {
glColor4f(0.0f, 0.0f, 0.0f, 0.3f); float color[4] = {0.0f, 0.0f, 0.0f, 0.3f};
UI_draw_roundbox_corner_set(UI_CNR_ALL); UI_draw_roundbox_corner_set(UI_CNR_ALL);
UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f); UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f, color);
} }
glaDrawPixelsSafe(rect.xmin, rect.ymin + 1, drawibuf->x, drawibuf->y, glaDrawPixelsSafe(rect.xmin, rect.ymin + 1, drawibuf->x, drawibuf->y,
Context not available.
} }
if (!ok) { if (!ok) {
glColor4f(0.f, 0.f, 0.f, 0.3f); float color[4] = {0.0f, 0.0f, 0.0f, 0.3f};
UI_draw_roundbox_corner_set(UI_CNR_ALL); UI_draw_roundbox_corner_set(UI_CNR_ALL);
UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f); UI_draw_roundbox_gl_mode(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f, color);
} }
/* outline */ /* outline */
Context not available.
float calpha = dalpha; float calpha = dalpha;
for (; i--; a -= aspect) { for (; i--; a -= aspect) {
/* alpha ranges from 2 to 20 or so */ /* alpha ranges from 2 to 20 or so */
glColor4f(0.0f, 0.0f, 0.0f, calpha); float color[4] = {0.0f, 0.0f, 0.0f, calpha};
UI_draw_roundbox_gl_mode(GL_POLYGON, rct->xmin - a, rct->ymin - a, rct->xmax + a, rct->ymax - 10.0f + a, rad + a, color);
calpha += dalpha; calpha += dalpha;
UI_draw_roundbox_gl_mode(GL_POLYGON, rct->xmin - a, rct->ymin - a, rct->xmax + a, rct->ymax - 10.0f + a, rad + a);
} }
/* outline emphasis */ /* outline emphasis */
glEnable(GL_LINE_SMOOTH); glEnable(GL_LINE_SMOOTH);
glColor4ub(0, 0, 0, 100); float color[4] = {0.0f, 0.0f, 0.0f, 0.3f};
merwinUnsubmitted
Not Done
Inline Actions

100/255 = 0.392... change 0.3 to 0.4 alpha

merwin: 100/255 = 0.392... change 0.3 to 0.4 alpha
UI_draw_roundbox_gl_mode(GL_LINE_LOOP, rct->xmin - 0.5f, rct->ymin - 0.5f, rct->xmax + 0.5f, rct->ymax + 0.5f, radius + 0.5f); UI_draw_roundbox_gl_mode(GL_LINE_LOOP, rct->xmin - 0.5f, rct->ymin - 0.5f, rct->xmax + 0.5f, rct->ymax + 0.5f, radius + 0.5f, color);
glDisable(GL_LINE_SMOOTH); glDisable(GL_LINE_SMOOTH);
glDisable(GL_BLEND); glDisable(GL_BLEND);
Context not available.