From 64d161de87c82094ce8ea63bc69aded59f7f588d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 26 Mar 2013 07:29:01 +0000 Subject: style cleanup: also rename mesh_getVertexCos() --> BKE_mesh_vertexCos_get() to match curve function. --- source/blender/avi/intern/avi_intern.h | 4 +- source/blender/blenkernel/BKE_brush.h | 2 +- source/blender/blenkernel/BKE_effect.h | 2 +- source/blender/blenkernel/BKE_mesh.h | 2 +- source/blender/blenkernel/BKE_particle.h | 2 +- source/blender/blenkernel/BKE_pbvh.h | 6 +- source/blender/blenkernel/BKE_sketch.h | 2 +- source/blender/blenkernel/BKE_softbody.h | 2 +- source/blender/blenkernel/intern/DerivedMesh.c | 40 +++++----- source/blender/blenkernel/intern/bmfont.c | 4 +- source/blender/blenkernel/intern/brush.c | 7 +- source/blender/blenkernel/intern/curve.c | 4 +- source/blender/blenkernel/intern/displist.c | 2 +- source/blender/blenkernel/intern/mesh.c | 2 +- source/blender/blenkernel/intern/pbvh.c | 2 +- source/blender/blenlib/BLI_fileops.h | 2 +- source/blender/blenlib/BLI_math_rotation.h | 6 +- source/blender/blenlib/BLI_path_util.h | 4 +- source/blender/blenlib/intern/math_color.c | 2 +- source/blender/blenlib/intern/path_util.c | 2 +- source/blender/blenloader/intern/readfile.c | 8 +- source/blender/blenloader/intern/versioning_250.c | 2 +- source/blender/collada/ArmatureImporter.cpp | 2 +- source/blender/collada/TransformWriter.cpp | 2 +- source/blender/editors/armature/pose_slide.c | 3 +- source/blender/editors/gpencil/gpencil_paint.c | 4 +- source/blender/editors/include/BIF_glutil.h | 2 +- .../blender/editors/interface/interface_intern.h | 4 +- source/blender/editors/sculpt_paint/paint_intern.h | 2 +- source/blender/editors/sculpt_paint/sculpt.c | 2 +- source/blender/editors/space_node/node_intern.h | 2 +- .../editors/space_sequencer/sequencer_intern.h | 10 +-- source/blender/editors/util/crazyspace.c | 4 +- source/blender/imbuf/IMB_imbuf.h | 10 +-- source/blender/imbuf/intern/IMB_filetype.h | 8 +- source/blender/imbuf/intern/IMB_indexer.h | 16 ++-- source/blender/imbuf/intern/dds/BlockDXT.cpp | 22 +++--- source/blender/imbuf/intern/dds/ColorBlock.cpp | 20 ++--- source/blender/imbuf/intern/dds/dds_api.cpp | 4 +- source/blender/python/mathutils/mathutils.h | 4 +- source/blender/quicktime/apple/qtkit_export.m | 2 +- source/blender/quicktime/apple/qtkit_import.m | 12 +-- source/blender/quicktime/quicktime_import.h | 10 +-- source/blender/render/extern/include/RE_pipeline.h | 14 ++-- source/blender/render/intern/include/raycounter.h | 2 +- source/blender/render/intern/include/zbuf.h | 4 +- .../render/intern/raytrace/rayobject_blibvh.cpp | 2 +- .../render/intern/raytrace/rayobject_internal.h | 2 +- .../blender/render/intern/source/convertblender.c | 46 +++++------ .../blender/render/intern/source/render_texture.c | 2 +- source/blender/render/intern/source/zbuf.c | 4 +- source/blender/windowmanager/WM_api.h | 2 +- source/blenderplayer/bad_level_call_stubs/stubs.c | 8 +- .../BlenderRoutines/KX_BlenderCanvas.cpp | 2 +- source/gameengine/BlenderRoutines/KX_BlenderGL.cpp | 6 +- source/gameengine/BlenderRoutines/KX_BlenderGL.h | 2 +- .../BlenderRoutines/KX_BlenderRenderTools.cpp | 2 +- source/gameengine/Converter/BL_ActionActuator.cpp | 2 +- source/gameengine/Expressions/EmptyValue.cpp | 4 +- source/gameengine/Expressions/KX_HashedPtr.cpp | 2 +- source/gameengine/Expressions/KX_HashedPtr.h | 2 +- source/gameengine/Expressions/ListValue.cpp | 4 +- source/gameengine/Expressions/Operator1Expr.cpp | 2 +- source/gameengine/Expressions/Value.cpp | 2 +- source/gameengine/Expressions/VectorValue.cpp | 4 +- source/gameengine/Expressions/VectorValue.h | 4 +- .../GamePlayer/common/GPC_RenderTools.cpp | 2 +- source/gameengine/GamePlayer/common/bmfont.cpp | 14 ++-- source/gameengine/Ketsji/KX_ConstraintActuator.cpp | 4 +- source/gameengine/Ketsji/KX_Dome.cpp | 2 +- source/gameengine/Ketsji/KX_GameObject.cpp | 6 +- source/gameengine/Ketsji/KX_MeshProxy.cpp | 8 +- source/gameengine/Ketsji/KX_MouseFocusSensor.cpp | 2 +- source/gameengine/Ketsji/KX_NearSensor.cpp | 6 +- source/gameengine/Ketsji/KX_PythonSeq.cpp | 10 +-- source/gameengine/Ketsji/KX_RayCast.cpp | 2 +- source/gameengine/Ketsji/KX_RaySensor.cpp | 4 +- source/gameengine/Ketsji/KX_Scene.cpp | 2 +- source/gameengine/Ketsji/KX_SceneActuator.cpp | 2 +- source/gameengine/Ketsji/KX_TouchEventManager.cpp | 2 +- source/gameengine/Ketsji/KX_TouchSensor.cpp | 10 +-- .../Physics/Bullet/CcdPhysicsEnvironment.cpp | 2 +- source/gameengine/SceneGraph/SG_IObject.h | 6 +- source/gameengine/VideoTexture/Exception.cpp | 6 +- source/gameengine/VideoTexture/FilterBase.cpp | 2 +- source/gameengine/VideoTexture/FilterColor.cpp | 4 +- source/gameengine/VideoTexture/ImageBase.cpp | 16 ++-- source/gameengine/VideoTexture/ImageBase.h | 90 +++++++++++----------- source/gameengine/VideoTexture/ImageRender.cpp | 2 +- source/gameengine/VideoTexture/ImageViewport.h | 12 +-- source/gameengine/VideoTexture/VideoFFmpeg.cpp | 6 +- source/gameengine/VideoTexture/VideoFFmpeg.h | 4 +- 92 files changed, 304 insertions(+), 300 deletions(-) diff --git a/source/blender/avi/intern/avi_intern.h b/source/blender/avi/intern/avi_intern.h index 5dc48657831..f3e33ecf86f 100644 --- a/source/blender/avi/intern/avi_intern.h +++ b/source/blender/avi/intern/avi_intern.h @@ -34,8 +34,8 @@ #include /* for FILE */ -unsigned int GET_FCC (FILE *fp); -unsigned int GET_TCC (FILE *fp); +unsigned int GET_FCC(FILE *fp); +unsigned int GET_TCC(FILE *fp); #define PUT_FCC(ch4, fp) \ { \ diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index 23e96732386..17ef8e901f4 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -69,7 +69,7 @@ void BKE_brush_jitter_pos(const struct Scene *scene, struct Brush *brush, const float pos[2], float jitterpos[2]); /* brush curve */ -void BKE_brush_curve_preset(struct Brush *b, /*enum CurveMappingPreset*/ int preset); +void BKE_brush_curve_preset(struct Brush *b, int preset); float BKE_brush_curve_strength_clamp(struct Brush *br, float p, const float len); float BKE_brush_curve_strength(struct Brush *br, float p, const float len); /* used for sculpt */ diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h index e9d37fb4407..562a67f14f5 100644 --- a/source/blender/blenkernel/BKE_effect.h +++ b/source/blender/blenkernel/BKE_effect.h @@ -120,7 +120,7 @@ void pd_point_from_soft(struct Scene *scene, float *loc, float *vel, int index, /* needed for boids */ float effector_falloff(struct EffectorCache *eff, struct EffectorData *efd, struct EffectedPoint *point, struct EffectorWeights *weights); -int closest_point_on_surface(SurfaceModifierData * surmd, const float co[3], float surface_co[3], float surface_nor[3], float surface_vel[3]); +int closest_point_on_surface(SurfaceModifierData *surmd, const float co[3], float surface_co[3], float surface_nor[3], float surface_vel[3]); int get_effector_data(struct EffectorCache *eff, struct EffectorData *efd, struct EffectedPoint *point, int real_velocity); /* required for particle_system.c */ diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 71024a4ead2..429dacb90ef 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -221,7 +221,7 @@ void BKE_mesh_calc_normals( /* Return a newly MEM_malloc'd array of all the mesh vertex locations * (_numVerts_r_ may be NULL) */ -float (*mesh_getVertexCos(struct Mesh *me, int *r_numVerts))[3]; +float (*BKE_mesh_vertexCos_get(struct Mesh *me, int *r_numVerts))[3]; /* map from uv vertex to face (for select linked, stitch, uv suburf) */ diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 6c207675cb1..1009472cf40 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -321,7 +321,7 @@ void psys_get_dupli_path_transform(struct ParticleSimulationData *sim, struct Pa ParticleThread *psys_threads_create(struct ParticleSimulationData *sim); void psys_threads_free(ParticleThread *threads); -void psys_make_billboard(ParticleBillboardData * bb, float xvec[3], float yvec[3], float zvec[3], float center[3]); +void psys_make_billboard(ParticleBillboardData *bb, float xvec[3], float yvec[3], float zvec[3], float center[3]); void psys_apply_hair_lattice(struct Scene *scene, struct Object *ob, struct ParticleSystem *psys); /* particle_system.c */ diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h index cdc8ef0bdf4..3d73674d990 100644 --- a/source/blender/blenkernel/BKE_pbvh.h +++ b/source/blender/blenkernel/BKE_pbvh.h @@ -163,8 +163,8 @@ void BKE_pbvh_node_num_verts(PBVH *bvh, PBVHNode *node, void BKE_pbvh_node_get_verts(PBVH *bvh, PBVHNode *node, int **vert_indices, struct MVert **verts); -void BKE_pbvh_node_get_BB(PBVHNode * node, float bb_min[3], float bb_max[3]); -void BKE_pbvh_node_get_original_BB(PBVHNode * node, float bb_min[3], float bb_max[3]); +void BKE_pbvh_node_get_BB(PBVHNode *node, float bb_min[3], float bb_max[3]); +void BKE_pbvh_node_get_original_BB(PBVHNode *node, float bb_min[3], float bb_max[3]); float BKE_pbvh_node_get_tmin(PBVHNode *node); @@ -181,7 +181,7 @@ void BKE_pbvh_bmesh_after_stroke(PBVH *bvh); /* Update Normals/Bounding Box/Draw Buffers/Redraw and clear flags */ void BKE_pbvh_update(PBVH *bvh, int flags, float (*face_nors)[3]); -void BKE_pbvh_redraw_BB(PBVH * bvh, float bb_min[3], float bb_max[3]); +void BKE_pbvh_redraw_BB(PBVH *bvh, float bb_min[3], float bb_max[3]); void BKE_pbvh_get_grid_updates(PBVH *bvh, int clear, void ***gridfaces, int *totface); void BKE_pbvh_grids_update(PBVH *bvh, struct CCGElem **grid_elems, struct DMGridAdjacency *gridadj, void **gridfaces, diff --git a/source/blender/blenkernel/BKE_sketch.h b/source/blender/blenkernel/BKE_sketch.h index ed7ce05506d..c4cfcba4b35 100644 --- a/source/blender/blenkernel/BKE_sketch.h +++ b/source/blender/blenkernel/BKE_sketch.h @@ -126,7 +126,7 @@ void sk_appendStrokePoint(SK_Stroke *stk, SK_Point *pt); void sk_insertStrokePoints(SK_Stroke *stk, SK_Point *pts, int len, int start, int end); void sk_trimStroke(SK_Stroke *stk, int start, int end); -void sk_straightenStroke(SK_Stroke * stk, int start, int end, float p_start[3], float p_end[3]); +void sk_straightenStroke(SK_Stroke *stk, int start, int end, float p_start[3], float p_end[3]); void sk_polygonizeStroke(SK_Stroke *stk, int start, int end); void sk_flattenStroke(SK_Stroke *stk, int start, int end); void sk_reverseStroke(SK_Stroke *stk); diff --git a/source/blender/blenkernel/BKE_softbody.h b/source/blender/blenkernel/BKE_softbody.h index 95581958328..486fe8ed5a8 100644 --- a/source/blender/blenkernel/BKE_softbody.h +++ b/source/blender/blenkernel/BKE_softbody.h @@ -68,7 +68,7 @@ extern void sbObjectToSoftbody(struct Object *ob); /* pass NULL to unlink again */ extern void sbSetInterruptCallBack(int (*f)(void)); -extern void SB_estimate_transform(Object * ob, float lloc[3], float lrot[3][3], float lscale[3][3]); +extern void SB_estimate_transform(Object *ob, float lloc[3], float lrot[3][3], float lscale[3][3]); #endif 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; diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h index b0e3f47b627..0a6d95df40a 100644 --- a/source/blender/blenlib/BLI_fileops.h +++ b/source/blender/blenlib/BLI_fileops.h @@ -66,7 +66,7 @@ double BLI_dir_free_space(const char *dir); char *BLI_current_working_dir(char *dir, const size_t maxlen); unsigned int BLI_dir_contents(const char *dir, struct direntry **filelist); -void BLI_free_filelist(struct direntry * filelist, unsigned int nrentries); +void BLI_free_filelist(struct direntry *filelist, unsigned int nrentries); /* Files */ diff --git a/source/blender/blenlib/BLI_math_rotation.h b/source/blender/blenlib/BLI_math_rotation.h index 5ba37d70ca5..d35ef05a7a4 100644 --- a/source/blender/blenlib/BLI_math_rotation.h +++ b/source/blender/blenlib/BLI_math_rotation.h @@ -172,10 +172,10 @@ typedef struct DualQuat { void copy_dq_dq(DualQuat *r, DualQuat *dq); void normalize_dq(DualQuat *dq, float totw); void add_weighted_dq_dq(DualQuat *r, DualQuat *dq, float weight); -void mul_v3m3_dq(float r[3], float R[3][3], DualQuat * dq); +void mul_v3m3_dq(float r[3], float R[3][3], DualQuat *dq); -void mat4_to_dquat(DualQuat * r, float base[4][4], float M[4][4]); -void dquat_to_mat4(float R[4][4], DualQuat * dq); +void mat4_to_dquat(DualQuat *r, float base[4][4], float M[4][4]); +void dquat_to_mat4(float R[4][4], DualQuat *dq); void quat_apply_track(float quat[4], short axis, short upflag); void vec_apply_track(float vec[3], short axis); diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index 1ba3c8b619c..a36627bd903 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -111,8 +111,8 @@ bool BLI_testextensie_array(const char *str, const char **ext_array); bool BLI_testextensie_glob(const char *str, const char *ext_fnmatch); bool BLI_replace_extension(char *path, size_t maxlen, const char *ext); bool BLI_ensure_extension(char *path, size_t maxlen, const char *ext); -void BLI_uniquename(struct ListBase *list, void *vlink, const char * defname, char delim, short name_offs, short len); -bool BLI_uniquename_cb(bool (*unique_check)(void * arg, const char * name), +void BLI_uniquename(struct ListBase *list, void *vlink, const char *defname, char delim, short name_offs, short len); +bool BLI_uniquename_cb(bool (*unique_check)(void *arg, const char *name), void *arg, const char * defname, char delim, char *name, short name_len); void BLI_newname(char *name, int add); int BLI_stringdec(const char *string, char *head, char *start, unsigned short *numlen); diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c index 07cd85c4107..3567421daad 100644 --- a/source/blender/blenlib/intern/math_color.c +++ b/source/blender/blenlib/intern/math_color.c @@ -457,7 +457,7 @@ float linearrgb_to_srgb(float c) return 1.055f * powf(c, 1.0f / 2.4f) - 0.055f; } -void minmax_rgb(short c[]) +void minmax_rgb(short c[3]) { if (c[0] > 255) c[0] = 255; else if (c[0] < 0) c[0] = 0; diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index f9cf913157b..bcba2715740 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -232,7 +232,7 @@ void BLI_newname(char *name, int add) * \param name_len Maximum length of name area * \return true if there if the name was changed */ -bool BLI_uniquename_cb(bool (*unique_check)(void * arg, const char *name), +bool BLI_uniquename_cb(bool (*unique_check)(void *arg, const char *name), void *arg, const char *defname, char delim, char *name, short name_len) { if (name[0] == '\0') { diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index e8e3e4a0f8a..3ada62a048a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10510,13 +10510,13 @@ static ID *append_named_part_ex(const bContext *C, Main *mainl, FileData *fd, co return id; } -ID *BLO_library_append_named_part(Main *mainl, BlendHandle** bh, const char *idname, const int idcode) +ID *BLO_library_append_named_part(Main *mainl, BlendHandle **bh, const char *idname, const int idcode) { FileData *fd = (FileData*)(*bh); return append_named_part(mainl, fd, idname, idcode); } -ID *BLO_library_append_named_part_ex(const bContext *C, Main *mainl, BlendHandle** bh, const char *idname, const int idcode, const short flag) +ID *BLO_library_append_named_part_ex(const bContext *C, Main *mainl, BlendHandle **bh, const char *idname, const int idcode, const short flag) { FileData *fd = (FileData*)(*bh); return append_named_part_ex(C, mainl, fd, idname, idcode, flag); @@ -10564,7 +10564,7 @@ static Main *library_append_begin(Main *mainvar, FileData **fd, const char *file return mainl; } -Main *BLO_library_append_begin(Main *mainvar, BlendHandle** bh, const char *filepath) +Main *BLO_library_append_begin(Main *mainvar, BlendHandle **bh, const char *filepath) { FileData *fd = (FileData*)(*bh); return library_append_begin(mainvar, &fd, filepath); @@ -10638,7 +10638,7 @@ static void library_append_end(const bContext *C, Main *mainl, FileData **fd, in } } -void BLO_library_append_end(const bContext *C, struct Main *mainl, BlendHandle** bh, int idcode, short flag) +void BLO_library_append_end(const bContext *C, struct Main *mainl, BlendHandle **bh, int idcode, short flag) { FileData *fd = (FileData*)(*bh); library_append_end(C, mainl, &fd, idcode, flag); diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 54478666770..c00569e4b51 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -647,7 +647,7 @@ static void do_version_constraints_radians_degrees_250(ListBase *lb) } /* NOTE: this version patch is intended for versions < 2.52.2, but was initially introduced in 2.27 already */ -static void do_versions_seq_unique_name_all_strips(Scene * sce, ListBase *seqbasep) +static void do_versions_seq_unique_name_all_strips(Scene *sce, ListBase *seqbasep) { Sequence * seq = seqbasep->first; diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 0f8a4e5af76..901dd85a482 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -79,7 +79,7 @@ JointData *ArmatureImporter::get_joint_data(COLLADAFW::Node *node); } #endif -void ArmatureImporter::create_bone(SkinInfo* skin, COLLADAFW::Node *node, EditBone *parent, int totchild, +void ArmatureImporter::create_bone(SkinInfo *skin, COLLADAFW::Node *node, EditBone *parent, int totchild, float parent_mat[4][4], bArmature *arm) { //Checking if bone is already made. diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp index e1c32482835..c530135bc4d 100644 --- a/source/blender/collada/TransformWriter.cpp +++ b/source/blender/collada/TransformWriter.cpp @@ -139,7 +139,7 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob, B void TransformWriter::add_node_transform_identity(COLLADASW::Node& node) { - float loc[] = {0.0f, 0.0f, 0.0f}, scale[] = {1.0f, 1.0f, 1.0f}, rot[] = {0.0f, 0.0f, 0.0f}; + float loc[3] = {0.0f, 0.0f, 0.0f}, scale[3] = {1.0f, 1.0f, 1.0f}, rot[3] = {0.0f, 0.0f, 0.0f}; add_transform(node, loc, rot, scale); } diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index d19d8084608..ac01cbb5f4a 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -277,8 +277,9 @@ static void pose_slide_apply_vec3(tPoseSlideOp *pso, tPChanFCurveLink *pfl, floa /* using this path, find each matching F-Curve for the variables we're interested in */ while ( (ld = poseAnim_mapping_getNextFCurve(&pfl->fcurves, ld, path)) ) { FCurve *fcu = (FCurve *)ld->data; - + /* just work on these channels one by one... there's no interaction between values */ + BLI_assert(fcu->array_index < 3); pose_slide_apply_val(pso, fcu, &vec[fcu->array_index]); } diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 428a46700e3..54912c3edaf 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -877,7 +877,7 @@ static bool gp_stroke_eraser_is_occluded(tGPsdata *p, } /* eraser tool - check if part of stroke occurs within last segment drawn by eraser */ -static short gp_stroke_eraser_strokeinside(const int mval[], const int UNUSED(mvalo[]), +static short gp_stroke_eraser_strokeinside(const int mval[2], const int UNUSED(mvalo[2]), int rad, int x0, int y0, int x1, int y1) { /* simple within-radius check for now */ @@ -927,7 +927,7 @@ static void gp_point_to_xy(ARegion *ar, View2D *v2d, rctf *subrect, bGPDstroke * /* eraser tool - evaluation per stroke */ /* TODO: this could really do with some optimization (KD-Tree/BVH?) */ static void gp_stroke_eraser_dostroke(tGPsdata *p, - const int mval[], const int mvalo[], + const int mval[2], const int mvalo[2], short rad, const rcti *rect, bGPDframe *gpf, bGPDstroke *gps) { bGPDspoint *pt1, *pt2; diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h index 39d1e283f54..5774a057eb5 100644 --- a/source/blender/editors/include/BIF_glutil.h +++ b/source/blender/editors/include/BIF_glutil.h @@ -188,7 +188,7 @@ gla2DDrawInfo *glaBegin2DDraw(struct rcti *screen_rect, struct rctf *world_rect void gla2DDrawTranslatePt(gla2DDrawInfo *di, float wo_x, float wo_y, int *sc_x_r, int *sc_y_r); /** Translate the \a world point from world coordiantes into screen space. */ -void gla2DDrawTranslatePtv(gla2DDrawInfo * di, float world[2], int screen_r[2]); +void gla2DDrawTranslatePtv(gla2DDrawInfo *di, float world[2], int screen_r[2]); /* Restores the previous OpenGL state and free's the auxilary * gla data. diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 9f836ed789f..e7b659f99fc 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -520,9 +520,9 @@ void ui_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y void ui_draw_anti_roundbox(int mode, float minx, float miny, float maxx, float maxy, float rad, bool use_alpha); void ui_draw_menu_back(struct uiStyle *style, uiBlock *block, rcti *rect); uiWidgetColors *ui_tooltip_get_theme(void); -void ui_draw_tooltip_background(uiStyle *UNUSED(style), uiBlock * block, rcti * rect); +void ui_draw_tooltip_background(uiStyle *UNUSED(style), uiBlock *block, rcti *rect); void ui_draw_search_back(struct uiStyle *style, uiBlock *block, rcti *rect); -int ui_link_bezier_points(const rcti * rect, float coord_array[][2], int resol); +int ui_link_bezier_points(const rcti *rect, float coord_array[][2], int resol); void ui_draw_link_bezier(const rcti *rect); extern void ui_draw_but(const struct bContext *C, ARegion *ar, struct uiStyle *style, uiBut *but, rcti *rect); diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index a15795dc2da..88c18602c89 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -125,7 +125,7 @@ void image_undo_restore(struct bContext *C, struct ListBase *lb); void image_undo_free(struct ListBase *lb); void imapaint_image_update(struct SpaceImage *sima, struct Image *image, struct ImBuf *ibuf, short texpaint); struct ImagePaintPartialRedraw *get_imapaintpartial(void); -void set_imapaintpartial(struct ImagePaintPartialRedraw * ippr); +void set_imapaintpartial(struct ImagePaintPartialRedraw *ippr); void imapaint_clear_partial_redraw(void); void imapaint_dirty_region(struct Image *ima, struct ImBuf *ibuf, int x, int y, int w, int h); int get_imapaint_zoom(struct bContext *C, float *zoomx, float *zoomy); diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 51500ab8e1c..20b8f90df8b 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3456,7 +3456,7 @@ void sculpt_update_mesh_elements(Scene *scene, Sculpt *sd, Object *ob, free_sculptsession_deformMats(ss); - ss->orig_cos = (ss->kb) ? BKE_key_convert_to_vertcos(ob, ss->kb) : mesh_getVertexCos(me, NULL); + ss->orig_cos = (ss->kb) ? BKE_key_convert_to_vertcos(ob, ss->kb) : BKE_mesh_vertexCos_get(me, NULL); crazyspace_build_sculpt(scene, ob, &ss->deform_imats, &ss->deform_cos); BKE_pbvh_apply_vertCos(ss->pbvh, ss->deform_cos); diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index 2f6090d67ce..48051014c58 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -135,7 +135,7 @@ void NODE_OT_backimage_sample(struct wmOperatorType *ot); /* drawnode.c */ void node_draw_link(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link); void node_draw_link_bezier(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3); -int node_link_bezier_points(struct View2D * v2d, struct SpaceNode * snode, struct bNodeLink * link, float coord_array[][2], int resol); +int node_link_bezier_points(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link, float coord_array[][2], int resol); // void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3 ); void draw_nodespace_back_pix(const struct bContext *C, struct ARegion *ar, struct SpaceNode *snode); diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 935bd13fcfc..cd79c43eac2 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -167,11 +167,11 @@ void sequencer_operatortypes(void); void sequencer_keymap(struct wmKeyConfig *keyconf); /* sequencer_scope.c */ -struct ImBuf *make_waveform_view_from_ibuf(struct ImBuf * ibuf); -struct ImBuf *make_sep_waveform_view_from_ibuf(struct ImBuf * ibuf); -struct ImBuf *make_vectorscope_view_from_ibuf(struct ImBuf * ibuf); -struct ImBuf *make_zebra_view_from_ibuf(struct ImBuf * ibuf, float perc); -struct ImBuf *make_histogram_view_from_ibuf(struct ImBuf * ibuf); +struct ImBuf *make_waveform_view_from_ibuf(struct ImBuf *ibuf); +struct ImBuf *make_sep_waveform_view_from_ibuf(struct ImBuf *ibuf); +struct ImBuf *make_vectorscope_view_from_ibuf(struct ImBuf *ibuf); +struct ImBuf *make_zebra_view_from_ibuf(struct ImBuf *ibuf, float perc); +struct ImBuf *make_histogram_view_from_ibuf(struct ImBuf *ibuf); /* sequencer_buttons.c */ void sequencer_buttons_register(struct ARegionType *art); diff --git a/source/blender/editors/util/crazyspace.c b/source/blender/editors/util/crazyspace.c index e953aa2f0ed..7f534493975 100644 --- a/source/blender/editors/util/crazyspace.c +++ b/source/blender/editors/util/crazyspace.c @@ -332,7 +332,7 @@ int sculpt_get_first_deform_matrices(Scene *scene, Object *ob, float (**deformma if (!defmats) { Mesh *me = (Mesh *)ob->data; dm = mesh_create_derived(me, ob, NULL); - deformedVerts = mesh_getVertexCos(me, &numVerts); + deformedVerts = BKE_mesh_vertexCos_get(me, &numVerts); defmats = MEM_callocN(sizeof(*defmats) * numVerts, "defmats"); for (a = 0; a < numVerts; a++) @@ -413,7 +413,7 @@ void crazyspace_build_sculpt(Scene *scene, Object *ob, float (**deformmats)[3][3 int a, numVerts; Mesh *me = (Mesh *)ob->data; - *deformcos = mesh_getVertexCos(me, &numVerts); + *deformcos = BKE_mesh_vertexCos_get(me, &numVerts); *deformmats = MEM_callocN(sizeof(*(*deformmats)) * numVerts, "defmats"); for (a = 0; a < numVerts; a++) diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index 48c14fc07f2..59242e9020f 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -134,7 +134,7 @@ struct ImBuf *IMB_allocImBuf(unsigned int x, unsigned int y, */ void IMB_refImBuf(struct ImBuf *ibuf); -struct ImBuf * IMB_makeSingleUser(struct ImBuf *ibuf); +struct ImBuf *IMB_makeSingleUser(struct ImBuf *ibuf); /** * @@ -213,9 +213,9 @@ typedef enum IMB_Proxy_Size { } IMB_Proxy_Size; /* defaults to BL_proxy within the directory of the animation */ -void IMB_anim_set_index_dir(struct anim * anim, const char * dir); +void IMB_anim_set_index_dir(struct anim *anim, const char *dir); -int IMB_anim_index_get_frame_index(struct anim * anim, IMB_Timecode_Type tc, +int IMB_anim_index_get_frame_index(struct anim *anim, IMB_Timecode_Type tc, int position); struct IndexBuildContext; @@ -241,8 +241,8 @@ int IMB_anim_get_duration(struct anim *anim, IMB_Timecode_Type tc); * Return the fps contained in movie files (function rval is FALSE, * and frs_sec and frs_sec_base untouched if none available!) */ -int IMB_anim_get_fps(struct anim * anim, - short * frs_sec, float * frs_sec_base); +int IMB_anim_get_fps(struct anim *anim, + short *frs_sec, float *frs_sec_base); /** * diff --git a/source/blender/imbuf/intern/IMB_filetype.h b/source/blender/imbuf/intern/IMB_filetype.h index 68ad4808c80..154941c5c09 100644 --- a/source/blender/imbuf/intern/IMB_filetype.h +++ b/source/blender/imbuf/intern/IMB_filetype.h @@ -70,12 +70,12 @@ int imb_savepng(struct ImBuf *ibuf, const char *name, int flags); /* targa */ int imb_is_a_targa(unsigned char *buf); struct ImBuf *imb_loadtarga(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); -int imb_savetarga(struct ImBuf * ibuf, const char *name, int flags); +int imb_savetarga(struct ImBuf *ibuf, const char *name, int flags); /* iris */ int imb_is_a_iris(unsigned char *mem); struct ImBuf *imb_loadiris(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); -int imb_saveiris(struct ImBuf * ibuf, const char *name, int flags); +int imb_saveiris(struct ImBuf *ibuf, const char *name, int flags); /* jp2 */ int imb_is_a_jp2(unsigned char *buf); @@ -85,7 +85,7 @@ int imb_savejp2(struct ImBuf *ibuf, const char *name, int flags); /* jpeg */ int imb_is_a_jpeg(unsigned char *mem); int imb_savejpeg(struct ImBuf *ibuf, const char *name, int flags); -struct ImBuf * imb_load_jpeg (unsigned char * buffer, size_t size, int flags, char colorspace[IM_MAX_SPACE]); +struct ImBuf *imb_load_jpeg (unsigned char *buffer, size_t size, int flags, char colorspace[IM_MAX_SPACE]); /* bmp */ int imb_is_a_bmp(unsigned char *buf); @@ -109,7 +109,7 @@ int imb_is_dpx(unsigned char *buf); /* hdr */ int imb_is_a_hdr(unsigned char *buf); struct ImBuf *imb_loadhdr(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); -int imb_savehdr(struct ImBuf * ibuf, const char *name, int flags); +int imb_savehdr(struct ImBuf *ibuf, const char *name, int flags); /* tiff */ void imb_inittiff(void); diff --git a/source/blender/imbuf/intern/IMB_indexer.h b/source/blender/imbuf/intern/IMB_indexer.h index d114df945ae..64ec658f0db 100644 --- a/source/blender/imbuf/intern/IMB_indexer.h +++ b/source/blender/imbuf/intern/IMB_indexer.h @@ -81,7 +81,7 @@ typedef struct anim_index_builder { struct anim_index_entry *entry); } anim_index_builder; -anim_index_builder * IMB_index_builder_create(const char * name); +anim_index_builder * IMB_index_builder_create(const char *name); void IMB_index_builder_add_entry( anim_index_builder * fp, int frameno, unsigned long long seek_pos, @@ -96,25 +96,25 @@ void IMB_index_builder_proc_frame( unsigned long long seek_pos_dts, unsigned long long pts); -void IMB_index_builder_finish(anim_index_builder * fp, int rollback); +void IMB_index_builder_finish(anim_index_builder *fp, int rollback); -struct anim_index *IMB_indexer_open(const char * name); +struct anim_index *IMB_indexer_open(const char *name); unsigned long long IMB_indexer_get_seek_pos( struct anim_index *idx, int frameno_index); unsigned long long IMB_indexer_get_seek_pos_dts( struct anim_index *idx, int frameno_index); -int IMB_indexer_get_frame_index(struct anim_index * idx, int frameno); +int IMB_indexer_get_frame_index(struct anim_index *idx, int frameno); unsigned long long IMB_indexer_get_pts(struct anim_index *idx, int frame_index); -int IMB_indexer_get_duration(struct anim_index * idx); +int IMB_indexer_get_duration(struct anim_index *idx); -int IMB_indexer_can_scan(struct anim_index * idx, +int IMB_indexer_can_scan(struct anim_index *idx, int old_frame_index, int new_frame_index); -void IMB_indexer_close(struct anim_index * idx); +void IMB_indexer_close(struct anim_index *idx); -void IMB_free_indices(struct anim * anim); +void IMB_free_indices(struct anim *anim); struct anim *IMB_anim_open_proxy( struct anim *anim, IMB_Proxy_Size preview_size); diff --git a/source/blender/imbuf/intern/dds/BlockDXT.cpp b/source/blender/imbuf/intern/dds/BlockDXT.cpp index 348e1e9f53a..8e571483e08 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.cpp +++ b/source/blender/imbuf/intern/dds/BlockDXT.cpp @@ -220,7 +220,7 @@ void BlockDXT1::evaluatePalette4(Color32 color_array[4]) const } -void BlockDXT1::decodeBlock(ColorBlock * block) const +void BlockDXT1::decodeBlock(ColorBlock *block) const { // Decode color block. Color32 color_array[4]; @@ -235,7 +235,7 @@ void BlockDXT1::decodeBlock(ColorBlock * block) const } } -void BlockDXT1::decodeBlockNV5x(ColorBlock * block) const +void BlockDXT1::decodeBlockNV5x(ColorBlock *block) const { // Decode color block. Color32 color_array[4]; @@ -277,7 +277,7 @@ inline void BlockDXT1::flip2() BlockDXT3 ----------------------------------------------------------------------------*/ -void BlockDXT3::decodeBlock(ColorBlock * block) const +void BlockDXT3::decodeBlock(ColorBlock *block) const { // Decode color. color.decodeBlock(block); @@ -286,13 +286,13 @@ void BlockDXT3::decodeBlock(ColorBlock * block) const alpha.decodeBlock(block); } -void BlockDXT3::decodeBlockNV5x(ColorBlock * block) const +void BlockDXT3::decodeBlockNV5x(ColorBlock *block) const { color.decodeBlockNV5x(block); alpha.decodeBlock(block); } -void AlphaBlockDXT3::decodeBlock(ColorBlock * block) const +void AlphaBlockDXT3::decodeBlock(ColorBlock *block) const { block->color(0x0).a = (alpha0 << 4) | alpha0; block->color(0x1).a = (alpha1 << 4) | alpha1; @@ -415,7 +415,7 @@ void AlphaBlockDXT5::setIndex(uint index, uint value) this->u = (this->u & ~mask) | (uint64(value) << offset); } -void AlphaBlockDXT5::decodeBlock(ColorBlock * block) const +void AlphaBlockDXT5::decodeBlock(ColorBlock *block) const { uint8 alpha_array[8]; evaluatePalette(alpha_array); @@ -454,7 +454,7 @@ void AlphaBlockDXT5::flip2() *b = tmp; } -void BlockDXT5::decodeBlock(ColorBlock * block) const +void BlockDXT5::decodeBlock(ColorBlock *block) const { // Decode color. color.decodeBlock(block); @@ -463,7 +463,7 @@ void BlockDXT5::decodeBlock(ColorBlock * block) const alpha.decodeBlock(block); } -void BlockDXT5::decodeBlockNV5x(ColorBlock * block) const +void BlockDXT5::decodeBlockNV5x(ColorBlock *block) const { // Decode color. color.decodeBlockNV5x(block); @@ -488,7 +488,7 @@ void BlockDXT5::flip2() /// Decode ATI1 block. -void BlockATI1::decodeBlock(ColorBlock * block) const +void BlockATI1::decodeBlock(ColorBlock *block) const { uint8 alpha_array[8]; alpha.evaluatePalette(alpha_array); @@ -517,7 +517,7 @@ void BlockATI1::flip2() /// Decode ATI2 block. -void BlockATI2::decodeBlock(ColorBlock * block) const +void BlockATI2::decodeBlock(ColorBlock *block) const { uint8 alpha_array[8]; uint8 index_array[16]; @@ -580,7 +580,7 @@ void BlockCTX1::evaluatePalette(Color32 color_array[4]) const color_array[3].a = 0xFF; } -void BlockCTX1::decodeBlock(ColorBlock * block) const +void BlockCTX1::decodeBlock(ColorBlock *block) const { // Decode color block. Color32 color_array[4]; diff --git a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp index dbd87bf1426..28f31fcad8b 100644 --- a/source/blender/imbuf/intern/dds/ColorBlock.cpp +++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp @@ -57,7 +57,7 @@ ColorBlock::ColorBlock() } /// Init the color block from an array of colors. -ColorBlock::ColorBlock(const uint * linearImage) +ColorBlock::ColorBlock(const uint *linearImage) { for (uint i = 0; i < 16; i++) { color(i) = Color32(linearImage[i]); @@ -74,17 +74,17 @@ ColorBlock::ColorBlock(const ColorBlock & block) /// Initialize this color block. -ColorBlock::ColorBlock(const Image * img, uint x, uint y) +ColorBlock::ColorBlock(const Image *img, uint x, uint y) { init(img, x, y); } -void ColorBlock::init(const Image * img, uint x, uint y) +void ColorBlock::init(const Image *img, uint x, uint y) { init(img->width(), img->height(), (const uint *)img->pixels(), x, y); } -void ColorBlock::init(uint w, uint h, const uint * data, uint x, uint y) +void ColorBlock::init(uint w, uint h, const uint *data, uint x, uint y) { const uint bw = min(w - x, 4U); const uint bh = min(h - y, 4U); @@ -105,7 +105,7 @@ void ColorBlock::init(uint w, uint h, const uint * data, uint x, uint y) } } -void ColorBlock::init(uint w, uint h, const float * data, uint x, uint y) +void ColorBlock::init(uint w, uint h, const float *data, uint x, uint y) { const uint bw = min(w - x, 4U); const uint bh = min(h - y, 4U); @@ -245,7 +245,7 @@ bool ColorBlock::hasAlpha() const #if 0 /// Get diameter color range. -void ColorBlock::diameterRange(Color32 * start, Color32 * end) const +void ColorBlock::diameterRange(Color32 *start, Color32 *end) const { Color32 c0, c1; uint best_dist = 0; @@ -266,7 +266,7 @@ void ColorBlock::diameterRange(Color32 * start, Color32 * end) const } /// Get luminance color range. -void ColorBlock::luminanceRange(Color32 * start, Color32 * end) const +void ColorBlock::luminanceRange(Color32 *start, Color32 *end) const { Color32 minColor, maxColor; uint minLuminance, maxLuminance; @@ -292,7 +292,7 @@ void ColorBlock::luminanceRange(Color32 * start, Color32 * end) const } /// Get color range based on the bounding box. -void ColorBlock::boundsRange(Color32 * start, Color32 * end) const +void ColorBlock::boundsRange(Color32 *start, Color32 *end) const { Color32 minColor(255, 255, 255); Color32 maxColor(0, 0, 0); @@ -326,7 +326,7 @@ void ColorBlock::boundsRange(Color32 * start, Color32 * end) const } /// Get color range based on the bounding box. -void ColorBlock::boundsRangeAlpha(Color32 * start, Color32 * end) const +void ColorBlock::boundsRangeAlpha(Color32 *start, Color32 *end) const { Color32 minColor(255, 255, 255, 255); Color32 maxColor(0, 0, 0, 0); @@ -387,7 +387,7 @@ void ColorBlock::sortColorsByAbsoluteValue() /*/// Find extreme colors in the given axis. -void ColorBlock::computeRange(Vector3::Arg axis, Color32 * start, Color32 * end) const +void ColorBlock::computeRange(Vector3::Arg axis, Color32 *start, Color32 *end) const { int mini, maxi; diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp index 0c240f16227..a6d53ffac96 100644 --- a/source/blender/imbuf/intern/dds/dds_api.cpp +++ b/source/blender/imbuf/intern/dds/dds_api.cpp @@ -47,7 +47,7 @@ extern "C" { #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" -int imb_save_dds(struct ImBuf * ibuf, const char *name, int flags) +int imb_save_dds(struct ImBuf *ibuf, const char *name, int flags) { return(0); /* todo: finish this function */ @@ -85,7 +85,7 @@ int imb_is_a_dds(unsigned char *mem) // note: use at most first 32 bytes struct ImBuf *imb_load_dds(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]) { - struct ImBuf * ibuf = 0; + struct ImBuf *ibuf = NULL; DirectDrawSurface dds(mem, size); /* reads header */ unsigned char bits_per_pixel; unsigned int *rect; diff --git a/source/blender/python/mathutils/mathutils.h b/source/blender/python/mathutils/mathutils.h index 7b03b149459..142fcde8f1b 100644 --- a/source/blender/python/mathutils/mathutils.h +++ b/source/blender/python/mathutils/mathutils.h @@ -64,12 +64,12 @@ typedef struct { #include "mathutils_geometry.h" #include "mathutils_noise.h" -PyObject *BaseMathObject_owner_get(BaseMathObject * self, void *); +PyObject *BaseMathObject_owner_get(BaseMathObject *self, void *); PyObject *BaseMathObject_is_wrapped_get(BaseMathObject *self, void *); int BaseMathObject_traverse(BaseMathObject *self, visitproc visit, void *arg); int BaseMathObject_clear(BaseMathObject *self); -void BaseMathObject_dealloc(BaseMathObject * self); +void BaseMathObject_dealloc(BaseMathObject *self); PyMODINIT_FUNC PyInit_mathutils(void); diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m index 7e7c986c6ea..c22544d1891 100644 --- a/source/blender/quicktime/apple/qtkit_export.m +++ b/source/blender/quicktime/apple/qtkit_export.m @@ -218,7 +218,7 @@ static NSString *stringWithCodecType(int codecType) return [NSString stringWithCString:str encoding:NSASCIIStringEncoding]; } -void makeqtstring (RenderData *rd, char *string) +void makeqtstring(RenderData *rd, char *string) { char txt[64]; diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m index 974c2555ee5..700d2614248 100644 --- a/source/blender/quicktime/apple/qtkit_import.m +++ b/source/blender/quicktime/apple/qtkit_import.m @@ -78,7 +78,7 @@ void quicktime_exit(void) } -int anim_is_quicktime (const char *name) +int anim_is_quicktime(const char *name) { NSAutoreleasePool *pool; @@ -119,7 +119,7 @@ int anim_is_quicktime (const char *name) } -void free_anim_quicktime (struct anim *anim) +void free_anim_quicktime(struct anim *anim) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; @@ -143,7 +143,7 @@ void free_anim_quicktime (struct anim *anim) [pool drain]; } -static ImBuf * nsImageToiBuf(NSImage *sourceImage, int width, int height) +static ImBuf *nsImageToiBuf(NSImage *sourceImage, int width, int height) { ImBuf *ibuf = NULL; uchar *rasterRGB = NULL; @@ -260,7 +260,7 @@ static ImBuf * nsImageToiBuf(NSImage *sourceImage, int width, int height) return ibuf; } -ImBuf * qtime_fetchibuf (struct anim *anim, int position) +ImBuf *qtime_fetchibuf (struct anim *anim, int position) { NSImage *frameImage; QTTime time; @@ -299,7 +299,7 @@ ImBuf * qtime_fetchibuf (struct anim *anim, int position) } -int startquicktime (struct anim *anim) +int startquicktime(struct anim *anim) { NSAutoreleasePool *pool; NSArray* videoTracks; @@ -390,7 +390,7 @@ int startquicktime (struct anim *anim) return 0; } -int imb_is_a_quicktime (char *name) +int imb_is_a_quicktime(char *name) { NSImage *image; int result; diff --git a/source/blender/quicktime/quicktime_import.h b/source/blender/quicktime/quicktime_import.h index 8fd016a3d74..4ec435db982 100644 --- a/source/blender/quicktime/quicktime_import.h +++ b/source/blender/quicktime/quicktime_import.h @@ -64,14 +64,14 @@ char *get_valid_qtname(const char *name); /* quicktime movie import functions */ -int anim_is_quicktime (const char *name); -int startquicktime (struct anim *anim); -void free_anim_quicktime (struct anim *anim); -ImBuf *qtime_fetchibuf (struct anim *anim, int position); +int anim_is_quicktime(const char *name); +int startquicktime(struct anim *anim); +void free_anim_quicktime(struct anim *anim); +ImBuf *qtime_fetchibuf(struct anim *anim, int position); /* quicktime image import functions */ -int imb_is_a_quicktime (char *name); +int imb_is_a_quicktime(char *name); ImBuf *imb_quicktime_decode(unsigned char *mem, int size, int flags); #endif /* __QUICKTIME_IMPORT_H__ */ diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index f97e5ac3c59..0331d398ca6 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -165,9 +165,9 @@ int RE_RenderInProgress(struct Render *re); void RE_InitRenderCB(struct Render *re); /* use free render as signal to do everything over (previews) */ -void RE_FreeRender (struct Render *re); +void RE_FreeRender(struct Render *re); /* only called on exit */ -void RE_FreeAllRender (void); +void RE_FreeAllRender(void); /* only call on file load */ void RE_FreeAllRenderResults(void); /* for external render engines that can keep persistent data */ @@ -187,22 +187,22 @@ struct RenderLayer *RE_GetRenderLayer(struct RenderResult *rr, const char *name) float *RE_RenderLayerGetPass(struct RenderLayer *rl, int passtype); /* obligatory initialize call, disprect is optional */ -void RE_InitState (struct Render *re, struct Render *source, struct RenderData *rd, struct SceneRenderLayer *srl, int winx, int winy, rcti *disprect); +void RE_InitState(struct Render *re, struct Render *source, struct RenderData *rd, struct SceneRenderLayer *srl, int winx, int winy, rcti *disprect); /* set up the viewplane/perspective matrix, three choices */ struct Object *RE_GetCamera(struct Render *re); /* return camera override if set */ void RE_SetCamera(struct Render *re, struct Object *camera); void RE_SetEnvmapCamera(struct Render *re, struct Object *cam_ob, float viewscale, float clipsta, float clipend); -void RE_SetWindow (struct Render *re, rctf *viewplane, float clipsta, float clipend); -void RE_SetOrtho (struct Render *re, rctf *viewplane, float clipsta, float clipend); +void RE_SetWindow(struct Render *re, rctf *viewplane, float clipsta, float clipend); +void RE_SetOrtho(struct Render *re, rctf *viewplane, float clipsta, float clipend); void RE_SetPixelSize(struct Render *re, float pixsize); /* option to set viewmatrix before making dbase */ -void RE_SetView (struct Render *re, float mat[4][4]); +void RE_SetView(struct Render *re, float mat[4][4]); /* make or free the dbase */ void RE_Database_FromScene(struct Render *re, struct Main *bmain, struct Scene *scene, unsigned int lay, int use_camera_view); -void RE_Database_Free (struct Render *re); +void RE_Database_Free(struct Render *re); /* project dbase again, when viewplane/perspective changed */ void RE_DataBase_ApplyWindow(struct Render *re); diff --git a/source/blender/render/intern/include/raycounter.h b/source/blender/render/intern/include/raycounter.h index 075a6337435..1694273df0e 100644 --- a/source/blender/render/intern/include/raycounter.h +++ b/source/blender/render/intern/include/raycounter.h @@ -50,7 +50,7 @@ typedef struct RayCounter { } RayCounter; #define RE_RC_INIT(isec, shi) (isec).raycounter = &((shi).shading.raycounter) -void RE_RC_INFO (RayCounter *rc); +void RE_RC_INFO(RayCounter *rc); void RE_RC_MERGE(RayCounter *rc, RayCounter *tmp); #define RE_RC_COUNT(var) (var)++ diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h index 162fa3b7e88..ca9897b652c 100644 --- a/source/blender/render/intern/include/zbuf.h +++ b/source/blender/render/intern/include/zbuf.h @@ -55,10 +55,10 @@ int testclip(const float v[3]); void zbuffer_shadow(struct Render *re, float winmat[4][4], struct LampRen *lar, int *rectz, int size, float jitx, float jity); void zbuffer_abuf_shadow(struct Render *re, struct LampRen *lar, float winmat[4][4], struct APixstr *APixbuf, struct APixstrand *apixbuf, struct ListBase *apsmbase, int size, int samples, float (*jit)[2]); -void zbuffer_solid(struct RenderPart *pa, struct RenderLayer *rl, void (*fillfunc)(struct RenderPart *, struct ZSpan *, int, void*), void *data); +void zbuffer_solid(struct RenderPart *pa, struct RenderLayer *rl, void (*fillfunc)(struct RenderPart *, struct ZSpan *, int, void *), void *data); unsigned short *zbuffer_transp_shade(struct RenderPart *pa, struct RenderLayer *rl, float *pass, struct ListBase *psmlist); -void zbuffer_sss(RenderPart *pa, unsigned int lay, void *handle, void (*func)(void*, int, int, int, int, int)); +void zbuffer_sss(RenderPart *pa, unsigned int lay, void *handle, void (*func)(void *, int, int, int, int, int)); int zbuffer_strands_abuf(struct Render *re, struct RenderPart *pa, struct APixstrand *apixbuf, struct ListBase *apsmbase, unsigned int lay, int negzmask, float winmat[4][4], int winx, int winy, int sample, float (*jit)[2], float clipcrop, int shadow, struct StrandShadeCache *cache); typedef struct APixstr { diff --git a/source/blender/render/intern/raytrace/rayobject_blibvh.cpp b/source/blender/render/intern/raytrace/rayobject_blibvh.cpp index 198577f61c6..18e8ba6cd14 100644 --- a/source/blender/render/intern/raytrace/rayobject_blibvh.cpp +++ b/source/blender/render/intern/raytrace/rayobject_blibvh.cpp @@ -44,7 +44,7 @@ static int RE_rayobject_blibvh_intersect(RayObject *o, Isect *isec); static void RE_rayobject_blibvh_add(RayObject *o, RayObject *ob); static void RE_rayobject_blibvh_done(RayObject *o); static void RE_rayobject_blibvh_free(RayObject *o); -static void RE_rayobject_blibvh_bb(RayObject * o, float min[3], float max[3]); +static void RE_rayobject_blibvh_bb(RayObject *o, float min[3], float max[3]); static float RE_rayobject_blibvh_cost(RayObject *UNUSED(o)) { diff --git a/source/blender/render/intern/raytrace/rayobject_internal.h b/source/blender/render/intern/raytrace/rayobject_internal.h index 07a1cd26c47..5b8a43eab03 100644 --- a/source/blender/render/intern/raytrace/rayobject_internal.h +++ b/source/blender/render/intern/raytrace/rayobject_internal.h @@ -46,7 +46,7 @@ extern "C" { * ... */ -typedef int (*RE_rayobjectcontrol_test_break_callback)(void *data); +typedef int (*RE_rayobjectcontrol_test_break_callback)(void *data); typedef struct RayObjectControl { void *data; diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 828c4a46a48..4a86bd672ce 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -517,68 +517,68 @@ typedef struct { /* interface */ #include "mikktspace.h" -static int GetNumFaces(const SMikkTSpaceContext * pContext) +static int GetNumFaces(const SMikkTSpaceContext *pContext) { - SRenderMeshToTangent * pMesh = (SRenderMeshToTangent *) pContext->m_pUserData; + SRenderMeshToTangent *pMesh = (SRenderMeshToTangent *) pContext->m_pUserData; return pMesh->obr->totvlak; } -static int GetNumVertsOfFace(const SMikkTSpaceContext * pContext, const int face_num) +static int GetNumVertsOfFace(const SMikkTSpaceContext *pContext, const int face_num) { - SRenderMeshToTangent * pMesh = (SRenderMeshToTangent *) pContext->m_pUserData; + SRenderMeshToTangent *pMesh = (SRenderMeshToTangent *) pContext->m_pUserData; VlakRen *vlr= RE_findOrAddVlak(pMesh->obr, face_num); return vlr->v4!=NULL ? 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); - SRenderMeshToTangent * pMesh = (SRenderMeshToTangent *) pContext->m_pUserData; + SRenderMeshToTangent *pMesh = (SRenderMeshToTangent *) pContext->m_pUserData; VlakRen *vlr= RE_findOrAddVlak(pMesh->obr, face_num); - const float *co= (&vlr->v1)[vert_index]->co; - copy_v3_v3(fPos, co); + const float *co = (&vlr->v1)[vert_index]->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); - SRenderMeshToTangent * pMesh = (SRenderMeshToTangent *) pContext->m_pUserData; + SRenderMeshToTangent *pMesh = (SRenderMeshToTangent *) pContext->m_pUserData; VlakRen *vlr= RE_findOrAddVlak(pMesh->obr, face_num); MTFace *tface= RE_vlakren_get_tface(pMesh->obr, vlr, pMesh->obr->actmtface, NULL, 0); const float *coord; - if (tface != NULL) { + if (tface != NULL) { coord= tface->uv[vert_index]; - fUV[0]= coord[0]; fUV[1]= coord[1]; + copy_v2_v2(r_uv, coord); } - else if ((coord= (&vlr->v1)[vert_index]->orco)) { - map_to_sphere(&fUV[0], &fUV[1], coord[0], coord[1], coord[2]); + else if ((coord = (&vlr->v1)[vert_index]->orco)) { + map_to_sphere(&r_uv[0], &r_uv[1], coord[0], coord[1], coord[2]); } else { /* else we get un-initialized value, 0.0 ok default? */ - fUV[0]= fUV[1]= 0.0f; + zero_v2(r_uv); } } -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); - SRenderMeshToTangent * pMesh = (SRenderMeshToTangent *) pContext->m_pUserData; + SRenderMeshToTangent *pMesh = (SRenderMeshToTangent *) pContext->m_pUserData; VlakRen *vlr= RE_findOrAddVlak(pMesh->obr, face_num); if (vlr->flag & ME_SMOOTH) { const float *n = (&vlr->v1)[vert_index]->n; - copy_v3_v3(fNorm, n); + copy_v3_v3(r_no, n); } else { - negate_v3_v3(fNorm, vlr->n); + negate_v3_v3(r_no, vlr->n); } } -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); - SRenderMeshToTangent * pMesh = (SRenderMeshToTangent *) pContext->m_pUserData; - VlakRen *vlr= RE_findOrAddVlak(pMesh->obr, face_num); - float * ftang= RE_vlakren_get_nmap_tangent(pMesh->obr, vlr, 1); + SRenderMeshToTangent *pMesh = (SRenderMeshToTangent *) pContext->m_pUserData; + VlakRen *vlr = RE_findOrAddVlak(pMesh->obr, face_num); + float *ftang = RE_vlakren_get_nmap_tangent(pMesh->obr, vlr, 1); if (ftang!=NULL) { copy_v3_v3(&ftang[iVert*4+0], fvTangent); ftang[iVert*4+3]=fSign; diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 96eaa656c36..48a64822aed 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -1532,7 +1532,7 @@ float texture_value_blend(float tex, float out, float fact, float facg, int blen return in; } -static void texco_mapping(ShadeInput* shi, Tex* tex, MTex* mtex, +static void texco_mapping(ShadeInput *shi, Tex *tex, MTex *mtex, const float co[3], const float dx[3], const float dy[3], float texvec[3], float dxt[3], float dyt[3]) { /* new: first swap coords, then map, then trans/scale */ diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index a0267cd65b7..cc9717bd9d2 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -2062,7 +2062,7 @@ static void zmask_rect(int *rectz, int *rectp, int xs, int ys, int neg) /* ***************** ZBUFFER MAIN ROUTINES **************** */ -void zbuffer_solid(RenderPart *pa, RenderLayer *rl, void(*fillfunc)(RenderPart*, ZSpan*, int, void*), void *data) +void zbuffer_solid(RenderPart *pa, RenderLayer *rl, void(*fillfunc)(RenderPart *, ZSpan *, int, void *), void *data) { ZbufProjectCache cache[ZBUF_PROJECT_CACHE_SIZE]; ZSpan zspans[16], *zspan; /* 16 = RE_MAX_OSA */ @@ -2531,7 +2531,7 @@ static void zbuffill_sss(ZSpan *zspan, int obi, int zvlnr, } } -void zbuffer_sss(RenderPart *pa, unsigned int lay, void *handle, void (*func)(void*, int, int, int, int, int)) +void zbuffer_sss(RenderPart *pa, unsigned int lay, void *handle, void (*func)(void *, int, int, int, int, int)) { ZbufProjectCache cache[ZBUF_PROJECT_CACHE_SIZE]; ZSpan zspan; diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 2fd80d17bb7..25c8c5db0a1 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -193,7 +193,7 @@ int WM_operator_winactive (struct bContext *C); /* invoke callback, exec + redo popup */ int WM_operator_props_popup_call(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); int WM_operator_props_popup (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); -int WM_operator_props_dialog_popup (struct bContext *C, struct wmOperator *op, int width, int height); +int WM_operator_props_dialog_popup(struct bContext *C, struct wmOperator *op, int width, int height); int WM_operator_redo_popup (struct bContext *C, struct wmOperator *op); int WM_operator_ui_popup (struct bContext *C, struct wmOperator *op, int width, int height); diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index ea16e5d4d1f..b1bbe79519b 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -189,7 +189,7 @@ float texture_value_blend(float tex, float out, float fact, float facg, int blen void texture_rgb_blend(float *in, float *tex, float *out, float fact, float facg, int blendtype) {} char stipple_quarttone[1]; //GLubyte stipple_quarttone[128] double elbeemEstimateMemreq(int res, float sx, float sy, float sz, int refine, char *retstr) {return 0.0f;} -struct Render *RE_NewRender(const char *name) {return (struct Render*) NULL;} +struct Render *RE_NewRender(const char *name) {return (struct Render *) NULL;} void RE_SwapResult(struct Render *re, struct RenderResult **rr) {} void RE_BlenderFrame(struct Render *re, struct Scene *scene, int frame) {} int RE_WriteEnvmapResult(struct ReportList *reports, struct Scene *scene, struct EnvMap *env, const char *relpath, const char imtype, float layout[12]) { return 0; } @@ -239,7 +239,7 @@ void UI_view2d_view_to_region(struct View2D *v2d, float x, float y, int *regionx void UI_view2d_to_region_no_clip(struct View2D *v2d, float x, float y, int *regionx, int *region_y) {} struct EditBone *ED_armature_bone_get_mirrored(struct ListBase *edbo, struct EditBone *ebo) {return (struct EditBone *) NULL;} -struct EditBone *ED_armature_edit_bone_add(struct bArmature *arm, char *name) {return (struct EditBone*) NULL;} +struct EditBone *ED_armature_edit_bone_add(struct bArmature *arm, char *name) {return (struct EditBone *) NULL;} struct ListBase *get_active_constraints (struct Object *ob) {return (struct ListBase *) NULL;} struct ListBase *get_constraint_lb(struct Object *ob, struct bConstraint *con, struct bPoseChannel **pchan_r) {return (struct ListBase *) NULL;} int ED_pose_channel_in_IK_chain(struct Object *ob, struct bPoseChannel *pchan) {return 0;} @@ -517,8 +517,8 @@ void WM_operator_properties_free(struct PointerRNA *ptr) {} void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring) {} void WM_operator_properties_create_ptr(struct PointerRNA *ptr, struct wmOperatorType *ot) {} void WM_operator_properties_sanitize(struct PointerRNA *ptr, const short no_context) {}; -void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType*, void *), void *userdata) {} -void WM_operatortype_append_macro_ptr(void (*opfunc)(struct wmOperatorType*, void *), void *userdata) {} +void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType *, void *), void *userdata) {} +void WM_operatortype_append_macro_ptr(void (*opfunc)(struct wmOperatorType *, void *), void *userdata) {} void WM_operator_bl_idname(char *to, const char *from) {} void WM_operator_py_idname(char *to, const char *from) {} void WM_operator_ui_popup(struct bContext *C, struct wmOperator *op, int width, int height) {} diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp index 6ab1d032bf2..e51daf615b8 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp @@ -248,7 +248,7 @@ void KX_BlenderCanvas::SetMousePosition(int x,int y) -void KX_BlenderCanvas::MakeScreenShot(const char* filename) +void KX_BlenderCanvas::MakeScreenShot(const char *filename) { ScrArea area_dummy= {0}; area_dummy.totrct.xmin = m_frame_rect.GetLeft(); diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index f24392352b0..f808b1b7272 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp @@ -190,7 +190,7 @@ void BL_print_game_line(int fontid, const char *text, int size, int dpi, float * BLF_disable(fontid, BLF_MATRIX|BLF_ASPECT); } -void BL_print_gamedebug_line(const char* text, int xco, int yco, int width, int height) +void BL_print_gamedebug_line(const char *text, int xco, int yco, int width, int height) { /* gl prepping */ DisableForText(); @@ -219,7 +219,7 @@ void BL_print_gamedebug_line(const char* text, int xco, int yco, int width, int glEnable(GL_DEPTH_TEST); } -void BL_print_gamedebug_line_padded(const char* text, int xco, int yco, int width, int height) +void BL_print_gamedebug_line_padded(const char *text, int xco, int yco, int width, int height) { /* This is a rather important line :( The gl-mode hasn't been left * behind quite as neatly as we'd have wanted to. I don't know @@ -296,7 +296,7 @@ static unsigned int *screenshot(ScrArea *curarea, int *dumpsx, int *dumpsy) } /* based on screendump.c::screenshot_exec */ -void BL_MakeScreenShot(ScrArea *curarea, const char* filename) +void BL_MakeScreenShot(ScrArea *curarea, const char *filename) { char path[MAX_FILE_LENGTH]; strcpy(path,filename); diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.h b/source/gameengine/BlenderRoutines/KX_BlenderGL.h index 5c3f0684764..2545cd34acb 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.h @@ -44,7 +44,7 @@ void BL_SwapBuffers(struct wmWindow *win); void BL_warp_pointer(struct wmWindow *win,int x,int y); -void BL_MakeScreenShot(struct ScrArea *curarea, const char* filename); +void BL_MakeScreenShot(struct ScrArea *curarea, const char *filename); void BL_HideMouse(struct wmWindow *win); void BL_NormalMouse(struct wmWindow *win); diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp index 64ed384e961..4c162376b36 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp @@ -154,7 +154,7 @@ void KX_BlenderRenderTools::SetClientObject(RAS_IRasterizer *rasty, void* obj) } } -bool KX_BlenderRenderTools::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data) +bool KX_BlenderRenderTools::RayHit(KX_ClientObjectInfo *client, KX_RayCast *result, void * const data) { double* const oglmatrix = (double* const) data; MT_Point3 resultpoint(result->m_hitPoint); diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp index 2918ec8bce7..af537db0203 100644 --- a/source/gameengine/Converter/BL_ActionActuator.cpp +++ b/source/gameengine/Converter/BL_ActionActuator.cpp @@ -59,7 +59,7 @@ extern "C" { #include "RNA_define.h" } -BL_ActionActuator::BL_ActionActuator(SCA_IObject* gameobj, +BL_ActionActuator::BL_ActionActuator(SCA_IObject *gameobj, const STR_String& propname, const STR_String& framepropname, float starttime, diff --git a/source/gameengine/Expressions/EmptyValue.cpp b/source/gameengine/Expressions/EmptyValue.cpp index 8170c588a28..7f3af9f649d 100644 --- a/source/gameengine/Expressions/EmptyValue.cpp +++ b/source/gameengine/Expressions/EmptyValue.cpp @@ -50,7 +50,7 @@ CEmptyValue::~CEmptyValue() -CValue * CEmptyValue::Calc(VALUE_OPERATOR op, CValue * val) +CValue *CEmptyValue::Calc(VALUE_OPERATOR op, CValue *val) /* * pre: * ret: a new object containing the result of applying operator op to this @@ -63,7 +63,7 @@ CValue * CEmptyValue::Calc(VALUE_OPERATOR op, CValue * val) -CValue * CEmptyValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue * val) +CValue * CEmptyValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val) /* * pre: the type of val is dtype * ret: a new object containing the result of applying operator op to val and diff --git a/source/gameengine/Expressions/KX_HashedPtr.cpp b/source/gameengine/Expressions/KX_HashedPtr.cpp index 51550d52636..555ef7f9500 100644 --- a/source/gameengine/Expressions/KX_HashedPtr.cpp +++ b/source/gameengine/Expressions/KX_HashedPtr.cpp @@ -32,7 +32,7 @@ #include "KX_HashedPtr.h" -unsigned int KX_Hash(void * inDWord) +unsigned int KX_Hash(void *inDWord) { #if defined(_WIN64) && !defined(FREE_WINDOWS64) unsigned __int64 key = (unsigned __int64)inDWord; diff --git a/source/gameengine/Expressions/KX_HashedPtr.h b/source/gameengine/Expressions/KX_HashedPtr.h index d822af38c44..acd9d4daafa 100644 --- a/source/gameengine/Expressions/KX_HashedPtr.h +++ b/source/gameengine/Expressions/KX_HashedPtr.h @@ -36,7 +36,7 @@ #include "MEM_guardedalloc.h" #endif -unsigned int KX_Hash(void * inDWord); +unsigned int KX_Hash(void *inDWord); class CHashedPtr { diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp index 5f97b03fed4..20c66bd7bc9 100644 --- a/source/gameengine/Expressions/ListValue.cpp +++ b/source/gameengine/Expressions/ListValue.cpp @@ -123,7 +123,7 @@ void CListValue::ReleaseAndRemoveAll() -CValue* CListValue::FindValue(const STR_String & name) +CValue* CListValue::FindValue(const STR_String &name) { for (int i=0; i < GetCount(); i++) if (GetValue(i)->GetName() == name) @@ -132,7 +132,7 @@ CValue* CListValue::FindValue(const STR_String & name) return NULL; } -CValue* CListValue::FindValue(const char * name) +CValue* CListValue::FindValue(const char *name) { for (int i=0; i < GetCount(); i++) if (GetValue(i)->GetName() == name) diff --git a/source/gameengine/Expressions/Operator1Expr.cpp b/source/gameengine/Expressions/Operator1Expr.cpp index 98228dfbe7d..b985f76825d 100644 --- a/source/gameengine/Expressions/Operator1Expr.cpp +++ b/source/gameengine/Expressions/Operator1Expr.cpp @@ -31,7 +31,7 @@ effect: constucts an empty COperator1Expr m_lhs = NULL; } -COperator1Expr::COperator1Expr(VALUE_OPERATOR op, CExpression * lhs) +COperator1Expr::COperator1Expr(VALUE_OPERATOR op, CExpression *lhs) /* pre: effect: constucts a COperator1Expr with op and lhs in it diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp index 7b20b4b2d97..30a56c9165a 100644 --- a/source/gameengine/Expressions/Value.cpp +++ b/source/gameengine/Expressions/Value.cpp @@ -531,7 +531,7 @@ PyAttributeDef CValue::Attributes[] = { { NULL } //Sentinel }; -PyObject *CValue::pyattr_get_name(void * self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *CValue::pyattr_get_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { CValue * self = static_cast (self_v); return PyUnicode_From_STR_String(self->GetName()); diff --git a/source/gameengine/Expressions/VectorValue.cpp b/source/gameengine/Expressions/VectorValue.cpp index 612de658ce9..a0e1b616d5e 100644 --- a/source/gameengine/Expressions/VectorValue.cpp +++ b/source/gameengine/Expressions/VectorValue.cpp @@ -47,7 +47,7 @@ CVectorValue::CVectorValue(float x,float y,float z, AllocationTYPE alloctype) m_vec[KX_Z] = m_transformedvec[KX_Z] = z; } -CVectorValue::CVectorValue(double vec[],const char *name,AllocationTYPE alloctype) +CVectorValue::CVectorValue(double vec[3], const char *name,AllocationTYPE alloctype) { SetCustomFlag1(false);//FancyOutput=false; @@ -65,7 +65,7 @@ CVectorValue::CVectorValue(double vec[],const char *name,AllocationTYPE alloctyp SetName(name); } -CVectorValue::CVectorValue(double vec[],AllocationTYPE alloctype) +CVectorValue::CVectorValue(double vec[3], AllocationTYPE alloctype) { SetCustomFlag1(false);//FancyOutput=false; diff --git a/source/gameengine/Expressions/VectorValue.h b/source/gameengine/Expressions/VectorValue.h index 9b9f9612810..69f2d4b54ae 100644 --- a/source/gameengine/Expressions/VectorValue.h +++ b/source/gameengine/Expressions/VectorValue.h @@ -45,10 +45,10 @@ public: CValue* CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val); - CVectorValue(double vec[],const char *name,AllocationTYPE alloctype=CValue::HEAPVALUE); + CVectorValue(double vec[3], const char *name,AllocationTYPE alloctype=CValue::HEAPVALUE); CVectorValue() {}; - CVectorValue(double vec[],AllocationTYPE alloctype=CValue::HEAPVALUE); + CVectorValue(double vec[3], AllocationTYPE alloctype=CValue::HEAPVALUE); CVectorValue(float x,float y,float z, AllocationTYPE alloctype = CValue::HEAPVALUE); virtual ~CVectorValue(); //virtual bool ExportT3D(File *txtfile,bool bNoName=false); diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp index bab4aa14bbd..d81140992ec 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp @@ -163,7 +163,7 @@ void GPC_RenderTools::SetClientObject(RAS_IRasterizer *rasty, void* obj) } } -bool GPC_RenderTools::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data) +bool GPC_RenderTools::RayHit(KX_ClientObjectInfo *client, KX_RayCast *result, void * const data) { double* const oglmatrix = (double* const) data; MT_Point3 resultpoint(result->m_hitPoint); diff --git a/source/gameengine/GamePlayer/common/bmfont.cpp b/source/gameengine/GamePlayer/common/bmfont.cpp index 8ffbe757222..8e073f7d17b 100644 --- a/source/gameengine/GamePlayer/common/bmfont.cpp +++ b/source/gameengine/GamePlayer/common/bmfont.cpp @@ -43,7 +43,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: @@ -62,8 +62,8 @@ #include "BKE_bmfont.h" #include "BKE_bmfont_types.h" -/*MAART: -void printfGlyph(bmGlyph * glyph) +#if 0 +void printfGlyph(bmGlyph *glyph) { printf("unicode: %d '%c'\n", glyph->unicode, glyph->unicode); printf(" locx: %4d locy: %4d\n", glyph->locx, glyph->locy); @@ -71,9 +71,9 @@ void printfGlyph(bmGlyph * glyph) printf(" ofsx: %3d ofsy: %3d\n", glyph->ofsx, glyph->ofsy); printf(" advan: %3d reser: %3d\n", glyph->advance, glyph->reserved); } -*/ +#endif -void calcAlpha(ImBuf * ibuf) +void calcAlpha(ImBuf *ibuf) { int i; char * rect; @@ -87,7 +87,7 @@ void calcAlpha(ImBuf * ibuf) } } -void readBitmapFontVersion0(ImBuf * ibuf, unsigned char * rect, int step) +void readBitmapFontVersion0(ImBuf *ibuf, unsigned char *rect, int step) { int glyphcount, bytes, i, index, linelength, ysize; unsigned char * buffer; @@ -253,7 +253,7 @@ int locateGlyph(bmFont *bmfont, unsigned short unicode) return(current); } -void matrixGlyph(ImBuf * ibuf, unsigned short unicode, +void matrixGlyph(ImBuf *ibuf, unsigned short unicode, float *centerx, float *centery, float *sizex, float *sizey, float *transx, float *transy, diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp index 3caa4d35565..a3059317d36 100644 --- a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp +++ b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp @@ -116,7 +116,7 @@ KX_ConstraintActuator::~KX_ConstraintActuator() // there's nothing to be done here, really.... } /* end of destructor */ -bool KX_ConstraintActuator::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data) +bool KX_ConstraintActuator::RayHit(KX_ClientObjectInfo *client, KX_RayCast *result, void * const data) { m_hitObject = client->m_gameobject; @@ -150,7 +150,7 @@ bool KX_ConstraintActuator::RayHit(KX_ClientObjectInfo* client, KX_RayCast* resu /* This function is used to pre-filter the object before casting the ray on them. * This is useful for "X-Ray" option when we want to see "through" unwanted object. */ -bool KX_ConstraintActuator::NeedRayCast(KX_ClientObjectInfo* client) +bool KX_ConstraintActuator::NeedRayCast(KX_ClientObjectInfo *client) { if (client->m_type > KX_ClientObjectInfo::ACTOR) { diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp index 9f530f80e37..e2fb9573129 100644 --- a/source/gameengine/Ketsji/KX_Dome.cpp +++ b/source/gameengine/Ketsji/KX_Dome.cpp @@ -1435,7 +1435,7 @@ void KX_Dome::SplitFace(vector & face, int *nfaces) *nfaces = n2; } -void KX_Dome::CalculateFrustum(KX_Camera * cam) +void KX_Dome::CalculateFrustum(KX_Camera *cam) { #if 0 // manually creating a 90deg Field of View Frustum diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index ae5758b8597..98da18dcc68 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -187,7 +187,7 @@ KX_GameObject::~KX_GameObject() #endif // WITH_PYTHON } -KX_GameObject* KX_GameObject::GetClientObject(KX_ClientObjectInfo* info) +KX_GameObject* KX_GameObject::GetClientObject(KX_ClientObjectInfo *info) { if (!info) return NULL; @@ -2987,7 +2987,7 @@ KX_PYMETHODDEF_DOC_O(KX_GameObject, getVectTo, return returnValue; } -bool KX_GameObject::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data) +bool KX_GameObject::RayHit(KX_ClientObjectInfo *client, KX_RayCast *result, void * const data) { KX_GameObject* hitKXObj = client->m_gameobject; @@ -3006,7 +3006,7 @@ bool KX_GameObject::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void /* this function is used to pre-filter the object before casting the ray on them. * This is useful for "X-Ray" option when we want to see "through" unwanted object. */ -bool KX_GameObject::NeedRayCast(KX_ClientObjectInfo* client) +bool KX_GameObject::NeedRayCast(KX_ClientObjectInfo *client) { KX_GameObject* hitKXObj = client->m_gameobject; diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp index 57695df2782..8e803c46358 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.cpp +++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp @@ -403,15 +403,15 @@ PyObject *KX_MeshProxy::pyattr_get_materials(void *self_v, const KX_PYATTRIBUTE_ return materials; } -PyObject * KX_MeshProxy::pyattr_get_numMaterials(void * selfv, const KX_PYATTRIBUTE_DEF * attrdef) +PyObject *KX_MeshProxy::pyattr_get_numMaterials(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { - KX_MeshProxy * self = static_cast (selfv); + KX_MeshProxy * self = static_cast (self_v); return PyLong_FromLong(self->m_meshobj->NumMaterials()); } -PyObject * KX_MeshProxy::pyattr_get_numPolygons(void * selfv, const KX_PYATTRIBUTE_DEF * attrdef) +PyObject *KX_MeshProxy::pyattr_get_numPolygons(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { - KX_MeshProxy * self = static_cast (selfv); + KX_MeshProxy * self = static_cast (self_v); return PyLong_FromLong(self->m_meshobj->NumPolygons()); } diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp index 9368bc6458f..82ae8c13633 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp @@ -136,7 +136,7 @@ bool KX_MouseFocusSensor::Evaluate() return result; } -bool KX_MouseFocusSensor::RayHit(KX_ClientObjectInfo* client_info, KX_RayCast* result, void * const data) +bool KX_MouseFocusSensor::RayHit(KX_ClientObjectInfo *client_info, KX_RayCast *result, void * const data) { KX_GameObject* hitKXObj = client_info->m_gameobject; diff --git a/source/gameengine/Ketsji/KX_NearSensor.cpp b/source/gameengine/Ketsji/KX_NearSensor.cpp index 232a872bf10..cbb4e77d165 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.cpp +++ b/source/gameengine/Ketsji/KX_NearSensor.cpp @@ -186,7 +186,7 @@ bool KX_NearSensor::BroadPhaseFilterCollision(void*obj1,void*obj2) // need the mapping from PHY_IPhysicsController to gameobjects now assert(obj1==m_physCtrl && obj2); - KX_ClientObjectInfo* client_info = static_cast((static_cast(obj2))->getNewClientInfo()); + KX_ClientObjectInfo *client_info = static_cast((static_cast(obj2))->getNewClientInfo()); KX_GameObject* gameobj = ( client_info ? client_info->m_gameobject : @@ -208,14 +208,14 @@ bool KX_NearSensor::BroadPhaseFilterCollision(void*obj1,void*obj2) return false; } -bool KX_NearSensor::NewHandleCollision(void* obj1,void* obj2,const PHY_CollData * coll_data) +bool KX_NearSensor::NewHandleCollision(void *obj1, void *obj2, const PHY_CollData *coll_data) { // KX_TouchEventManager* toucheventmgr = static_cast(m_eventmgr); // KX_GameObject* parent = static_cast(GetParent()); // need the mapping from PHY_IPhysicsController to gameobjects now - KX_ClientObjectInfo* client_info =static_cast (obj1 == m_physCtrl? + KX_ClientObjectInfo *client_info = static_cast (obj1 == m_physCtrl? ((PHY_IPhysicsController*)obj2)->getNewClientInfo() : ((PHY_IPhysicsController*)obj1)->getNewClientInfo()); diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp index f0e11645bc1..4c491654d1f 100644 --- a/source/gameengine/Ketsji/KX_PythonSeq.cpp +++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp @@ -63,7 +63,7 @@ static int KX_PythonSeq_clear(KX_PythonSeq *self) return 0; } -static void KX_PythonSeq_dealloc(KX_PythonSeq * self) +static void KX_PythonSeq_dealloc(KX_PythonSeq *self) { KX_PythonSeq_clear(self); PyObject_GC_Del(self); @@ -264,7 +264,7 @@ static PyObjectPlus * KX_PythonSeq_subscript__internal(PyObject *self, const cha } -static PyObject * KX_PythonSeq_subscript(PyObject *self, PyObject *key) +static PyObject *KX_PythonSeq_subscript(PyObject *self, PyObject *key) { PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base); @@ -394,9 +394,9 @@ static PyObject *KX_PythonSeq_nextIter(KX_PythonSeq *self) } -static int KX_PythonSeq_compare( KX_PythonSeq * a, KX_PythonSeq * b ) +static int KX_PythonSeq_compare(KX_PythonSeq *a, KX_PythonSeq *b) { - return ( a->type == b->type && a->base == b->base) ? 0 : -1; + return (a->type == b->type && a->base == b->base) ? 0 : -1; } static PyObject *KX_PythonSeq_richcmp(PyObject *a, PyObject *b, int op) @@ -434,7 +434,7 @@ static PyObject *KX_PythonSeq_richcmp(PyObject *a, PyObject *b, int op) * repr function * convert to a list and get its string value */ -static PyObject *KX_PythonSeq_repr( KX_PythonSeq * self ) +static PyObject *KX_PythonSeq_repr(KX_PythonSeq *self) { PyObject *list = PySequence_List((PyObject *)self); PyObject *repr = PyObject_Repr(list); diff --git a/source/gameengine/Ketsji/KX_RayCast.cpp b/source/gameengine/Ketsji/KX_RayCast.cpp index 878f9d267dc..f1bfb10220a 100644 --- a/source/gameengine/Ketsji/KX_RayCast.cpp +++ b/source/gameengine/Ketsji/KX_RayCast.cpp @@ -80,7 +80,7 @@ bool KX_RayCast::RayTest(PHY_IPhysicsEnvironment* physics_environment, const MT_ frompoint.x(),frompoint.y(),frompoint.z(), topoint.x(),topoint.y(),topoint.z())) != NULL) { - KX_ClientObjectInfo* info = static_cast(hit_controller->getNewClientInfo()); + KX_ClientObjectInfo *info = static_cast(hit_controller->getNewClientInfo()); if (!info) { diff --git a/source/gameengine/Ketsji/KX_RaySensor.cpp b/source/gameengine/Ketsji/KX_RaySensor.cpp index 14786e8429e..3fbce690a9f 100644 --- a/source/gameengine/Ketsji/KX_RaySensor.cpp +++ b/source/gameengine/Ketsji/KX_RaySensor.cpp @@ -108,7 +108,7 @@ bool KX_RaySensor::IsPositiveTrigger() return result; } -bool KX_RaySensor::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data) +bool KX_RaySensor::RayHit(KX_ClientObjectInfo *client, KX_RayCast *result, void * const data) { KX_GameObject* hitKXObj = client->m_gameobject; @@ -153,7 +153,7 @@ bool KX_RaySensor::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void /* this function is used to pre-filter the object before casting the ray on them. * This is useful for "X-Ray" option when we want to see "through" unwanted object. */ -bool KX_RaySensor::NeedRayCast(KX_ClientObjectInfo* client) +bool KX_RaySensor::NeedRayCast(KX_ClientObjectInfo *client) { if (client->m_type > KX_ClientObjectInfo::ACTOR) { diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 3e1a81c2f4f..92e064c6e91 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1468,7 +1468,7 @@ void KX_Scene::MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj,KX_Cam } } -void KX_Scene::PhysicsCullingCallback(KX_ClientObjectInfo* objectInfo, void* cullingInfo) +void KX_Scene::PhysicsCullingCallback(KX_ClientObjectInfo *objectInfo, void* cullingInfo) { KX_GameObject* gameobj = objectInfo->m_gameobject; if (!gameobj->GetVisible()) diff --git a/source/gameengine/Ketsji/KX_SceneActuator.cpp b/source/gameengine/Ketsji/KX_SceneActuator.cpp index 83b57dee7c1..6fe33fd2f63 100644 --- a/source/gameengine/Ketsji/KX_SceneActuator.cpp +++ b/source/gameengine/Ketsji/KX_SceneActuator.cpp @@ -208,7 +208,7 @@ KX_Camera* KX_SceneActuator::FindCamera(const char *camName) -KX_Scene* KX_SceneActuator::FindScene(const char * sceneName) +KX_Scene* KX_SceneActuator::FindScene(const char *sceneName) { return m_KetsjiEngine->FindScene(sceneName); } diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.cpp b/source/gameengine/Ketsji/KX_TouchEventManager.cpp index d2a5ce58641..96872f4e6fd 100644 --- a/source/gameengine/Ketsji/KX_TouchEventManager.cpp +++ b/source/gameengine/Ketsji/KX_TouchEventManager.cpp @@ -82,7 +82,7 @@ bool KX_TouchEventManager::newBroadphaseResponse(void *client_data, const PHY_CollData *coll_data) { PHY_IPhysicsController* ctrl = static_cast(object1); - KX_ClientObjectInfo* info = (ctrl) ? static_cast(ctrl->getNewClientInfo()) : NULL; + KX_ClientObjectInfo *info = (ctrl) ? static_cast(ctrl->getNewClientInfo()) : NULL; // This call back should only be called for controllers of Near and Radar sensor if (!info) return true; diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp index 36e0bf692f1..9d87da48fae 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.cpp +++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp @@ -175,7 +175,7 @@ void KX_TouchSensor::RegisterSumo(KX_TouchEventManager *touchman) { if (touchman->GetPhysicsEnvironment()->requestCollisionCallback(m_physCtrl)) { - KX_ClientObjectInfo* client_info = static_cast(m_physCtrl->getNewClientInfo()); + KX_ClientObjectInfo *client_info = static_cast(m_physCtrl->getNewClientInfo()); if (client_info->isSensor()) touchman->GetPhysicsEnvironment()->addSensor(m_physCtrl); } @@ -188,7 +188,7 @@ void KX_TouchSensor::UnregisterSumo(KX_TouchEventManager* touchman) if (touchman->GetPhysicsEnvironment()->removeCollisionCallback(m_physCtrl)) { // no more sensor on the controller, can remove it if it is a sensor object - KX_ClientObjectInfo* client_info = static_cast(m_physCtrl->getNewClientInfo()); + KX_ClientObjectInfo *client_info = static_cast(m_physCtrl->getNewClientInfo()); if (client_info->isSensor()) touchman->GetPhysicsEnvironment()->removeSensor(m_physCtrl); } @@ -203,8 +203,8 @@ bool KX_TouchSensor::BroadPhaseSensorFilterCollision(void*obj1,void*obj2) KX_GameObject* myobj = (KX_GameObject*)GetParent(); KX_GameObject* myparent = myobj->GetParent(); - KX_ClientObjectInfo* client_info = static_cast(((PHY_IPhysicsController*)obj2)->getNewClientInfo()); - KX_ClientObjectInfo* my_client_info = static_cast(m_physCtrl->getNewClientInfo()); + KX_ClientObjectInfo *client_info = static_cast(((PHY_IPhysicsController*)obj2)->getNewClientInfo()); + KX_ClientObjectInfo *my_client_info = static_cast(m_physCtrl->getNewClientInfo()); KX_GameObject* otherobj = ( client_info ? client_info->m_gameobject : NULL); // first, decrement refcount as GetParent() increases it @@ -243,7 +243,7 @@ bool KX_TouchSensor::NewHandleCollision(void*object1,void*object2,const PHY_Coll // need the mapping from PHY_IPhysicsController to gameobjects now - KX_ClientObjectInfo* client_info = static_cast (object1 == m_physCtrl? + KX_ClientObjectInfo *client_info = static_cast (object1 == m_physCtrl? ((PHY_IPhysicsController*)object2)->getNewClientInfo(): ((PHY_IPhysicsController*)object1)->getNewClientInfo()); diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index d5ceba0ec57..29b526067fd 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -1799,7 +1799,7 @@ struct DbvtCullingCallback : btDbvt::ICollide btBroadphaseProxy* proxy=(btBroadphaseProxy*)leaf->data; // the client object is a graphic controller CcdGraphicController* ctrl = static_cast(proxy->m_clientObject); - KX_ClientObjectInfo* info = (KX_ClientObjectInfo*)ctrl->getNewClientInfo(); + KX_ClientObjectInfo *info = (KX_ClientObjectInfo*)ctrl->getNewClientInfo(); if (m_ocb) { // means we are doing occlusion culling. Check if this object is an occluders diff --git a/source/gameengine/SceneGraph/SG_IObject.h b/source/gameengine/SceneGraph/SG_IObject.h index 72a04064834..2dcf3c6492e 100644 --- a/source/gameengine/SceneGraph/SG_IObject.h +++ b/source/gameengine/SceneGraph/SG_IObject.h @@ -83,19 +83,19 @@ typedef void* (*SG_DestructionNewCallback)( void* clientinfo ); -typedef void (*SG_UpdateTransformCallback)( +typedef void (*SG_UpdateTransformCallback)( SG_IObject* sgobject, void* clientobj, void* clientinfo ); -typedef bool (*SG_ScheduleUpdateCallback)( +typedef bool (*SG_ScheduleUpdateCallback)( SG_IObject* sgobject, void* clientobj, void* clientinfo ); -typedef bool (*SG_RescheduleUpdateCallback)( +typedef bool (*SG_RescheduleUpdateCallback)( SG_IObject* sgobject, void* clientobj, void* clientinfo diff --git a/source/gameengine/VideoTexture/Exception.cpp b/source/gameengine/VideoTexture/Exception.cpp index 89d95d26971..0f571550205 100644 --- a/source/gameengine/VideoTexture/Exception.cpp +++ b/source/gameengine/VideoTexture/Exception.cpp @@ -48,7 +48,7 @@ ExpDesc errNFoundDesc(ErrNotFound, "Error description not found"); // implementation of ExpDesc // constructor -ExpDesc::ExpDesc (ExceptionID & exp, const char * desc, RESULT hres) +ExpDesc::ExpDesc (ExceptionID & exp, const char *desc, RESULT hres) : m_expID(exp), m_hRslt(hres), m_description(desc) { } @@ -105,7 +105,7 @@ const char * Exception::what() // debug version - with file and line of exception -Exception::Exception (ExceptionID & expID, RESULT rslt, const char * fil, int lin) +Exception::Exception (ExceptionID & expID, RESULT rslt, const char *fil, int lin) : m_expID (&expID), m_hRslt (rslt) { // set file and line @@ -115,7 +115,7 @@ Exception::Exception (ExceptionID & expID, RESULT rslt, const char * fil, int li // set file and line -void Exception::setFileLine (const char * fil, int lin) +void Exception::setFileLine (const char *fil, int lin) { if (fil != NULL) m_fileName = fil; m_line = lin; diff --git a/source/gameengine/VideoTexture/FilterBase.cpp b/source/gameengine/VideoTexture/FilterBase.cpp index 66552cde928..77d12ddc9e6 100644 --- a/source/gameengine/VideoTexture/FilterBase.cpp +++ b/source/gameengine/VideoTexture/FilterBase.cpp @@ -124,7 +124,7 @@ PyObject *Filter_getPrevious (PyFilter *self, void *closure) if (self->m_filter != NULL) { // pixel filter object - PyObject * filt = reinterpret_cast(self->m_filter->getPrevious()); + PyObject *filt = reinterpret_cast(self->m_filter->getPrevious()); // if filter is present if (filt != NULL) { diff --git a/source/gameengine/VideoTexture/FilterColor.cpp b/source/gameengine/VideoTexture/FilterColor.cpp index 5efb59efe4c..26b5303e365 100644 --- a/source/gameengine/VideoTexture/FilterColor.cpp +++ b/source/gameengine/VideoTexture/FilterColor.cpp @@ -141,7 +141,7 @@ static int setMatrix(PyFilter *self, PyObject *value, void *closure) for (int r = 0; valid && r < 4; ++r) { // get row object - PyObject * row = PySequence_Fast_GET_ITEM(value, r); + PyObject *row = PySequence_Fast_GET_ITEM(value, r); // check sequence valid = PySequence_Check(row) && PySequence_Size(row) == 5; // check items @@ -274,7 +274,7 @@ static int setLevels(PyFilter *self, PyObject *value, void *closure) for (int r = 0; valid && r < 4; ++r) { // get row object - PyObject * row = PySequence_Fast_GET_ITEM(value, r); + PyObject *row = PySequence_Fast_GET_ITEM(value, r); // check sequence valid = PySequence_Check(row) && PySequence_Size(row) == 2; // check items diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp index 4745ce784c0..5a11cd24bcf 100644 --- a/source/gameengine/VideoTexture/ImageBase.cpp +++ b/source/gameengine/VideoTexture/ImageBase.cpp @@ -364,7 +364,7 @@ PyTypeList pyImageTypes; // functions for python interface // object allocation -PyObject *Image_allocNew (PyTypeObject *type, PyObject *args, PyObject *kwds) +PyObject *Image_allocNew(PyTypeObject *type, PyObject *args, PyObject *kwds) { // allocate object PyImage *self = reinterpret_cast(type->tp_alloc(type, 0)); @@ -394,7 +394,7 @@ void Image_dealloc(PyImage *self) } // get image data -PyObject *Image_getImage (PyImage *self, char * mode) +PyObject *Image_getImage(PyImage *self, char *mode) { try { @@ -551,7 +551,7 @@ int Image_setFlip(PyImage *self, PyObject *value, void *closure) } // get zbuff -PyObject * Image_getZbuff (PyImage * self, void * closure) +PyObject *Image_getZbuff(PyImage * self, void *closure) { if (self->m_image != NULL && self->m_image->getZbuff()) Py_RETURN_TRUE; else Py_RETURN_FALSE; @@ -573,7 +573,7 @@ int Image_setZbuff(PyImage *self, PyObject *value, void *closure) } // get depth -PyObject * Image_getDepth (PyImage * self, void * closure) +PyObject *Image_getDepth(PyImage * self, void *closure) { if (self->m_image != NULL && self->m_image->getDepth()) Py_RETURN_TRUE; else Py_RETURN_FALSE; @@ -598,7 +598,7 @@ int Image_setDepth(PyImage *self, PyObject *value, void *closure) // get filter source object -PyObject *Image_getSource (PyImage *self, PyObject *args) +PyObject *Image_getSource(PyImage *self, PyObject *args) { // get arguments char * id; @@ -622,7 +622,7 @@ PyObject *Image_getSource (PyImage *self, PyObject *args) // set filter source object -PyObject *Image_setSource (PyImage *self, PyObject *args) +PyObject *Image_setSource(PyImage *self, PyObject *args) { // get arguments char * id; @@ -657,13 +657,13 @@ PyObject *Image_setSource (PyImage *self, PyObject *args) // get pixel filter object -PyObject *Image_getFilter (PyImage *self, void *closure) +PyObject *Image_getFilter(PyImage *self, void *closure) { // if image object is available if (self->m_image != NULL) { // pixel filter object - PyObject * filt = reinterpret_cast(self->m_image->getFilter()); + PyObject *filt = reinterpret_cast(self->m_image->getFilter()); // if filter is present if (filt != NULL) { diff --git a/source/gameengine/VideoTexture/ImageBase.h b/source/gameengine/VideoTexture/ImageBase.h index 3bb9c8cb090..718191fd049 100644 --- a/source/gameengine/VideoTexture/ImageBase.h +++ b/source/gameengine/VideoTexture/ImageBase.h @@ -57,52 +57,52 @@ public: /// constructor ImageBase (bool staticSrc = false); /// destructor - virtual ~ImageBase (void); + virtual ~ImageBase(void); /// release contained objects, if returns true, object should be deleted - virtual bool release (void); + virtual bool release(void); /// is an image available bool isImageAvailable(void) { return m_avail; } /// get image - unsigned int * getImage (unsigned int texId = 0, double timestamp=-1.0); + unsigned int *getImage(unsigned int texId = 0, double timestamp=-1.0); /// get image size - short * getSize (void) { return m_size; } + short * getSize(void) { return m_size; } /// get image buffer size - unsigned long getBuffSize (void) + unsigned long getBuffSize(void) { return m_size[0] * m_size[1] * sizeof(unsigned int); } /// refresh image - invalidate its current content - virtual void refresh (void); + virtual void refresh(void); /// get scale - bool getScale (void) { return m_scale; } + bool getScale(void) { return m_scale; } /// set scale - void setScale (bool scale) { m_scale = scale; m_scaleChange = true; } + void setScale(bool scale) { m_scale = scale; m_scaleChange = true; } /// get vertical flip - bool getFlip (void) { return m_flip; } + bool getFlip(void) { return m_flip; } /// set vertical flip - void setFlip (bool flip) { m_flip = flip; } + void setFlip(bool flip) { m_flip = flip; } /// get Z buffer - bool getZbuff (void) { return m_zbuff; } + bool getZbuff(void) { return m_zbuff; } /// set Z buffer - void setZbuff (bool zbuff) { m_zbuff = zbuff; } + void setZbuff(bool zbuff) { m_zbuff = zbuff; } /// get depth - bool getDepth (void) { return m_depth; } + bool getDepth(void) { return m_depth; } /// set depth - void setDepth (bool depth) { m_depth = depth; } + void setDepth(bool depth) { m_depth = depth; } /// get source object - PyImage * getSource (const char * id); + PyImage * getSource(const char * id); /// set source object, return true, if source was set - bool setSource (const char * id, PyImage *source); + bool setSource(const char * id, PyImage *source); /// get pixel filter - PyFilter * getFilter (void) { return m_pyfilter; } + PyFilter * getFilter(void) { return m_pyfilter; } /// set pixel filter - void setFilter (PyFilter * filt); + void setFilter(PyFilter * filt); - /// calculate size (nearest power of 2) - static short calcSize (short size); + /// calculate size(nearest power of 2) + static short calcSize(short size); /// number of buffer pointing to m_image, public because not handled by this class int m_exports; @@ -137,25 +137,25 @@ protected: PyFilter * m_pyfilter; /// initialize image data - void init (short width, short height); + void init(short width, short height); /// find source - ImageSourceList::iterator findSource (const char * id); + ImageSourceList::iterator findSource(const char *id); /// create new source - virtual ImageSource * newSource (const char * id) { return NULL; } + virtual ImageSource *newSource(const char *id) { return NULL; } /// check source sizes - bool checkSourceSizes (void); + bool checkSourceSizes(void); /// calculate image from sources and set its availability - virtual void calcImage (unsigned int texId, double ts) {} + virtual void calcImage(unsigned int texId, double ts) {} /// perform loop detection - bool loopDetect (ImageBase * img); + bool loopDetect(ImageBase * img); /// template for image conversion - template void convImage (FLT & filter, SRC srcBuff, + template void convImage(FLT & filter, SRC srcBuff, short * srcSize) { // destination buffer @@ -328,7 +328,7 @@ extern PyTypeList pyImageTypes; // functions for python interface // object initialization -template static int Image_init (PyObject *pySelf, PyObject *args, PyObject *kwds) +template static int Image_init(PyObject *pySelf, PyObject *args, PyObject *kwds) { PyImage *self = reinterpret_cast(pySelf); // create source object @@ -339,43 +339,43 @@ template static int Image_init (PyObject *pySelf, PyObject *args, PyOb } // object allocation -PyObject *Image_allocNew (PyTypeObject *type, PyObject *args, PyObject *kwds); +PyObject *Image_allocNew(PyTypeObject *type, PyObject *args, PyObject *kwds); // object deallocation -void Image_dealloc (PyImage *self); +void Image_dealloc(PyImage *self); // get image data -PyObject *Image_getImage (PyImage *self, char * mode); +PyObject *Image_getImage(PyImage *self, char * mode); // get image size -PyObject *Image_getSize (PyImage *self, void *closure); +PyObject *Image_getSize(PyImage *self, void *closure); // refresh image - invalidate current content -PyObject *Image_refresh (PyImage *self); +PyObject *Image_refresh(PyImage *self); // get scale -PyObject *Image_getScale (PyImage *self, void *closure); +PyObject *Image_getScale(PyImage *self, void *closure); // set scale -int Image_setScale (PyImage *self, PyObject *value, void *closure); +int Image_setScale(PyImage *self, PyObject *value, void *closure); // get flip -PyObject *Image_getFlip (PyImage *self, void *closure); +PyObject *Image_getFlip(PyImage *self, void *closure); // set flip -int Image_setFlip (PyImage *self, PyObject *value, void *closure); +int Image_setFlip(PyImage *self, PyObject *value, void *closure); // get filter source object -PyObject *Image_getSource (PyImage *self, PyObject *args); +PyObject *Image_getSource(PyImage *self, PyObject *args); // set filter source object -PyObject *Image_setSource (PyImage *self, PyObject *args); +PyObject *Image_setSource(PyImage *self, PyObject *args); // get Z buffer -PyObject * Image_getZbuff (PyImage * self, void * closure); +PyObject *Image_getZbuff(PyImage * self, void *closure); // set Z buffer -int Image_setZbuff (PyImage * self, PyObject * value, void * closure); +int Image_setZbuff(PyImage * self, PyObject *value, void *closure); // get depth -PyObject * Image_getDepth (PyImage * self, void * closure); +PyObject *Image_getDepth(PyImage * self, void *closure); // set depth -int Image_setDepth (PyImage * self, PyObject * value, void * closure); +int Image_setDepth(PyImage * self, PyObject *value, void *closure); // get pixel filter object -PyObject *Image_getFilter (PyImage *self, void *closure); +PyObject *Image_getFilter(PyImage *self, void *closure); // set pixel filter object -int Image_setFilter (PyImage *self, PyObject *value, void *closure); +int Image_setFilter(PyImage *self, PyObject *value, void *closure); // check if a buffer can be extracted PyObject *Image_valid(PyImage *self, void *closure); // for buffer access to PyImage objects diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index 0b34824fd08..11ddec681c5 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -299,7 +299,7 @@ static int ImageRender_init(PyObject *pySelf, PyObject *args, PyObject *kwds) // parameters - scene object PyObject *scene; // camera object - PyObject * camera; + PyObject *camera; // parameter keywords static const char *kwlist[] = {"sceneObj", "cameraObj", NULL}; // get parameters diff --git a/source/gameengine/VideoTexture/ImageViewport.h b/source/gameengine/VideoTexture/ImageViewport.h index 5afd4654d62..10d894a9fb8 100644 --- a/source/gameengine/VideoTexture/ImageViewport.h +++ b/source/gameengine/VideoTexture/ImageViewport.h @@ -95,12 +95,12 @@ protected: GLint * getViewportSize (void) { return m_viewport + 2; } }; -PyObject *ImageViewport_getCaptureSize (PyImage *self, void *closure); -int ImageViewport_setCaptureSize (PyImage *self, PyObject *value, void *closure); -PyObject *ImageViewport_getWhole (PyImage *self, void *closure); -int ImageViewport_setWhole (PyImage *self, PyObject *value, void *closure); -PyObject *ImageViewport_getAlpha (PyImage *self, void *closure); -int ImageViewport_setAlpha (PyImage *self, PyObject *value, void *closure); +PyObject *ImageViewport_getCaptureSize(PyImage *self, void *closure); +int ImageViewport_setCaptureSize(PyImage *self, PyObject *value, void *closure); +PyObject *ImageViewport_getWhole(PyImage *self, void *closure); +int ImageViewport_setWhole(PyImage *self, PyObject *value, void *closure); +PyObject *ImageViewport_getAlpha(PyImage *self, void *closure); +int ImageViewport_setAlpha(PyImage *self, PyObject *value, void *closure); #endif diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index 4e584cc89ad..be7f9392f39 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -504,7 +504,7 @@ void VideoFFmpeg::stopCache() } } -void VideoFFmpeg::releaseFrame(AVFrame* frame) +void VideoFFmpeg::releaseFrame(AVFrame *frame) { if (frame == m_frameRGB) { @@ -521,7 +521,7 @@ void VideoFFmpeg::releaseFrame(AVFrame* frame) } // open video file -void VideoFFmpeg::openFile (char * filename) +void VideoFFmpeg::openFile (char *filename) { if (openStream(filename, NULL, NULL) != 0) return; @@ -578,7 +578,7 @@ void VideoFFmpeg::openFile (char * filename) // open video capture device -void VideoFFmpeg::openCam (char * file, short camIdx) +void VideoFFmpeg::openCam (char *file, short camIdx) { // open camera source AVInputFormat *inputFormat; diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.h b/source/gameengine/VideoTexture/VideoFFmpeg.h index 92043bb1f74..2f466eb5eeb 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.h +++ b/source/gameengine/VideoTexture/VideoFFmpeg.h @@ -51,12 +51,12 @@ extern "C" { #endif #ifdef FFMPEG_CODEC_IS_POINTER -static inline AVCodecContext* get_codec_from_stream(AVStream* stream) +static inline AVCodecContext *get_codec_from_stream(AVStream* stream) { return stream->codec; } #else -static inline AVCodecContext* get_codec_from_stream(AVStream* stream) +static inline AVCodecContext *get_codec_from_stream(AVStream* stream) { return &stream->codec; } -- cgit v1.2.3