From 8c3ab1c2a40c17901546575adda3eba5d76b25ba Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 12 Apr 2010 00:36:50 +0000 Subject: - use more inline math funcitons where possible - swapped in less verbose math functons - modifier include cleanup --- source/blender/blenkernel/BKE_fluidsim.h | 1 + source/blender/blenkernel/BKE_object.h | 1 + source/blender/blenkernel/BKE_shrinkwrap.h | 2 +- source/blender/blenkernel/BKE_subsurf.h | 4 +- source/blender/blenkernel/intern/constraint.c | 6 +- source/blender/editors/mesh/editmesh_lib.c | 8 +-- .../blender/editors/transform/transform_generics.c | 6 +- source/blender/modifiers/intern/MOD_armature.c | 8 +-- source/blender/modifiers/intern/MOD_array.c | 32 ++++----- source/blender/modifiers/intern/MOD_bevel.c | 1 - source/blender/modifiers/intern/MOD_boolean.c | 4 +- source/blender/modifiers/intern/MOD_build.c | 10 +-- source/blender/modifiers/intern/MOD_cast.c | 45 ++++++------ source/blender/modifiers/intern/MOD_cloth.c | 1 - source/blender/modifiers/intern/MOD_collision.c | 16 ++--- source/blender/modifiers/intern/MOD_curve.c | 6 +- source/blender/modifiers/intern/MOD_decimate.c | 18 ++--- source/blender/modifiers/intern/MOD_displace.c | 19 ++--- source/blender/modifiers/intern/MOD_edgesplit.c | 21 ++---- source/blender/modifiers/intern/MOD_explode.c | 15 ++-- source/blender/modifiers/intern/MOD_fluidsim.c | 10 +-- .../blender/modifiers/intern/MOD_fluidsim_util.c | 81 +++------------------- source/blender/modifiers/intern/MOD_hook.c | 14 ++-- source/blender/modifiers/intern/MOD_lattice.c | 7 +- source/blender/modifiers/intern/MOD_mask.c | 11 +-- source/blender/modifiers/intern/MOD_meshdeform.c | 35 ++++------ source/blender/modifiers/intern/MOD_mirror.c | 20 +++--- source/blender/modifiers/intern/MOD_multires.c | 3 - .../modifiers/intern/MOD_particleinstance.c | 23 +++--- .../blender/modifiers/intern/MOD_particlesystem.c | 5 -- source/blender/modifiers/intern/MOD_screw.c | 21 ++---- source/blender/modifiers/intern/MOD_shapekey.c | 12 +--- source/blender/modifiers/intern/MOD_shrinkwrap.c | 9 +-- source/blender/modifiers/intern/MOD_simpledeform.c | 8 +-- source/blender/modifiers/intern/MOD_smoke.c | 7 +- source/blender/modifiers/intern/MOD_smooth.c | 12 +--- source/blender/modifiers/intern/MOD_softbody.c | 8 +-- source/blender/modifiers/intern/MOD_solidify.c | 27 ++------ source/blender/modifiers/intern/MOD_subsurf.c | 44 ++---------- source/blender/modifiers/intern/MOD_surface.c | 49 ++----------- source/blender/modifiers/intern/MOD_util.c | 5 -- source/blender/modifiers/intern/MOD_uvproject.c | 63 ++++------------- source/blender/modifiers/intern/MOD_wave.c | 52 +++----------- 43 files changed, 203 insertions(+), 547 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_fluidsim.h b/source/blender/blenkernel/BKE_fluidsim.h index da43ae7f28b..e730f4ec34c 100644 --- a/source/blender/blenkernel/BKE_fluidsim.h +++ b/source/blender/blenkernel/BKE_fluidsim.h @@ -34,6 +34,7 @@ struct Object; struct Scene; struct FluidsimModifierData; +struct FluidsimSettings; struct DerivedMesh; struct MVert; diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 84995b60f4b..065d747a959 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -46,6 +46,7 @@ struct BulletSoftBody; struct Group; struct bAction; struct RenderData; +struct rctf; void clear_workob(struct Object *workob); void what_does_parent(struct Scene *scene, struct Object *ob, struct Object *workob); diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h index 4b6c5ba5459..47fb5049278 100644 --- a/source/blender/blenkernel/BKE_shrinkwrap.h +++ b/source/blender/blenkernel/BKE_shrinkwrap.h @@ -107,7 +107,7 @@ typedef struct ShrinkwrapCalcData struct Object *ob; //object we are applying shrinkwrap to - MVert *vert; //Array of verts being projected (to fetch normals or other data) + struct MVert *vert; //Array of verts being projected (to fetch normals or other data) float (*vertexCos)[3]; //vertexs being shrinkwraped int numVerts; diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h index 853fd99aa86..ef3ad3ad2e9 100644 --- a/source/blender/blenkernel/BKE_subsurf.h +++ b/source/blender/blenkernel/BKE_subsurf.h @@ -52,7 +52,7 @@ struct DerivedMesh *subsurf_make_derived_from_derived( int useRenderParams, float (*vertCos)[3], int isFinalCalc, int editMode); -void subsurf_calculate_limit_positions(Mesh *me, float (*positions_r)[3]); +void subsurf_calculate_limit_positions(struct Mesh *me, float (*positions_r)[3]); /**************************** Internal *****************************/ @@ -87,7 +87,7 @@ typedef struct CCGDerivedMesh { int lvl, totlvl; float (*orco)[3]; - Object *ob; + struct Object *ob; int modified; void (*update)(DerivedMesh*); diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 0441e9c9d00..af0b462c349 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -1983,8 +1983,10 @@ static void pycon_id_looper (bConstraint *con, ConstraintIDFunc func, void *user /* Whether this approach is maintained remains to be seen (aligorith) */ static void pycon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraintTarget *ct, float ctime) { +#ifndef DISABLE_PYTHON bPythonConstraint *data= con->data; - +#endif + if (VALID_CONS_TARGET(ct)) { /* special exception for curves - depsgraph issues */ if (ct->tar->type == OB_CURVE) { @@ -3573,7 +3575,7 @@ static void shrinkwrap_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstr } /* co is in local object coordinates, change it to global and update target position */ - mul_v3_m4v3(co, cob->matrix, co); + mul_m4_v3(cob->matrix, co); VECCOPY(ct->matrix[3], co); } } diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c index 90d720e9c18..7236c34d6f5 100644 --- a/source/blender/editors/mesh/editmesh_lib.c +++ b/source/blender/editors/mesh/editmesh_lib.c @@ -1316,8 +1316,8 @@ static short extrudeflag_edge(Object *obedit, EditMesh *em, short flag, float *n copy_v3_v3(co2, eed->v2->co); if (mmd->mirror_ob) { - mul_v3_m4v3(co1, mtx, co1); - mul_v3_m4v3(co2, mtx, co2); + mul_m4_v3(mtx, co1); + mul_m4_v3(mtx, co2); } if (mmd->flag & MOD_MIR_AXIS_X) @@ -1605,8 +1605,8 @@ short extrudeflag_vert(Object *obedit, EditMesh *em, short flag, float *nor, int copy_v3_v3(co2, eed->v2->co); if (mmd->mirror_ob) { - mul_v3_m4v3(co1, mtx, co1); - mul_v3_m4v3(co2, mtx, co2); + mul_m4_v3(mtx, co1); + mul_m4_v3(mtx, co2); } if (mmd->flag & MOD_MIR_AXIS_X) diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 8bbeec63155..41914ed4135 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -189,8 +189,8 @@ static void clipMirrorModifier(TransInfo *t, Object *ob) copy_v3_v3(iloc, td->iloc); if (mmd->mirror_ob) { - mul_v3_m4v3(loc, mtx, loc); - mul_v3_m4v3(iloc, mtx, iloc); + mul_m4_v3(mtx, loc); + mul_m4_v3(mtx, iloc); } clip = 0; @@ -218,7 +218,7 @@ static void clipMirrorModifier(TransInfo *t, Object *ob) } if (clip) { if (mmd->mirror_ob) { - mul_v3_m4v3(loc, imtx, loc); + mul_m4_v3(imtx, loc); } copy_v3_v3(td->loc, loc); } diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index c4cc4814981..6e2a65540ed 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -51,8 +51,6 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" @@ -130,7 +128,7 @@ static void foreachObjectLink( } static void updateDepgraph( - ModifierData *md, DagForest *forest, Scene *scene, Object *ob, + ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { ArmatureModifierData *amd = (ArmatureModifierData*) md; @@ -162,7 +160,7 @@ static void deformVerts( } static void deformVertsEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData*) md; @@ -177,7 +175,7 @@ static void deformVertsEM( } static void deformMatricesEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) { diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 4846c63aacc..367902d3d0b 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -36,9 +36,10 @@ #include "math.h" #include "float.h" -#include "BLI_kdtree.h" +#include "BLI_math.h" #include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_ghash.h" +#include "BLI_edgehash.h" #include "MEM_guardedalloc.h" @@ -47,12 +48,10 @@ #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" -#include "DNA_object_fluidsim.h" +#include "DNA_meshdata_types.h" #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" @@ -110,8 +109,8 @@ static void copyData(ModifierData *md, ModifierData *target) tamd->curve_ob = amd->curve_ob; tamd->offset_ob = amd->offset_ob; tamd->count = amd->count; - VECCOPY(tamd->offset, amd->offset); - VECCOPY(tamd->scale, amd->scale); + copy_v3_v3(tamd->offset, amd->offset); + copy_v3_v3(tamd->scale, amd->scale); tamd->length = amd->length; tamd->merge_dist = amd->merge_dist; tamd->fit_type = amd->fit_type; @@ -132,7 +131,7 @@ static void foreachObjectLink( walk(userData, ob, &amd->offset_ob); } -static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, +static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { ArrayModifierData *amd = (ArrayModifierData*) md; @@ -221,7 +220,7 @@ static int calc_mapping(IndexMapEntry *indexMap, int oldIndex, int copyNum) } static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, - Scene *scene, Object *ob, DerivedMesh *dm, + struct Scene *scene, Object *ob, DerivedMesh *dm, int initFlags) { int i, j; @@ -365,7 +364,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, indexMap[i].new = numVerts - 1; - VECCOPY(co, mv->co); + copy_v3_v3(co, mv->co); /* Attempts to merge verts from one duplicate with verts from the * next duplicate which are closer than amd->merge_dist. @@ -375,8 +374,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, */ if((count > 1) && (amd->flags & MOD_ARR_MERGE)) { float tmp_co[3]; - VECCOPY(tmp_co, mv->co); - mul_m4_v3(offset, tmp_co); + mul_v3_m4v3(tmp_co, offset, mv->co); for(j = 0; j < maxVerts; j++) { /* if vertex already merged, don't use it */ @@ -389,7 +387,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, /* test for merging with final copy of merge target */ if(amd->flags & MOD_ARR_MERGEFINAL) { - VECCOPY(tmp_co, inMV->co); + copy_v3_v3(tmp_co, inMV->co); inMV = &src_mvert[i]; mul_m4_v3(final_offset, tmp_co); if(compare_len_v3v3(tmp_co, inMV->co, amd->merge_dist)) @@ -410,7 +408,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, numVerts++; mul_m4_v3(offset, co); - VECCOPY(mv2->co, co); + copy_v3_v3(mv2->co, co); } } else if(indexMap[i].merge != i && indexMap[i].merge_final) { /* if this vert is not merging with itself, and it is merging @@ -581,7 +579,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, MVert *in_mv; int j; - VECCOPY(tmp_co, mv->co); + copy_v3_v3(tmp_co, mv->co); mul_m4_v3(startoffset, tmp_co); for(j = 0; j < maxVerts; j++) { @@ -682,7 +680,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, MVert *in_mv; int j; - VECCOPY(tmp_co, mv->co); + copy_v3_v3(tmp_co, mv->co); mul_m4_v3(offset, tmp_co); for(j = 0; j < maxVerts; j++) { @@ -777,7 +775,7 @@ static DerivedMesh *applyModifier( } static DerivedMesh *applyModifierEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 75354db8c82..60d61fabe24 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -52,7 +52,6 @@ #include "BKE_action.h" #include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 55455353354..36d44f40521 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -51,8 +51,6 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" @@ -108,7 +106,7 @@ static void foreachObjectLink( } static void updateDepgraph( - ModifierData *md, DagForest *forest, Scene *scene, Object *ob, + ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { BooleanModifierData *bmd = (BooleanModifierData*) md; diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index 0ba8a4cde6b..bb0e14fd08b 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -39,20 +39,16 @@ #include "BLI_kdtree.h" #include "BLI_rand.h" #include "BLI_uvproject.h" +#include "BLI_ghash.h" #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_material_types.h" +#include "DNA_scene_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_fluidsim.h" #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index b00fdbf4eb2..01d0961c9cd 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -36,9 +36,7 @@ #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" #include "MEM_guardedalloc.h" @@ -49,10 +47,13 @@ #include "DNA_material_types.h" #include "DNA_object_fluidsim.h" +#include "DNA_object_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_scene_types.h" +#include "DNA_customdata_types.h" +#include "BKE_DerivedMesh.h" #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" @@ -70,7 +71,7 @@ #include "BKE_scene.h" #include "BKE_smoke.h" #include "BKE_softbody.h" -#include "BKE_subsurf.h" +#include "BKE_utildefines.h" #include "BKE_texture.h" #include "depsgraph_private.h" @@ -143,7 +144,7 @@ static void foreachObjectLink( } static void updateDepgraph( - ModifierData *md, DagForest *forest, Scene *scene, Object *ob, + ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { CastModifierData *cmd = (CastModifierData*) md; @@ -193,8 +194,7 @@ static void sphere_do( } invert_m4_m4(ob->imat, ob->obmat); - VECCOPY(center, ctrl_ob->obmat[3]); - mul_m4_v3(ob->imat, center); + mul_v3_m4v3(center, ob->imat, ctrl_ob->obmat[3]); } /* now we check which options the user wants */ @@ -239,7 +239,7 @@ static void sphere_do( int j; float tmp_co[3]; - VECCOPY(tmp_co, vertexCos[i]); + copy_v3_v3(tmp_co, vertexCos[i]); if(ctrl_ob) { if(flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(mat, tmp_co); @@ -248,7 +248,7 @@ static void sphere_do( } } - VECCOPY(vec, tmp_co); + copy_v3_v3(vec, tmp_co); if (type == MOD_CAST_TYPE_CYLINDER) vec[2] = 0.0f; @@ -285,7 +285,7 @@ static void sphere_do( } } - VECCOPY(vertexCos[i], tmp_co); + copy_v3_v3(vertexCos[i], tmp_co); } return; } @@ -294,7 +294,7 @@ static void sphere_do( for (i = 0; i < numVerts; i++) { float tmp_co[3]; - VECCOPY(tmp_co, vertexCos[i]); + copy_v3_v3(tmp_co, vertexCos[i]); if(ctrl_ob) { if(flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(mat, tmp_co); @@ -303,7 +303,7 @@ static void sphere_do( } } - VECCOPY(vec, tmp_co); + copy_v3_v3(vec, tmp_co); if (type == MOD_CAST_TYPE_CYLINDER) vec[2] = 0.0f; @@ -329,7 +329,7 @@ static void sphere_do( } } - VECCOPY(vertexCos[i], tmp_co); + copy_v3_v3(vertexCos[i], tmp_co); } } @@ -377,8 +377,7 @@ static void cuboid_do( } invert_m4_m4(ob->imat, ob->obmat); - VECCOPY(center, ctrl_ob->obmat[3]); - mul_m4_v3(ob->imat, center); + mul_v3_m4v3(center, ob->imat, ctrl_ob->obmat[3]); } if((flag & MOD_CAST_SIZE_FROM_RADIUS) && has_radius) { @@ -447,7 +446,7 @@ static void cuboid_do( float d[3], dmax, apex[3], fbb; float tmp_co[3]; - VECCOPY(tmp_co, vertexCos[i]); + copy_v3_v3(tmp_co, vertexCos[i]); if(ctrl_ob) { if(flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(mat, tmp_co); @@ -532,7 +531,7 @@ static void cuboid_do( } } - VECCOPY(vertexCos[i], tmp_co); + copy_v3_v3(vertexCos[i], tmp_co); } return; } @@ -543,12 +542,12 @@ static void cuboid_do( float d[3], dmax, fbb, apex[3]; float tmp_co[3]; - VECCOPY(tmp_co, vertexCos[i]); + copy_v3_v3(tmp_co, vertexCos[i]); if(ctrl_ob) { if(flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(mat, tmp_co); } else { - sub_v3_v3v3(tmp_co, tmp_co, center); + sub_v3_v3(tmp_co, center); } } @@ -600,7 +599,7 @@ static void cuboid_do( } } - VECCOPY(vertexCos[i], tmp_co); + copy_v3_v3(vertexCos[i], tmp_co); } } @@ -624,7 +623,7 @@ static void deformVerts( } static void deformVertsEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm = get_dm(md->scene, ob, editData, derivedData, NULL, 0); diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 6a8608ef8a4..04eaa434ac7 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -51,7 +51,6 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" #include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 5fa195b0bad..716bd0d7405 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -38,21 +38,15 @@ #include "BLI_kdtree.h" #include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" +#include "BLI_edgehash.h" #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_material_types.h" -#include "DNA_object_fluidsim.h" +#include "DNA_scene_types.h" +#include "DNA_meshdata_types.h" - -#include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" +#include "BKE_collision.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index 193b5092fae..5ed06da3e05 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -42,7 +42,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" +#include "DNA_scene_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" @@ -51,8 +51,6 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" @@ -156,7 +154,7 @@ static void deformVerts( } static void deformVertsEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm = derivedData; diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 38a2ae00ca5..73ca7d6a0bc 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -36,13 +36,11 @@ #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" +#include "DNA_meshdata_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" @@ -51,12 +49,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -140,11 +135,8 @@ static DerivedMesh *applyModifier( float *vbCo = &lod.vertex_buffer[a*3]; float *vbNo = &lod.vertex_normal_buffer[a*3]; - VECCOPY(vbCo, mv->co); - - vbNo[0] = mv->no[0]/32767.0f; - vbNo[1] = mv->no[1]/32767.0f; - vbNo[2] = mv->no[2]/32767.0f; + copy_v3_v3(vbCo, mv->co); + normal_short_to_float_v3(vbNo, mv->no); } numTris = 0; @@ -184,7 +176,7 @@ static DerivedMesh *applyModifier( MVert *mv = &mvert[a]; float *vbCo = &lod.vertex_buffer[a*3]; - VECCOPY(mv->co, vbCo); + copy_v3_v3(mv->co, vbCo); } if(lod.vertex_num>2) { diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 574fa0a5cb2..946eb4bffba 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -38,12 +38,12 @@ #include "BLI_kdtree.h" #include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" #include "MEM_guardedalloc.h" #include "DNA_armature_types.h" -#include "DNA_camera_types.h" +#include "DNA_meshdata_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" @@ -51,12 +51,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -168,7 +165,7 @@ static int isDisabled(ModifierData *md, int useRenderParams) } static void updateDepgraph( - ModifierData *md, DagForest *forest, Scene *scene, + ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { DisplaceModifierData *dmd = (DisplaceModifierData*) md; @@ -254,15 +251,13 @@ static void get_texture_coords(DisplaceModifierData *dmd, Object *ob, for(i = 0; i < numVerts; ++i, ++co, ++texco) { switch(texmapping) { case MOD_DISP_MAP_LOCAL: - VECCOPY(*texco, *co); + copy_v3_v3(*texco, *co); break; case MOD_DISP_MAP_GLOBAL: - VECCOPY(*texco, *co); - mul_m4_v3(ob->obmat, *texco); + mul_v3_m4v3(*texco, ob->obmat, *co); break; case MOD_DISP_MAP_OBJECT: - VECCOPY(*texco, *co); - mul_m4_v3(ob->obmat, *texco); + mul_v3_m4v3(*texco, ob->obmat, *co); mul_m4_v3(mapob_imat, *texco); break; } @@ -357,7 +352,7 @@ static void deformVerts( } static void deformVertsEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm= get_cddm(md->scene, ob, editData, derivedData, vertexCos); diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 747044a9719..cef860299f3 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -32,17 +32,17 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_listbase.h" +#include "BLI_memarena.h" +#include "BLI_edgehash.h" +#include "BLI_math.h" #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" +#include "DNA_meshdata_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" @@ -51,12 +51,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -66,12 +63,6 @@ #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_particle.h" -#include "BKE_pointcache.h" -#include "BKE_scene.h" -#include "BKE_smoke.h" -#include "BKE_softbody.h" -#include "BKE_subsurf.h" -#include "BKE_texture.h" #include "depsgraph_private.h" #include "BKE_deform.h" @@ -1301,7 +1292,7 @@ static DerivedMesh *applyModifier( } static DerivedMesh *applyModifierEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index 81248aa8e09..5c8bf972921 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -38,12 +38,13 @@ #include "BLI_kdtree.h" #include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" +#include "BLI_edgehash.h" #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_scene_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" @@ -51,12 +52,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -72,6 +70,7 @@ #include "BKE_softbody.h" #include "BKE_subsurf.h" #include "BKE_texture.h" +#include "BKE_utildefines.h" #include "depsgraph_private.h" #include "BKE_deform.h" @@ -362,8 +361,8 @@ static DerivedMesh * splitEdges(ExplodeModifierData *emd, DerivedMesh *dm){ mv=CDDM_get_vert(splitdm,i); - VECADD(dupve->co,dupve->co,mv->co); - mul_v3_fl(dupve->co,0.5); + add_v3_v3(dupve->co, mv->co); + mul_v3_fl(dupve->co, 0.5f); } BLI_edgehashIterator_free(ehi); diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c index 3b694e38367..82c82ccdfb4 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim.c +++ b/source/blender/modifiers/intern/MOD_fluidsim.c @@ -42,21 +42,15 @@ #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_material_types.h" +#include "DNA_scene_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_fluidsim.h" #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index 15b9fccb420..c2cb90fa76c 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -32,10 +32,17 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" +#include "BKE_DerivedMesh.h" + +#include "DNA_object_types.h" +#include "DNA_scene_types.h" + +#include "MOD_modifiertypes.h" +#include "MOD_fluidsim_util.h" + // headers for fluidsim bobj meshes #include #include "LBM_fluidsim.h" @@ -43,78 +50,6 @@ #include #include -#include "BLI_kdtree.h" -#include "BLI_rand.h" -#include "BLI_uvproject.h" - -#include "MEM_guardedalloc.h" - -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_material_types.h" -#include "DNA_object_fluidsim.h" - - -#include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" -#include "BKE_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.h" -#include "BKE_global.h" -#include "BKE_multires.h" -#include "BKE_key.h" -#include "BKE_lattice.h" -#include "BKE_material.h" -#include "BKE_mesh.h" -#include "BKE_modifier.h" -#include "BKE_object.h" -#include "BKE_paint.h" -#include "BKE_particle.h" -#include "BKE_pointcache.h" -#include "BKE_scene.h" -#include "BKE_smoke.h" -#include "BKE_softbody.h" -#include "BKE_subsurf.h" -#include "BKE_texture.h" - -#include "depsgraph_private.h" -#include "BKE_deform.h" -#include "BKE_shrinkwrap.h" - -#include "MOD_modifiertypes.h" -#include "MOD_fluidsim_util.h" - - -#include "BLI_storage.h" /* _LARGEFILE_SOURCE */ - -#include "MEM_guardedalloc.h" - -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_object_fluidsim.h" -#include "DNA_object_force.h" // for pointcache -#include "DNA_object_types.h" -#include "DNA_particle_types.h" -#include "DNA_scene_types.h" // N_T - -#include "BLI_math.h" -#include "BLI_blenlib.h" - -#include "BKE_cdderivedmesh.h" -#include "BKE_customdata.h" -#include "BKE_DerivedMesh.h" -#include "BKE_fluidsim.h" -#include "BKE_global.h" -#include "BKE_modifier.h" -#include "BKE_mesh.h" -#include "BKE_pointcache.h" -#include "BKE_utildefines.h" - -#include "BLO_sys_types.h" - void fluidsim_init(FluidsimModifierData *fluidmd) { #ifndef DISABLE_ELBEEM diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index eab7166f670..da1a8fc05b4 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -38,12 +38,13 @@ #include "BLI_kdtree.h" #include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" #include "MEM_guardedalloc.h" #include "DNA_armature_types.h" -#include "DNA_camera_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" @@ -51,12 +52,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -98,7 +96,7 @@ static void copyData(ModifierData *md, ModifierData *target) HookModifierData *hmd = (HookModifierData*) md; HookModifierData *thmd = (HookModifierData*) target; - VECCOPY(thmd->cent, hmd->cent); + copy_v3_v3(thmd->cent, hmd->cent); thmd->falloff = hmd->falloff; thmd->force = hmd->force; thmd->object = hmd->object; @@ -144,7 +142,7 @@ static void foreachObjectLink( walk(userData, ob, &hmd->object); } -static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, +static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { HookModifierData *hmd = (HookModifierData*) md; @@ -282,7 +280,7 @@ static void deformVerts( } static void deformVertsEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm = derivedData; diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index 069b83d32d8..031dfc417f7 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -51,12 +51,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -124,7 +121,7 @@ static void foreachObjectLink( walk(userData, ob, &lmd->object); } -static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, +static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { LatticeModifierData *lmd = (LatticeModifierData*) md; @@ -151,7 +148,7 @@ static void deformVerts( } static void deformVertsEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm = derivedData; diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index 7991727d554..9920f685003 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -36,14 +36,12 @@ #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_ghash.h" #include "MEM_guardedalloc.h" #include "DNA_armature_types.h" -#include "DNA_camera_types.h" +#include "DNA_meshdata_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" @@ -51,12 +49,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -108,7 +103,7 @@ static void foreachObjectLink( walk(userData, ob, &mmd->ob_arm); } -static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, +static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { MaskModifierData *mmd = (MaskModifierData *)md; diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index 607f1dc2b22..a145c986742 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -38,11 +38,11 @@ #include "BLI_kdtree.h" #include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" +#include "DNA_meshdata_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" @@ -51,8 +51,6 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" @@ -143,7 +141,7 @@ static void foreachObjectLink( } static void updateDepgraph( - ModifierData *md, DagForest *forest, Scene *scene, Object *ob, + ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { MeshDeformModifierData *mmd = (MeshDeformModifierData*) md; @@ -204,7 +202,7 @@ static float meshdeform_dynamic_bind(MeshDeformModifierData *mmd, float (*dco)[3 } } - VECCOPY(vec, co); + copy_v3_v3(vec, co); return totweight; } @@ -214,8 +212,8 @@ static void meshdeformModifier_do( float (*vertexCos)[3], int numVerts) { MeshDeformModifierData *mmd = (MeshDeformModifierData*) md; - Mesh *me= (mmd->object)? mmd->object->data: NULL; - EditMesh *em = (me)? BKE_mesh_get_editmesh(me): NULL; + struct Mesh *me= (mmd->object)? mmd->object->data: NULL; + struct EditMesh *em = (me)? BKE_mesh_get_editmesh(me): NULL; DerivedMesh *tmpdm, *cagedm; MDeformVert *dvert = NULL; MDeformWeight *dw; @@ -284,15 +282,15 @@ static void meshdeformModifier_do( dco= MEM_callocN(sizeof(*dco)*totcagevert, "MDefDco"); for(a=0; abindmat, co); /* compute difference with world space bind coord */ - VECSUB(dco[a], co, bindcos[a]); + sub_v3_v3v3(dco[a], co, bindcos[a]); } else - VECCOPY(dco[a], co) + copy_v3_v3(dco[a], co); } defgrp_index = defgroup_name_index(ob, mmd->defgrp_name); @@ -329,8 +327,7 @@ static void meshdeformModifier_do( if(mmd->flag & MOD_MDEF_DYNAMIC_BIND) { /* transform coordinate into cage's local space */ - VECCOPY(co, vertexCos[b]); - mul_m4_v3(cagemat, co); + mul_v3_m4v3(co, cagemat, vertexCos[b]); totweight= meshdeform_dynamic_bind(mmd, dco, co); } else { @@ -339,9 +336,7 @@ static void meshdeformModifier_do( for(a=0; amirror_ob); } -static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, +static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { MirrorModifierData *mmd = (MirrorModifierData*) md; @@ -179,7 +175,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd, copy_v3_v3(co, inMV.co); if (mmd->mirror_ob) { - mul_v3_m4v3(co, mtx, co); + mul_m4_v3(mtx, co); } isShared = ABS(co[axis])<=tolerance; @@ -197,7 +193,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd, if(isShared) { co[axis] = 0; if (mmd->mirror_ob) { - mul_v3_m4v3(co, imtx, co); + mul_m4_v3(imtx, co); } copy_v3_v3(mv->co, co); @@ -210,7 +206,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd, co[axis] = -co[axis]; if (mmd->mirror_ob) { - mul_v3_m4v3(co, imtx, co); + mul_m4_v3(imtx, co); } copy_v3_v3(mv2->co, co); @@ -356,7 +352,7 @@ static DerivedMesh *applyModifier( } static DerivedMesh *applyModifierEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c index 3b764b0944a..e0cddb50e3a 100644 --- a/source/blender/modifiers/intern/MOD_multires.c +++ b/source/blender/modifiers/intern/MOD_multires.c @@ -51,12 +51,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 54e1a0099a2..e903e41db3b 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -36,27 +36,18 @@ #include "math.h" #include "float.h" -#include "BLI_kdtree.h" +#include "BLI_math.h" +#include "BLI_listbase.h" #include "BLI_rand.h" -#include "BLI_uvproject.h" #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_material_types.h" -#include "DNA_object_fluidsim.h" - +#include "DNA_meshdata_types.h" #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -76,6 +67,8 @@ #include "depsgraph_private.h" #include "BKE_deform.h" #include "BKE_shrinkwrap.h" +#include "BKE_utildefines.h" + #include "MOD_modifiertypes.h" @@ -109,7 +102,7 @@ static int dependsOnTime(ModifierData *md) return 0; } static void updateDepgraph(ModifierData *md, DagForest *forest, - Scene *scene,Object *ob, DagNode *obNode) + struct Scene *scene,Object *ob, DagNode *obNode) { ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData*) md; @@ -229,7 +222,7 @@ static DerivedMesh * applyModifier( *mv = *inMV; /*change orientation based on object trackflag*/ - VECCOPY(temp_co,mv->co); + copy_v3_v3(temp_co, mv->co); mv->co[axis]=temp_co[track]; mv->co[(axis+1)%3]=temp_co[(track+1)%3]; mv->co[(axis+2)%3]=temp_co[(track+2)%3]; @@ -339,7 +332,7 @@ static DerivedMesh * applyModifier( return result; } static DerivedMesh *applyModifierEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index d34d8b198d2..0fb49544694 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -32,7 +32,6 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" @@ -51,12 +50,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -73,7 +69,6 @@ #include "BKE_subsurf.h" #include "BKE_texture.h" -#include "depsgraph_private.h" #include "BKE_deform.h" #include "RE_shader_ext.h" diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index cff8e616562..58ce0561e80 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -32,39 +32,28 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" #include "BLI_kdtree.h" #include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" +#include "DNA_meshdata_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" #include "DNA_object_fluidsim.h" - -#include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.h" -#include "BKE_global.h" -#include "BKE_multires.h" #include "BKE_key.h" -#include "BKE_lattice.h" #include "BKE_material.h" #include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" #include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_scene.h" @@ -75,11 +64,9 @@ #include "depsgraph_private.h" #include "BKE_deform.h" -#include "BKE_shrinkwrap.h" #include "LOD_decimation.h" -#include "CCGSubSurf.h" #include "RE_shader_ext.h" @@ -859,7 +846,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, static void updateDepgraph( ModifierData *md, DagForest *forest, - Scene *scene, Object *ob, DagNode *obNode) + struct Scene *scene, Object *ob, DagNode *obNode) { ScrewModifierData *ltmd= (ScrewModifierData*) md; @@ -884,7 +871,7 @@ static void foreachObjectLink( /* This dosnt work with material*/ static DerivedMesh *applyModifierEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index d7109b48bbe..80a1778c369 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -32,13 +32,12 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" #include "BLI_kdtree.h" #include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" #include "MEM_guardedalloc.h" @@ -51,12 +50,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -73,13 +69,11 @@ #include "BKE_subsurf.h" #include "BKE_texture.h" -#include "depsgraph_private.h" #include "BKE_deform.h" #include "BKE_shrinkwrap.h" #include "LOD_decimation.h" -#include "CCGSubSurf.h" #include "RE_shader_ext.h" @@ -103,7 +97,7 @@ static void deformVerts( } static void deformVertsEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { Key *key= ob_get_key(ob); @@ -113,7 +107,7 @@ static void deformVertsEM( } static void deformMatricesEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) { diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index 64d71d12d6b..4b9492a9c3c 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -32,7 +32,6 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" @@ -51,12 +50,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -79,7 +75,6 @@ #include "LOD_decimation.h" -#include "CCGSubSurf.h" #include "RE_shader_ext.h" @@ -163,7 +158,7 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, dm->release(dm); } -static void deformVertsEM(ModifierData *md, Object *ob, EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) +static void deformVertsEM(ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm = derivedData; CustomDataMask dataMask = requiredDataMask(ob, md); @@ -178,7 +173,7 @@ static void deformVertsEM(ModifierData *md, Object *ob, EditMesh *editData, Deri dm->release(dm); } -static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, Object *ob, DagNode *obNode) +static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { ShrinkwrapModifierData *smd = (ShrinkwrapModifierData*) md; diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index 11878c4614e..6b70775f3ef 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -32,7 +32,6 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" @@ -51,12 +50,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -354,7 +350,7 @@ static void foreachObjectLink(ModifierData *md, Object *ob, void (*walk)(void *u walk(userData, ob, &smd->origin); } -static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, Object *ob, DagNode *obNode) +static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { SimpleDeformModifierData *smd = (SimpleDeformModifierData*)md; @@ -378,7 +374,7 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, dm->release(dm); } -static void deformVertsEM(ModifierData *md, Object *ob, EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) +static void deformVertsEM(ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm = derivedData; CustomDataMask dataMask = requiredDataMask(ob, md); diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index 345d15cbde8..28d23009baa 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -32,7 +32,6 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" @@ -51,12 +50,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -79,7 +75,6 @@ #include "LOD_decimation.h" -#include "CCGSubSurf.h" #include "RE_shader_ext.h" @@ -124,7 +119,7 @@ static int dependsOnTime(ModifierData *md) } static void updateDepgraph( - ModifierData *md, DagForest *forest, Scene *scene, Object *ob, + ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { /*SmokeModifierData *smd = (SmokeModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index 2a8121e31c4..c89901bdffa 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -32,17 +32,16 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" #include "BLI_kdtree.h" #include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" +#include "DNA_meshdata_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" @@ -51,12 +50,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -73,13 +69,11 @@ #include "BKE_subsurf.h" #include "BKE_texture.h" -#include "depsgraph_private.h" #include "BKE_deform.h" #include "BKE_shrinkwrap.h" #include "LOD_decimation.h" -#include "CCGSubSurf.h" #include "RE_shader_ext.h" @@ -274,7 +268,7 @@ static void deformVerts( } static void deformVertsEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm= get_dm(md->scene, ob, editData, derivedData, NULL, 0); diff --git a/source/blender/modifiers/intern/MOD_softbody.c b/source/blender/modifiers/intern/MOD_softbody.c index d49f9701834..654abbe02f1 100644 --- a/source/blender/modifiers/intern/MOD_softbody.c +++ b/source/blender/modifiers/intern/MOD_softbody.c @@ -32,7 +32,6 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" @@ -42,7 +41,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" +#include "DNA_scene_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" @@ -51,12 +50,9 @@ #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -73,13 +69,11 @@ #include "BKE_subsurf.h" #include "BKE_texture.h" -#include "depsgraph_private.h" #include "BKE_deform.h" #include "BKE_shrinkwrap.h" #include "LOD_decimation.h" -#include "CCGSubSurf.h" #include "RE_shader_ext.h" diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 2ed4a3ff0cc..55d3a082e0a 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -32,31 +32,21 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" +#include "BLI_edgehash.h" #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_material_types.h" -#include "DNA_object_fluidsim.h" +#include "DNA_meshdata_types.h" #include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_displist.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_multires.h" #include "BKE_key.h" #include "BKE_lattice.h" @@ -73,15 +63,13 @@ #include "BKE_subsurf.h" #include "BKE_texture.h" -#include "depsgraph_private.h" #include "BKE_deform.h" -#include "BKE_shrinkwrap.h" + +#include "BKE_utildefines.h" #include "LOD_decimation.h" -#include "CCGSubSurf.h" -#include "RE_shader_ext.h" #include "MOD_modifiertypes.h" @@ -181,8 +169,7 @@ static void dm_calc_normal(DerivedMesh *dm, float (*temp_nors)[3]) /* only one face attached to that edge */ /* an edge without another attached- the weight on this is * undefined, M_PI/2 is 90d in radians and that seems good enough */ - VECCOPY(edge_normal, face_nors[edge_ref->f1]) - mul_v3_fl(edge_normal, M_PI/2); + mul_v3_v3fl(edge_normal, face_nors[edge_ref->f1], M_PI/2); } add_v3_v3(temp_nors[ed_v1], edge_normal); add_v3_v3(temp_nors[ed_v2], edge_normal); @@ -655,7 +642,7 @@ static DerivedMesh *applyModifier(ModifierData *md, static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - EditMesh *editData, + struct EditMesh *editData, DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index b1984ed003b..02402988137 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -32,54 +32,20 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "DNA_scene_types.h" +#include "DNA_object_types.h" +#include "DNA_meshdata_types.h" -#include "MEM_guardedalloc.h" - -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_material_types.h" -#include "DNA_object_fluidsim.h" - - -#include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.h" -#include "BKE_global.h" -#include "BKE_multires.h" -#include "BKE_key.h" -#include "BKE_lattice.h" -#include "BKE_material.h" -#include "BKE_mesh.h" -#include "BKE_modifier.h" -#include "BKE_object.h" -#include "BKE_paint.h" -#include "BKE_particle.h" -#include "BKE_pointcache.h" #include "BKE_scene.h" -#include "BKE_smoke.h" -#include "BKE_softbody.h" #include "BKE_subsurf.h" -#include "BKE_texture.h" - -#include "depsgraph_private.h" -#include "BKE_deform.h" +#include "BKE_DerivedMesh.h" #include "CCGSubSurf.h" -#include "RE_shader_ext.h" - #include "MOD_modifiertypes.h" @@ -143,7 +109,7 @@ static DerivedMesh *applyModifier( } static DerivedMesh *applyModifierEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData) { SubsurfModifierData *smd = (SubsurfModifierData*) md; diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index 7dff94001c8..116483caea6 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -32,56 +32,17 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" -#include "MEM_guardedalloc.h" - -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_material_types.h" -#include "DNA_object_fluidsim.h" +#include "DNA_scene_types.h" +#include "DNA_object_types.h" +#include "DNA_meshdata_types.h" - -#include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" +#include "MEM_guardedalloc.h" #include "BKE_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.h" -#include "BKE_global.h" -#include "BKE_multires.h" -#include "BKE_key.h" -#include "BKE_lattice.h" -#include "BKE_material.h" -#include "BKE_mesh.h" -#include "BKE_modifier.h" -#include "BKE_object.h" -#include "BKE_paint.h" -#include "BKE_particle.h" -#include "BKE_pointcache.h" -#include "BKE_scene.h" -#include "BKE_smoke.h" -#include "BKE_softbody.h" -#include "BKE_subsurf.h" -#include "BKE_texture.h" - -#include "depsgraph_private.h" -#include "BKE_deform.h" -#include "BKE_shrinkwrap.h" - -#include "LOD_decimation.h" - -#include "CCGSubSurf.h" - -#include "RE_shader_ext.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index 68dba816fab..8c08bce4df9 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -31,17 +31,12 @@ */ #include "DNA_modifier_types.h" -#include "DNA_customdata_types.h" -#include "DNA_texture_types.h" #include "DNA_object_types.h" -#include "DNA_mesh_types.h" #include "DNA_curve_types.h" #include "MEM_guardedalloc.h" #include "MOD_util.h" -#include "BKE_customdata.h" -#include "BKE_DerivedMesh.h" #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" #include "BKE_displist.h" diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 782e7f478d9..f71e1c1f07d 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -32,54 +32,21 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" +#include "BLI_math.h" #include "BLI_uvproject.h" -#include "MEM_guardedalloc.h" - -#include "DNA_armature_types.h" +#include "DNA_object_types.h" #include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_material_types.h" -#include "DNA_object_fluidsim.h" - - -#include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" -#include "BKE_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.h" -#include "BKE_global.h" -#include "BKE_multires.h" -#include "BKE_key.h" -#include "BKE_lattice.h" -#include "BKE_material.h" -#include "BKE_mesh.h" -#include "BKE_modifier.h" -#include "BKE_object.h" -#include "BKE_paint.h" -#include "BKE_particle.h" -#include "BKE_pointcache.h" -#include "BKE_scene.h" -#include "BKE_smoke.h" -#include "BKE_softbody.h" -#include "BKE_subsurf.h" -#include "BKE_texture.h" - -#include "depsgraph_private.h" -#include "BKE_deform.h" -#include "BKE_shrinkwrap.h" +#include "DNA_meshdata_types.h" +#include "DNA_customdata_types.h" -#include "CCGSubSurf.h" +#include "MEM_guardedalloc.h" -#include "RE_shader_ext.h" +#include "BKE_DerivedMesh.h" +#include "depsgraph_private.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" @@ -152,7 +119,7 @@ static void foreachIDLink(ModifierData *md, Object *ob, } static void updateDepgraph(ModifierData *md, - DagForest *forest, Scene *scene, Object *ob, DagNode *obNode) + DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode) { UVProjectModifierData *umd = (UVProjectModifierData*) md; int i; @@ -368,16 +335,16 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd, Projector *best_projector; float best_dot; - VECCOPY(co1, coords[mf->v1]); - VECCOPY(co2, coords[mf->v2]); - VECCOPY(co3, coords[mf->v3]); + copy_v3_v3(co1, coords[mf->v1]); + copy_v3_v3(co2, coords[mf->v2]); + copy_v3_v3(co3, coords[mf->v3]); /* get the untransformed face normal */ if(mf->v4) { - VECCOPY(co4, coords[mf->v4]); - normal_quad_v3( face_no,co1, co2, co3, co4); + copy_v3_v3(co4, coords[mf->v4]); + normal_quad_v3(face_no, co1, co2, co3, co4); } else { - normal_tri_v3( face_no,co1, co2, co3); + normal_tri_v3(face_no, co1, co2, co3); } /* find the projector which the face points at most directly @@ -456,7 +423,7 @@ static DerivedMesh *applyModifier( } static DerivedMesh *applyModifierEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index 1306846844d..c6f0e96702e 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -32,52 +32,24 @@ #include "stddef.h" #include "string.h" -#include "stdarg.h" #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" -#include "BLI_uvproject.h" +#include "BLI_math.h" + +#include "DNA_object_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_scene_types.h" +#include "DNA_customdata_types.h" +#include "BKE_DerivedMesh.h" #include "MEM_guardedalloc.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_material_types.h" -#include "DNA_object_fluidsim.h" - - -#include "BKE_action.h" -#include "BKE_bmesh.h" -#include "BKE_cloth.h" -#include "BKE_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.h" -#include "BKE_global.h" -#include "BKE_multires.h" -#include "BKE_key.h" -#include "BKE_lattice.h" -#include "BKE_material.h" -#include "BKE_mesh.h" -#include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_paint.h" -#include "BKE_particle.h" -#include "BKE_pointcache.h" -#include "BKE_scene.h" -#include "BKE_smoke.h" -#include "BKE_softbody.h" -#include "BKE_subsurf.h" -#include "BKE_texture.h" #include "depsgraph_private.h" #include "BKE_deform.h" -#include "BKE_shrinkwrap.h" -#include "CCGSubSurf.h" #include "RE_shader_ext.h" @@ -263,15 +235,13 @@ static void wavemod_get_texture_coords(WaveModifierData *wmd, Object *ob, for(i = 0; i < numVerts; ++i, ++co, ++texco) { switch(texmapping) { case MOD_WAV_MAP_LOCAL: - VECCOPY(*texco, *co); + copy_v3_v3(*texco, *co); break; case MOD_WAV_MAP_GLOBAL: - VECCOPY(*texco, *co); - mul_m4_v3(ob->obmat, *texco); + mul_v3_m4v3(*texco, ob->obmat, *co); break; case MOD_WAV_MAP_OBJECT: - VECCOPY(*texco, *co); - mul_m4_v3(ob->obmat, *texco); + mul_v3_m4v3(*texco, ob->obmat, *co); mul_m4_v3(wmd->map_object->imat, *texco); break; } @@ -454,7 +424,7 @@ static void deformVerts( } static void deformVertsEM( - ModifierData *md, Object *ob, EditMesh *editData, + ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm= derivedData; -- cgit v1.2.3