From 28da385ac2174856176b633846de6267fb5a96e1 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Sun, 20 Sep 2015 18:11:25 +0200 Subject: Cleanup: Use new vector transform functions --- source/blender/blenfont/intern/blf.c | 2 +- source/blender/editors/armature/editarmature_sketch.c | 8 ++++---- source/blender/editors/gpencil/drawgpencil.c | 2 +- source/blender/editors/interface/interface_widgets.c | 8 ++++---- source/blender/editors/sculpt_paint/paint_cursor.c | 8 ++++---- source/blender/editors/space_clip/clip_draw.c | 8 ++++---- source/blender/editors/space_view3d/drawarmature.c | 2 +- source/blender/editors/space_view3d/drawobject.c | 8 ++++---- source/blender/editors/transform/transform.c | 8 ++++---- source/blender/editors/transform/transform_manipulator.c | 6 +++--- source/blender/editors/transform/transform_snap.c | 2 +- source/blender/editors/uvedit/uvedit_draw.c | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 8a48384f06f..a97187657b8 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -522,7 +522,7 @@ static void blf_draw_gl__start(FontBLF *font, GLint *mode, GLint *param) if (font->flags & BLF_MATRIX) glMultMatrixd((GLdouble *)&font->m); - glTranslatef(font->pos[0], font->pos[1], font->pos[2]); + glTranslate3fv(font->pos); if (font->flags & BLF_ASPECT) glScalef(font->aspect[0], font->aspect[1], font->aspect[2]); diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index c0098a3726a..e4c3f73dd94 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -436,7 +436,7 @@ static float sk_clampPointSize(SK_Point *pt, float size) static void sk_drawPoint(GLUquadric *quad, SK_Point *pt, float size) { - glTranslatef(pt->p[0], pt->p[1], pt->p[2]); + glTranslate3fv(pt->p); gluSphere(quad, sk_clampPointSize(pt, size), 8, 8); } @@ -455,7 +455,7 @@ static void sk_drawEdge(GLUquadric *quad, SK_Point *pt0, SK_Point *pt1, float si angle = angle_normalized_v3v3(vec2, vec1); - glRotatef(angle * (float)(180.0 / M_PI) + 180.0f, axis[0], axis[1], axis[2]); + glRotate3fv(angle * (float)(180.0 / M_PI) + 180.0f, axis); gluCylinder(quad, sk_clampPointSize(pt1, size), sk_clampPointSize(pt0, size), length, 8, 8); } @@ -475,7 +475,7 @@ static void sk_drawNormal(GLUquadric *quad, SK_Point *pt, float size, float heig angle = angle_normalized_v3v3(vec2, pt->no); - glRotatef(angle * (float)(180.0 / M_PI), axis[0], axis[1], axis[2]); + glRotate3fv(angle * (float)(180.0 / M_PI), axis); glColor3f(0, 1, 1); gluCylinder(quad, sk_clampPointSize(pt, size), 0, sk_clampPointSize(pt, height), 10, 2); @@ -2112,7 +2112,7 @@ static void sk_drawSketch(Scene *scene, View3D *UNUSED(v3d), SK_Sketch *sketch, glColor3fv(colors[index]); glPushMatrix(); - glTranslatef(p->p[0], p->p[1], p->p[2]); + glTranslate3fv(p->p); gluSphere(quad, 0.02, 8, 8); glPopMatrix(); } diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index ff8984ae329..6b71c0ac053 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -398,7 +398,7 @@ static void gp_draw_stroke_point(bGPDspoint *points, short thickness, short dfla gluQuadricDrawStyle(qobj, GLU_FILL); /* need to translate drawing position, but must reset after too! */ - glTranslatef(co[0], co[1], 0.0); + glTranslate2fv(co); gluDisk(qobj, 0.0, thickness, 32, 1); glTranslatef(-co[0], -co[1], 0.0); diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 369cfaa73a3..5d37f5c0fcf 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -200,7 +200,7 @@ void ui_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y /* for each AA step */ for (j = 0; j < WIDGET_AA_JITTER; j++) { - glTranslatef(jit[j][0], jit[j][1], 0.0f); + glTranslate2fv(jit[j]); glDrawArrays(GL_TRIANGLES, 0, 3); glTranslatef(-jit[j][0], -jit[j][1], 0.0f); } @@ -223,7 +223,7 @@ void ui_draw_anti_roundbox(int mode, float minx, float miny, float maxx, float m glColor4fv(color); for (j = 0; j < WIDGET_AA_JITTER; j++) { - glTranslatef(jit[j][0], jit[j][1], 0.0f); + glTranslate2fv(jit[j]); UI_draw_roundbox_gl_mode(mode, minx, miny, maxx, maxy, rad); glTranslatef(-jit[j][0], -jit[j][1], 0.0f); } @@ -749,7 +749,7 @@ static void widgetbase_draw(uiWidgetBase *wtb, uiWidgetColors *wcol) for (j = 0; j < WIDGET_AA_JITTER; j++) { unsigned char emboss[4]; - glTranslatef(jit[j][0], jit[j][1], 0.0f); + glTranslate2fv(jit[j]); /* outline */ glColor4ubv(tcol); @@ -783,7 +783,7 @@ static void widgetbase_draw(uiWidgetBase *wtb, uiWidgetColors *wcol) /* for each AA step */ for (j = 0; j < WIDGET_AA_JITTER; j++) { - glTranslatef(jit[j][0], jit[j][1], 0.0f); + glTranslate2fv(jit[j]); if (wtb->tria1.tot) { glColor4ubv(tcol); diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index f34e42fbc7c..e19756c6a35 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -644,9 +644,9 @@ static void paint_draw_tex_overlay(UnifiedPaintSettings *ups, Brush *brush, glMatrixMode(GL_MODELVIEW); glPushMatrix(); if (primary) - glTranslatef(brush->stencil_pos[0], brush->stencil_pos[1], 0); + glTranslate2fv(brush->stencil_pos); else - glTranslatef(brush->mask_stencil_pos[0], brush->mask_stencil_pos[1], 0); + glTranslate2fv(brush->mask_stencil_pos); glRotatef(RAD2DEGF(mtex->rot), 0, 0, 1); glMatrixMode(GL_TEXTURE); } @@ -725,7 +725,7 @@ static void paint_draw_cursor_overlay(UnifiedPaintSettings *ups, Brush *brush, do_pop = true; glPushMatrix(); glLoadIdentity(); - glTranslatef(center[0], center[1], 0); + glTranslate2fv(center); glScalef(ups->size_pressure_value, ups->size_pressure_value, 1); glTranslatef(-center[0], -center[1], 0); } @@ -1056,7 +1056,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) glColor4f(outline_col[0], outline_col[1], outline_col[2], outline_alpha); /* draw brush outline */ - glTranslatef(translation[0], translation[1], 0); + glTranslate2fv(translation); /* draw an inner brush */ if (ups->stroke_active && BKE_brush_use_size_pressure(scene, brush)) { diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 05e7354ac79..62bb372514b 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -520,7 +520,7 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT /* pattern and search outline */ glPushMatrix(); - glTranslatef(marker_pos[0], marker_pos[1], 0); + glTranslate2fv(marker_pos); if (!tiny) glLineWidth(3.0f); @@ -652,7 +652,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra /* pattern */ glPushMatrix(); - glTranslatef(marker_pos[0], marker_pos[1], 0); + glTranslate2fv(marker_pos); if (tiny) { glLineStipple(3, 0xaaaa); @@ -805,7 +805,7 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo } glPushMatrix(); - glTranslatef(marker_pos[0], marker_pos[1], 0); + glTranslate2fv(marker_pos); dx = 6.0f / width / sc->zoom; dy = 6.0f / height / sc->zoom; @@ -1786,7 +1786,7 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d) int framenr = ED_space_clip_get_clip_frame_number(sc); MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr); - glTranslatef(marker->pos[0], marker->pos[1], 0.0f); + glTranslate2fv(marker->pos); } } diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index fa883971ac1..2579972cf0f 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -1547,7 +1547,7 @@ static void draw_pose_dofs(Object *ob) glPushMatrix(); copy_v3_v3(posetrans, pchan->pose_mat[3]); - glTranslatef(posetrans[0], posetrans[1], posetrans[2]); + glTranslate3fv(posetrans); if (pchan->parent) { copy_m4_m4(mat, pchan->parent->pose_mat); diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index f5cce277da1..4e9818deb72 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -976,7 +976,7 @@ static void drawcube_size(const float size[3]) { glPushMatrix(); - glScalef(size[0], size[1], size[2]); + glScale3fv(size); glBegin(GL_LINE_STRIP); @@ -1315,7 +1315,7 @@ static void drawlamp(View3D *v3d, RegionView3D *rv3d, Base *base, mul_v3_v3fl(v2, imat[0], circrad * 2.5f); /* center */ - glTranslatef(vec[0], vec[1], vec[2]); + glTranslate3fv(vec); setlinestyle(3); @@ -1659,7 +1659,7 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D GPU_select_load_id(base->selcol + (tracknr << 16)); glPushMatrix(); - glTranslatef(track->bundle_pos[0], track->bundle_pos[1], track->bundle_pos[2]); + glTranslate3fv(track->bundle_pos); glScalef(v3d->bundle_size / 0.05f / camera_size[0], v3d->bundle_size / 0.05f / camera_size[1], v3d->bundle_size / 0.05f / camera_size[2]); @@ -7184,7 +7184,7 @@ static void draw_bb_quadric(BoundBox *bb, char type, bool around_origin) glPushMatrix(); if (type == OB_BOUND_SPHERE) { float scale = MAX3(size[0], size[1], size[2]); - glTranslatef(cent[0], cent[1], cent[2]); + glTranslate3fv(cent); glScalef(scale, scale, scale); gluSphere(qobj, 1.0, 8, 5); } diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index d8000f03e86..2b295b85da0 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1719,7 +1719,7 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata) glVertex2fv(cent); glEnd(); - glTranslatef(mval[0], mval[1], 0); + glTranslate2fv((const float *)mval); glRotatef(-RAD2DEGF(atan2f(cent[0] - t->mval[0], cent[1] - t->mval[1])), 0, 0, 1); setlinestyle(0); @@ -1731,7 +1731,7 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata) case HLP_HARROW: UI_ThemeColor(TH_VIEW_OVERLAY); - glTranslatef(mval[0], mval[1], 0); + glTranslate2fv((const float *)mval); glLineWidth(3.0); drawArrow(RIGHT, 5, 10, 5); @@ -1741,7 +1741,7 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata) case HLP_VARROW: UI_ThemeColor(TH_VIEW_OVERLAY); - glTranslatef(mval[0], mval[1], 0); + glTranslate2fv((const float *)mval); glLineWidth(3.0); drawArrow(UP, 5, 10, 5); @@ -1792,7 +1792,7 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata) unsigned char col[3], col2[3]; UI_GetThemeColor3ubv(TH_GRID, col); - glTranslatef(mval[0], mval[1], 0); + glTranslate2fv((const float *)mval); glLineWidth(3.0); diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 374a0c3850f..f13bc6b6b55 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -643,7 +643,7 @@ static void test_manipulator_axis(const bContext *C) static float screen_aligned(RegionView3D *rv3d, float mat[4][4]) { - glTranslatef(mat[3][0], mat[3][1], mat[3][2]); + glTranslate3fv(mat[3]); /* sets view screen aligned */ glRotatef(-360.0f * saacos(rv3d->viewquat[0]) / (float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]); @@ -923,7 +923,7 @@ static void draw_manipulator_rotate( /* prepare for screen aligned draw */ size = len_v3(rv3d->twmat[0]); glPushMatrix(); - glTranslatef(rv3d->twmat[3][0], rv3d->twmat[3][1], rv3d->twmat[3][2]); + glTranslate3fv(rv3d->twmat[3]); if (arcs) { /* clipplane makes nice handles, calc here because of multmatrix but with translate! */ @@ -1362,7 +1362,7 @@ static void draw_manipulator_translate( manipulator_axis_order(rv3d, axis_order); - // XXX if (moving) glTranslatef(t->vec[0], t->vec[1], t->vec[2]); + // XXX if (moving) glTranslate3fv(t->vec); glDisable(GL_DEPTH_TEST); /* center circle, do not add to selection when shift is pressed (planar constraint) */ diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 7061b8e7603..a7aad427dd6 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -220,7 +220,7 @@ void drawSnapping(const struct bContext *C, TransInfo *t) h = (((float)hi) / IMG_SIZE_FALLBACK) * G.sima->zoom * yuser_asp; cpack(0xFFFFFF); - glTranslatef(t->tsnap.snapPoint[0], t->tsnap.snapPoint[1], 0.0f); + glTranslate2fv(t->tsnap.snapPoint); //glRectf(0, 0, 1, 1); diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 9431d754b5f..4e9ab680dc6 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -81,7 +81,7 @@ void ED_image_draw_cursor(ARegion *ar, const float cursor[2]) y_fac = zoom[1]; cpack(0xFFFFFF); - glTranslatef(cursor[0], cursor[1], 0.0); + glTranslate2fv(cursor); fdrawline(-0.05f * x_fac, 0, 0, 0.05f * y_fac); fdrawline(0, 0.05f * y_fac, 0.05f * x_fac, 0.0f); fdrawline(0.05f * x_fac, 0.0f, 0.0f, -0.05f * y_fac); -- cgit v1.2.3