archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

ClangFormat: apply to source, most of intern

Browse Source 
Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat
This commit is contained in:
Campbell Barton
2019-04-17 06:17:24 +02:00
parent b3dabc200a
commit e12c08e8d1
4481 changed files with 1230080 additions and 1155401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

220
source/blender/editors/mesh/editmesh_preselect_elem.c
View File

@@ -47,166 +47,166 @@
static void vcos_get(BMVert *v, float r_co[3], const float (*coords)[3])
{
if (coords) {
copy_v3_v3(r_co, coords[BM_elem_index_get(v)]);
}
else {
copy_v3_v3(r_co, v->co);
}
if (coords) {
copy_v3_v3(r_co, coords[BM_elem_index_get(v)]);
}
else {
copy_v3_v3(r_co, v->co);
}
}
static void vcos_get_pair(BMVert *v[2], float r_cos[2][3], const float (*coords)[3])
{
if (coords) {
for (int j = 0; j < 2; j++) {
copy_v3_v3(r_cos[j], coords[BM_elem_index_get(v[j])]);
}
}
else {
for (int j = 0; j < 2; j++) {
copy_v3_v3(r_cos[j], v[j]->co);
}
}
if (coords) {
for (int j = 0; j < 2; j++) {
copy_v3_v3(r_cos[j], coords[BM_elem_index_get(v[j])]);
}
}
else {
for (int j = 0; j < 2; j++) {
copy_v3_v3(r_cos[j], v[j]->co);
}
}
}
struct EditMesh_PreSelElem {
float (*edges)[2][3];
int edges_len;
float (*edges)[2][3];
int edges_len;
float (*verts)[3];
int verts_len;
float (*verts)[3];
int verts_len;
};
struct EditMesh_PreSelElem *EDBM_preselect_elem_create(void)
{
struct EditMesh_PreSelElem *psel = MEM_callocN(sizeof(*psel), __func__);
return psel;
struct EditMesh_PreSelElem *psel = MEM_callocN(sizeof(*psel), __func__);
return psel;
}
void EDBM_preselect_elem_destroy(
struct EditMesh_PreSelElem *psel)
void EDBM_preselect_elem_destroy(struct EditMesh_PreSelElem *psel)
{
EDBM_preselect_elem_clear(psel);
MEM_freeN(psel);
EDBM_preselect_elem_clear(psel);
MEM_freeN(psel);
}
void EDBM_preselect_elem_clear(
struct EditMesh_PreSelElem *psel)
void EDBM_preselect_elem_clear(struct EditMesh_PreSelElem *psel)
{
MEM_SAFE_FREE(psel->edges);
psel->edges_len = 0;
MEM_SAFE_FREE(psel->edges);
psel->edges_len = 0;
MEM_SAFE_FREE(psel->verts);
psel->verts_len = 0;
MEM_SAFE_FREE(psel->verts);
psel->verts_len = 0;
}
void EDBM_preselect_elem_draw(
struct EditMesh_PreSelElem *psel, const float matrix[4][4])
void EDBM_preselect_elem_draw(struct EditMesh_PreSelElem *psel, const float matrix[4][4])
{
if ((psel->edges_len == 0) && (psel->verts_len == 0)) {
return;
}
if ((psel->edges_len == 0) && (psel->verts_len == 0)) {
return;
}
GPU_depth_test(false);
GPU_depth_test(false);
GPU_matrix_push();
GPU_matrix_mul(matrix);
GPU_matrix_push();
GPU_matrix_mul(matrix);
uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
immUniformColor3ub(255, 0, 255);
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
immUniformColor3ub(255, 0, 255);
if (psel->edges_len > 0) {
immBegin(GPU_PRIM_LINES, psel->edges_len * 2);
if (psel->edges_len > 0) {
immBegin(GPU_PRIM_LINES, psel->edges_len * 2);
for (int i = 0; i < psel->edges_len; i++) {
immVertex3fv(pos, psel->edges[i][0]);
immVertex3fv(pos, psel->edges[i][1]);
}
for (int i = 0; i < psel->edges_len; i++) {
immVertex3fv(pos, psel->edges[i][0]);
immVertex3fv(pos, psel->edges[i][1]);
}
immEnd();
}
immEnd();
}
if (psel->verts_len > 0) {
GPU_point_size(3.0f);
if (psel->verts_len > 0) {
GPU_point_size(3.0f);
immBegin(GPU_PRIM_POINTS, psel->verts_len);
immBegin(GPU_PRIM_POINTS, psel->verts_len);
for (int i = 0; i < psel->verts_len; i++) {
immVertex3fv(pos, psel->verts[i]);
}
for (int i = 0; i < psel->verts_len; i++) {
immVertex3fv(pos, psel->verts[i]);
}
immEnd();
}
immEnd();
}
immUnbindProgram();
immUnbindProgram();
GPU_matrix_pop();
GPU_matrix_pop();
/* Reset default */
GPU_depth_test(true);
/* Reset default */
GPU_depth_test(true);
}
static void view3d_preselect_mesh_elem_update_from_vert(
struct EditMesh_PreSelElem *psel,
BMesh *UNUSED(bm), BMVert *eve, const float (*coords)[3])
static void view3d_preselect_mesh_elem_update_from_vert(struct EditMesh_PreSelElem *psel,
BMesh *UNUSED(bm),
BMVert *eve,
const float (*coords)[3])
{
float (*verts)[3] = MEM_mallocN(sizeof(*psel->verts), __func__);
vcos_get(eve, verts[0], coords);
psel->verts = verts;
psel->verts_len = 1;
float(*verts)[3] = MEM_mallocN(sizeof(*psel->verts), __func__);
vcos_get(eve, verts[0], coords);
psel->verts = verts;
psel->verts_len = 1;
}
static void view3d_preselect_mesh_elem_update_from_edge(
struct EditMesh_PreSelElem *psel,
BMesh *UNUSED(bm), BMEdge *eed, const float (*coords)[3])
static void view3d_preselect_mesh_elem_update_from_edge(struct EditMesh_PreSelElem *psel,
BMesh *UNUSED(bm),
BMEdge *eed,
const float (*coords)[3])
{
float (*edges)[2][3] = MEM_mallocN(sizeof(*psel->edges), __func__);
vcos_get_pair(&eed->v1, edges[0], coords);
psel->edges = edges;
psel->edges_len = 1;
float(*edges)[2][3] = MEM_mallocN(sizeof(*psel->edges), __func__);
vcos_get_pair(&eed->v1, edges[0], coords);
psel->edges = edges;
psel->edges_len = 1;
}
static void view3d_preselect_mesh_elem_update_from_face(
struct EditMesh_PreSelElem *psel,
BMesh *UNUSED(bm), BMFace *efa, const float (*coords)[3])
static void view3d_preselect_mesh_elem_update_from_face(struct EditMesh_PreSelElem *psel,
BMesh *UNUSED(bm),
BMFace *efa,
const float (*coords)[3])
{
float (*edges)[2][3] = MEM_mallocN(sizeof(*psel->edges) * efa->len, __func__);
BMLoop *l_iter, *l_first;
l_iter = l_first = BM_FACE_FIRST_LOOP(efa);
int i = 0;
do {
vcos_get_pair(&l_iter->e->v1, edges[i++], coords);
} while ((l_iter = l_iter->next) != l_first);
psel->edges = edges;
psel->edges_len = efa->len;
float(*edges)[2][3] = MEM_mallocN(sizeof(*psel->edges) * efa->len, __func__);
BMLoop *l_iter, *l_first;
l_iter = l_first = BM_FACE_FIRST_LOOP(efa);
int i = 0;
do {
vcos_get_pair(&l_iter->e->v1, edges[i++], coords);
} while ((l_iter = l_iter->next) != l_first);
psel->edges = edges;
psel->edges_len = efa->len;
}
void EDBM_preselect_elem_update_from_single(
struct EditMesh_PreSelElem *psel,
BMesh *bm, BMElem *ele,
const float (*coords)[3])
void EDBM_preselect_elem_update_from_single(struct EditMesh_PreSelElem *psel,
BMesh *bm,
BMElem *ele,
const float (*coords)[3])
{
EDBM_preselect_elem_clear(psel);
EDBM_preselect_elem_clear(psel);
if (coords) {
BM_mesh_elem_index_ensure(bm, BM_VERT);
}
if (coords) {
BM_mesh_elem_index_ensure(bm, BM_VERT);
}
switch (ele->head.htype) {
case BM_VERT:
view3d_preselect_mesh_elem_update_from_vert(psel, bm, (BMVert *)ele, coords);
break;
case BM_EDGE:
view3d_preselect_mesh_elem_update_from_edge(psel, bm, (BMEdge *)ele, coords);
break;
case BM_FACE:
view3d_preselect_mesh_elem_update_from_face(psel, bm, (BMFace *)ele, coords);
break;
default:
BLI_assert(0);
}
switch (ele->head.htype) {
case BM_VERT:
view3d_preselect_mesh_elem_update_from_vert(psel, bm, (BMVert *)ele, coords);
break;
case BM_EDGE:
view3d_preselect_mesh_elem_update_from_edge(psel, bm, (BMEdge *)ele, coords);
break;
case BM_FACE:
view3d_preselect_mesh_elem_update_from_face(psel, bm, (BMFace *)ele, coords);
break;
default:
BLI_assert(0);
}
}
/** \} */