diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-26 11:29:01 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-26 11:29:01 +0400 |
commit | 64d161de87c82094ce8ea63bc69aded59f7f588d (patch) | |
tree | 933a100be152419309c2d01e0874f9f3981828d1 /source/blender/blenkernel/intern | |
parent | ef961319e077fb97cde958fd61845afcc775c67c (diff) |
style cleanup:
also rename mesh_getVertexCos() --> BKE_mesh_vertexCos_get() to match curve function.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 40 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/bmfont.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/brush.c | 7 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 2 |
7 files changed, 32 insertions, 29 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index b2a5a3a5593..cc0770cd186 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -845,7 +845,7 @@ DerivedMesh *mesh_create_derived_for_modifier(Scene *scene, Object *ob, if (mti->type == eModifierTypeType_OnlyDeform) { int numVerts; - float (*deformedVerts)[3] = mesh_getVertexCos(me, &numVerts); + float (*deformedVerts)[3] = BKE_mesh_vertexCos_get(me, &numVerts); mti->deformVerts(md, ob, NULL, deformedVerts, numVerts, 0); dm = mesh_create_derived(me, ob, deformedVerts); @@ -1451,7 +1451,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos if (mti->type == eModifierTypeType_OnlyDeform && !sculpt_dyntopo) { if (!deformedVerts) - deformedVerts = mesh_getVertexCos(me, &numVerts); + deformedVerts = BKE_mesh_vertexCos_get(me, &numVerts); mti->deformVerts(md, ob, NULL, deformedVerts, numVerts, deform_app_flags); } @@ -1485,7 +1485,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos if (inputVertexCos) deformedVerts = inputVertexCos; else - deformedVerts = mesh_getVertexCos(me, &numVerts); + deformedVerts = BKE_mesh_vertexCos_get(me, &numVerts); } @@ -1557,7 +1557,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos dm->getVertCos(dm, deformedVerts); } else { - deformedVerts = mesh_getVertexCos(me, &numVerts); + deformedVerts = BKE_mesh_vertexCos_get(me, &numVerts); } } @@ -2441,30 +2441,30 @@ static int GetNumVertsOfFace(const SMikkTSpaceContext *pContext, const int face_ return pMesh->mface[face_num].v4 != 0 ? 4 : 3; } -static void GetPosition(const SMikkTSpaceContext *pContext, float fPos[], const int face_num, const int vert_index) +static void GetPosition(const SMikkTSpaceContext *pContext, float r_co[3], const int face_num, const int vert_index) { //assert(vert_index >= 0 && vert_index < 4); SGLSLMeshToTangent *pMesh = (SGLSLMeshToTangent *) pContext->m_pUserData; const float *co = pMesh->mvert[(&pMesh->mface[face_num].v1)[vert_index]].co; - copy_v3_v3(fPos, co); + copy_v3_v3(r_co, co); } -static void GetTextureCoordinate(const SMikkTSpaceContext *pContext, float fUV[], const int face_num, const int vert_index) +static void GetTextureCoordinate(const SMikkTSpaceContext *pContext, float r_uv[2], const int face_num, const int vert_index) { //assert(vert_index >= 0 && vert_index < 4); SGLSLMeshToTangent *pMesh = (SGLSLMeshToTangent *) pContext->m_pUserData; if (pMesh->mtface != NULL) { - float *uv = pMesh->mtface[face_num].uv[vert_index]; - fUV[0] = uv[0]; fUV[1] = uv[1]; + const float *uv = pMesh->mtface[face_num].uv[vert_index]; + copy_v2_v2(r_uv, uv); } else { const float *orco = pMesh->orco[(&pMesh->mface[face_num].v1)[vert_index]]; - map_to_sphere(&fUV[0], &fUV[1], orco[0], orco[1], orco[2]); + map_to_sphere(&r_uv[0], &r_uv[1], orco[0], orco[1], orco[2]); } } -static void GetNormal(const SMikkTSpaceContext *pContext, float fNorm[], const int face_num, const int vert_index) +static void GetNormal(const SMikkTSpaceContext *pContext, float r_no[3], const int face_num, const int vert_index) { //assert(vert_index >= 0 && vert_index < 4); SGLSLMeshToTangent *pMesh = (SGLSLMeshToTangent *) pContext->m_pUserData; @@ -2472,29 +2472,29 @@ static void GetNormal(const SMikkTSpaceContext *pContext, float fNorm[], const i const int smoothnormal = (pMesh->mface[face_num].flag & ME_SMOOTH); if (!smoothnormal) { // flat if (pMesh->precomputedFaceNormals) { - copy_v3_v3(fNorm, &pMesh->precomputedFaceNormals[3 * face_num]); + copy_v3_v3(r_no, &pMesh->precomputedFaceNormals[3 * face_num]); } else { MFace *mf = &pMesh->mface[face_num]; - float *p0 = pMesh->mvert[mf->v1].co; - float *p1 = pMesh->mvert[mf->v2].co; - float *p2 = pMesh->mvert[mf->v3].co; + const float *p0 = pMesh->mvert[mf->v1].co; + const float *p1 = pMesh->mvert[mf->v2].co; + const float *p2 = pMesh->mvert[mf->v3].co; if (mf->v4) { - float *p3 = pMesh->mvert[mf->v4].co; - normal_quad_v3(fNorm, p0, p1, p2, p3); + const float *p3 = pMesh->mvert[mf->v4].co; + normal_quad_v3(r_no, p0, p1, p2, p3); } else { - normal_tri_v3(fNorm, p0, p1, p2); + normal_tri_v3(r_no, p0, p1, p2); } } } else { const short *no = pMesh->mvert[(&pMesh->mface[face_num].v1)[vert_index]].no; - normal_short_to_float_v3(fNorm, no); + normal_short_to_float_v3(r_no, no); } } -static void SetTSpace(const SMikkTSpaceContext *pContext, const float fvTangent[], const float fSign, const int face_num, const int iVert) +static void SetTSpace(const SMikkTSpaceContext *pContext, const float fvTangent[3], const float fSign, const int face_num, const int iVert) { //assert(vert_index >= 0 && vert_index < 4); SGLSLMeshToTangent *pMesh = (SGLSLMeshToTangent *) pContext->m_pUserData; diff --git a/source/blender/blenkernel/intern/bmfont.c b/source/blender/blenkernel/intern/bmfont.c index 78da4f5b1c2..a95e5bd8ed5 100644 --- a/source/blender/blenkernel/intern/bmfont.c +++ b/source/blender/blenkernel/intern/bmfont.c @@ -38,7 +38,7 @@ * detects if an image buffer contains a bitmap font. It makes the * specific bitmap data which is stored in the bitmap invisible to blender. * - * void matrixGlyph(ImBuf * ibuf, unsigned short unicode, *float x 7) + * void matrixGlyph(ImBuf *ibuf, unsigned short unicode, *float x 7) * returns all the information about the character (unicode) in the floats * * Room for improvement: @@ -248,7 +248,7 @@ int locateGlyph(bmFont *bmfont, unsigned short unicode) } void matrixGlyph( - ImBuf * ibuf, unsigned short unicode, + ImBuf *ibuf, unsigned short unicode, float *centerx, float *centery, float *sizex, float *sizey, float *transx, float *transy, diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 18edb6e3500..888426735c5 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -417,8 +417,11 @@ void BKE_brush_sculpt_reset(Brush *br) } } -/* Library Operations */ -void BKE_brush_curve_preset(Brush *b, /*CurveMappingPreset*/ int preset) +/** + * Library Operations + * \param preset CurveMappingPreset + */ +void BKE_brush_curve_preset(Brush *b, int preset) { CurveMap *cm = NULL; diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 5fba308e3df..853a55b49c2 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -3204,7 +3204,7 @@ void BKE_nurb_direction_switch(Nurb *nu) } -float (*BKE_curve_vertexCos_get(Curve * UNUSED(cu), ListBase * lb, int *numVerts_r))[3] +float (*BKE_curve_vertexCos_get(Curve *UNUSED(cu), ListBase *lb, int *numVerts_r))[3] { int i, numVerts = *numVerts_r = BKE_nurbList_verts_count(lb); float *co, (*cos)[3] = MEM_mallocN(sizeof(*cos) * numVerts, "cu_vcos"); @@ -3261,7 +3261,7 @@ void BK_curve_vertexCos_apply(Curve *UNUSED(cu), ListBase *lb, float (*vertexCos } } -float (*BKE_curve_keyVertexCos_get(Curve * UNUSED(cu), ListBase * lb, float *key))[3] +float (*BKE_curve_keyVertexCos_get(Curve *UNUSED(cu), ListBase *lb, float *key))[3] { int i, numVerts = BKE_nurbList_verts_count(lb); float *co, (*cos)[3] = MEM_mallocN(sizeof(*cos) * numVerts, "cu_vcos"); diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index e4d7814c4e1..0b55c732ade 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -850,7 +850,7 @@ static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, fl *numVerts_r = numVerts; } -static float (*displist_get_allverts(ListBase * dispbase, int *totvert))[3] +static float (*displist_get_allverts(ListBase *dispbase, int *totvert))[3] { DispList *dl; float (*allverts)[3], *fp; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index b36f484f4ee..408fadde564 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -2190,7 +2190,7 @@ void BKE_mesh_convert_mfaces_to_mpolys_ex(ID *id, CustomData *fdata, CustomData *mloop_r = mloop; } -float (*mesh_getVertexCos(Mesh * me, int *r_numVerts))[3] +float (*BKE_mesh_vertexCos_get(Mesh *me, int *r_numVerts))[3] { int i, numVerts = me->totvert; float (*cos)[3] = MEM_mallocN(sizeof(*cos) * numVerts, "vertexcos1"); diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 5efeeaeedaa..4f3678098ec 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -1698,7 +1698,7 @@ void BKE_pbvh_node_layer_disp_free(PBVHNode *node) } } -float (*BKE_pbvh_get_vertCos(PBVH * pbvh))[3] +float (*BKE_pbvh_get_vertCos(PBVH *pbvh))[3] { int a; float (*vertCos)[3] = NULL; |