diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-04-12 04:36:50 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-12 04:36:50 +0400 |
commit | 8c3ab1c2a40c17901546575adda3eba5d76b25ba (patch) | |
tree | ea7c1febdbc344c7173a8f9936156b98e680fa47 /source/blender/modifiers/intern/MOD_decimate.c | |
parent | 7d9898229582b44a525c5752550a2494adaa4fd6 (diff) |
- use more inline math funcitons where possible
- swapped in less verbose math functons
- modifier include cleanup
Diffstat (limited to 'source/blender/modifiers/intern/MOD_decimate.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_decimate.c | 18 |
1 files changed, 5 insertions, 13 deletions
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) { |