Revision: 28137
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28137
Author: campbellbarton
Date: 2010-04-12 02:36:50 +0200 (Mon, 12 Apr 2010)
Log Message:
-----------
- use more inline math funcitons where possible
- swapped in less verbose math functons
- modifier include cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_fluidsim.h
trunk/blender/source/blender/blenkernel/BKE_object.h
trunk/blender/source/blender/blenkernel/BKE_shrinkwrap.h
trunk/blender/source/blender/blenkernel/BKE_subsurf.h
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/editors/mesh/editmesh_lib.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/modifiers/intern/MOD_armature.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
trunk/blender/source/blender/modifiers/intern/MOD_build.c
trunk/blender/source/blender/modifiers/intern/MOD_cast.c
trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
trunk/blender/source/blender/modifiers/intern/MOD_curve.c
trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
trunk/blender/source/blender/modifiers/intern/MOD_displace.c
trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
trunk/blender/source/blender/modifiers/intern/MOD_hook.c
trunk/blender/source/blender/modifiers/intern/MOD_lattice.c
trunk/blender/source/blender/modifiers/intern/MOD_mask.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
trunk/blender/source/blender/modifiers/intern/MOD_multires.c
trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c
trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
trunk/blender/source/blender/modifiers/intern/MOD_shapekey.c
trunk/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
trunk/blender/source/blender/modifiers/intern/MOD_smooth.c
trunk/blender/source/blender/modifiers/intern/MOD_softbody.c
trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c
trunk/blender/source/blender/modifiers/intern/MOD_surface.c
trunk/blender/source/blender/modifiers/intern/MOD_util.c
trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
trunk/blender/source/blender/modifiers/intern/MOD_wave.c
Modified: trunk/blender/source/blender/blenkernel/BKE_fluidsim.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_fluidsim.h 2010-04-11
23:52:47 UTC (rev 28136)
+++ trunk/blender/source/blender/blenkernel/BKE_fluidsim.h 2010-04-12
00:36:50 UTC (rev 28137)
@@ -34,6 +34,7 @@
struct Object;
struct Scene;
struct FluidsimModifierData;
+struct FluidsimSettings;
struct DerivedMesh;
struct MVert;
Modified: trunk/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_object.h 2010-04-11
23:52:47 UTC (rev 28136)
+++ trunk/blender/source/blender/blenkernel/BKE_object.h 2010-04-12
00:36:50 UTC (rev 28137)
@@ -46,6 +46,7 @@
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);
Modified: trunk/blender/source/blender/blenkernel/BKE_shrinkwrap.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_shrinkwrap.h 2010-04-11
23:52:47 UTC (rev 28136)
+++ trunk/blender/source/blender/blenkernel/BKE_shrinkwrap.h 2010-04-12
00:36:50 UTC (rev 28137)
@@ -107,7 +107,7 @@
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;
Modified: trunk/blender/source/blender/blenkernel/BKE_subsurf.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_subsurf.h 2010-04-11
23:52:47 UTC (rev 28136)
+++ trunk/blender/source/blender/blenkernel/BKE_subsurf.h 2010-04-12
00:36:50 UTC (rev 28137)
@@ -52,7 +52,7 @@
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 @@
int lvl, totlvl;
float (*orco)[3];
- Object *ob;
+ struct Object *ob;
int modified;
void (*update)(DerivedMesh*);
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2010-04-11
23:52:47 UTC (rev 28136)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2010-04-12
00:36:50 UTC (rev 28137)
@@ -1983,8 +1983,10 @@
/* 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 @@
}
/* 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);
}
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_lib.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_lib.c 2010-04-11
23:52:47 UTC (rev 28136)
+++ trunk/blender/source/blender/editors/mesh/editmesh_lib.c 2010-04-12
00:36:50 UTC (rev 28137)
@@ -1316,8 +1316,8 @@
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 @@
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)
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c
2010-04-11 23:52:47 UTC (rev 28136)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c
2010-04-12 00:36:50 UTC (rev 28137)
@@ -189,8 +189,8 @@
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 @@
}
if (clip) {
if (mmd->mirror_ob) {
-
mul_v3_m4v3(loc, imtx, loc);
+ mul_m4_v3(imtx,
loc);
}
copy_v3_v3(td->loc,
loc);
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_armature.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_armature.c
2010-04-11 23:52:47 UTC (rev 28136)
+++ trunk/blender/source/blender/modifiers/intern/MOD_armature.c
2010-04-12 00:36:50 UTC (rev 28137)
@@ -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 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 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 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)
{
Modified: trunk/blender/source/blender/modifiers/intern/MOD_array.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_array.c 2010-04-11
23:52:47 UTC (rev 28136)
+++ trunk/blender/source/blender/modifiers/intern/MOD_array.c 2010-04-12
00:36:50 UTC (rev 28137)
@@ -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 @@
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 @@
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 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 @@
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 @@
*/
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 @@
/* 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 @@
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 @@
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 @@
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 *applyModifierEM(
- ModifierData *md, Object *ob, EditMesh *editData,
+ ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData)
{
return applyModifier(md, ob, derivedData, 0, 1);
Modified: trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_bevel.c 2010-04-11
23:52:47 UTC (rev 28136)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
