Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2017-04-05 03:45:23 +0300
committerMike Erwin <significant.bit@gmail.com>2017-04-06 08:18:12 +0300
commitc2f5cd8f6454bf8256a39a5fc9cb075311e25c58 (patch)
treec0c9f803f810c2be81c9b302d814ac4989a559ed /source/blender/editors/space_view3d/drawarmature.c
parent957b408458140d1cfc72395d62189918bac5b5c7 (diff)
Gawain: add VertexBuffer prefix to functions
See intern/gawain for the API change. Other files are updated to use the new names.
Diffstat (limited to 'source/blender/editors/space_view3d/drawarmature.c')
-rw-r--r--source/blender/editors/space_view3d/drawarmature.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index 3b2791b7a62..f0c47ee2639 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -334,12 +334,12 @@ static void set_ebone_color(const unsigned int boneflag)
static void add_solid_flat_triangle(VertexBuffer *vbo, unsigned int *vertex, unsigned int pos, unsigned int nor,
const float p1[3], const float p2[3], const float p3[3], const float n[3])
{
- setAttrib(vbo, nor, *vertex, n);
- setAttrib(vbo, pos, (*vertex)++, p1);
- setAttrib(vbo, nor, *vertex, n);
- setAttrib(vbo, pos, (*vertex)++, p2);
- setAttrib(vbo, nor, *vertex, n);
- setAttrib(vbo, pos, (*vertex)++, p3);
+ VertexBuffer_set_attrib(vbo, nor, *vertex, n);
+ VertexBuffer_set_attrib(vbo, pos, (*vertex)++, p1);
+ VertexBuffer_set_attrib(vbo, nor, *vertex, n);
+ VertexBuffer_set_attrib(vbo, pos, (*vertex)++, p2);
+ VertexBuffer_set_attrib(vbo, nor, *vertex, n);
+ VertexBuffer_set_attrib(vbo, pos, (*vertex)++, p3);
}
/* half the cube, in Y */
@@ -444,7 +444,7 @@ static void drawcube_size(float xsize, float ysize, float zsize)
VertexBuffer_init_with_format(&vbo, &format);
VertexBuffer_allocate_data(&vbo, 8);
for (int i = 0; i < 8; ++i) {
- setAttrib(&vbo, pos, i, cube_vert[i]);
+ VertexBuffer_set_attrib(&vbo, pos, i, cube_vert[i]);
}
Batch_init(&batch, GL_LINES, &vbo, &el);
@@ -481,26 +481,26 @@ static void draw_bonevert(void)
vert[0] = r * cosf(2 * M_PI * i / 16.f);
vert[1] = r * sinf(2 * M_PI * i / 16.f);
- setAttrib(&vbo, pos, i * 6 + 0, vert);
+ VertexBuffer_set_attrib(&vbo, pos, i * 6 + 0, vert);
vert[0] = r * cosf(2 * M_PI * (i + 1) / 16.f);
vert[1] = r * sinf(2 * M_PI * (i + 1) / 16.f);
- setAttrib(&vbo, pos, i * 6 + 1, vert);
+ VertexBuffer_set_attrib(&vbo, pos, i * 6 + 1, vert);
vert[0] = 0.f;
vert[1] = r * cosf(2 * M_PI * i / 16.f);
vert[2] = r * sinf(2 * M_PI * i / 16.f);
- setAttrib(&vbo, pos, i * 6 + 2, vert);
+ VertexBuffer_set_attrib(&vbo, pos, i * 6 + 2, vert);
vert[1] = r * cosf(2 * M_PI * (i + 1) / 16.f);
vert[2] = r * sinf(2 * M_PI * (i + 1) / 16.f);
- setAttrib(&vbo, pos, i * 6 + 3, vert);
+ VertexBuffer_set_attrib(&vbo, pos, i * 6 + 3, vert);
vert[1] = 0.f;
vert[0] = r * cosf(2 * M_PI * i / 16.f);
vert[2] = r * sinf(2 * M_PI * i / 16.f);
- setAttrib(&vbo, pos, i * 6 + 4, vert);
+ VertexBuffer_set_attrib(&vbo, pos, i * 6 + 4, vert);
vert[0] = r * cosf(2 * M_PI * (i + 1) / 16.f);
vert[2] = r * sinf(2 * M_PI * (i + 1) / 16.f);
- setAttrib(&vbo, pos, i * 6 + 5, vert);
+ VertexBuffer_set_attrib(&vbo, pos, i * 6 + 5, vert);
}
Batch_init(&batch, GL_LINES, &vbo, NULL);
@@ -596,7 +596,7 @@ static void draw_bone_octahedral(void)
VertexBuffer_init_with_format(&vbo, &format);
VertexBuffer_allocate_data(&vbo, 6);
for (int i = 0; i < 6; ++i) {
- setAttrib(&vbo, pos, i, bone_octahedral_verts[i]);
+ VertexBuffer_set_attrib(&vbo, pos, i, bone_octahedral_verts[i]);
}
Batch_init(&batch, GL_LINES, &vbo, &el);