blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

OpenGL: remove glutil_draw_*_arc (lined, filled) 

These helper functions were marked DEPRECATED since they use old OpenGL calls. Now they are marked GONE!

Part of T49043
This commit is contained in:
Mike Erwin 2017-03-03 17:23:35 -05:00
parent 053589da7d
commit 29683d623c
2 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/editors/include/BIF_glutil.h
View File

@ -58,32 +58,6 @@ extern const unsigned char stipple_diag_stripes_pos[128];
extern const unsigned char stipple_diag_stripes_neg[128];
extern const unsigned char stipple_checker_8px[128];
/**
* Draw a lined (non-looping) arc with the given
* \a radius, starting at angle \a start and arcing
* through \a angle. The arc is centered at the origin
* and drawn in the XY plane.
*
* \param start The initial angle (in radians).
* \param angle The length of the arc (in radians).
* \param radius The arc radius.
* \param nsegments The number of segments to use in drawing the arc.
*/
void glutil_draw_lined_arc(float start, float angle, float radius, int nsegments); /* DEPRECATED */
/**
* Draw a filled arc with the given \a radius,
* starting at angle \a start and arcing through
* \a angle. The arc is centered at the origin
* and drawn in the XY plane.
*
* \param start The initial angle (in radians).
* \param angle The length of the arc (in radians).
* \param radius The arc radius.
* \param nsegments The number of segments to use in drawing the arc.
*/
void glutil_draw_filled_arc(float start, float angle, float radius, int nsegments); /* DEPRECATED */
/**
* Draw a circle outline with the given \a radius.
* The circle is centered at \a x, \a y and drawn in the XY plane.

32
source/blender/editors/screen/glutil.c
View File

@ -106,38 +106,6 @@ void set_inverted_drawing(int enable)
GL_TOGGLE(GL_DITHER, !enable);
}
void glutil_draw_filled_arc(float start, float angle, float radius, int nsegments)
{
/* DEPRECATED */
int i;
glBegin(GL_TRIANGLE_FAN);
glVertex2f(0.0, 0.0);
for (i = 0; i < nsegments; i++) {
float t = (float) i / (nsegments - 1);
float cur = start + t * angle;
glVertex2f(cosf(cur) * radius, sinf(cur) * radius);
}
glEnd();
}
void glutil_draw_lined_arc(float start, float angle, float radius, int nsegments)
{
/* DEPRECATED */
int i;
glBegin(GL_LINE_STRIP);
for (i = 0; i < nsegments; i++) {
float t = (float) i / (nsegments - 1);
float cur = start + t * angle;
glVertex2f(cosf(cur) * radius, sinf(cur) * radius);
}
glEnd();
}
static void imm_draw_circle(PrimitiveType prim_type, unsigned pos, float x, float y, float rad, int nsegments)
{
immBegin(prim_type, nsegments);