diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-28 21:08:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-28 21:08:33 +0400 |
| commit | 9b9c4184c88c49ff96f3f23cbfbd00f6811d7301 (patch) | |
| tree | 4c5aaf763f28710d07b3ec364088a98de8ae9794 /source/blender/editors/armature | |
| parent | faf07c3e2b6cb180d1580b4160ff6534b4754b76 (diff) | |
misc nodes & editors: floats were being implicitly promoted to doubles, adjust to use floats.
+ minor update to demo_mode
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 720413650fa..67773d358d0 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -182,16 +182,16 @@ static void laplacian_triangle_area(LaplacianSystem *sys, int i1, int i2, int i3 t2= cotan_weight(v2, v3, v1); t3= cotan_weight(v3, v1, v2); - if(RAD2DEG(angle_v3v3v3(v2, v1, v3)) > 90) obtuse= 1; - else if(RAD2DEG(angle_v3v3v3(v1, v2, v3)) > 90) obtuse= 2; - else if(RAD2DEG(angle_v3v3v3(v1, v3, v2)) > 90) obtuse= 3; + if(RAD2DEGF(angle_v3v3v3(v2, v1, v3)) > 90) obtuse= 1; + else if(RAD2DEGF(angle_v3v3v3(v1, v2, v3)) > 90) obtuse= 2; + else if(RAD2DEGF(angle_v3v3v3(v1, v3, v2)) > 90) obtuse= 3; if (obtuse > 0) { area= area_tri_v3(v1, v2, v3); - varea[i1] += (obtuse == 1)? area: area*0.5; - varea[i2] += (obtuse == 2)? area: area*0.5; - varea[i3] += (obtuse == 3)? area: area*0.5; + varea[i1] += (obtuse == 1)? area: area*0.5f; + varea[i2] += (obtuse == 2)? area: area*0.5f; + varea[i3] += (obtuse == 3)? area: area*0.5f; } else { len1= len_v3v3(v2, v3); @@ -492,7 +492,7 @@ static int heat_ray_source_visible(LaplacianSystem *sys, int vertex, int source) sub_v3_v3v3(data.vec, end, data.start); madd_v3_v3v3fl(data.start, data.start, data.vec, 1e-5); - mul_v3_fl(data.vec, 1.0f - 2e-5); + mul_v3_fl(data.vec, 1.0f - 2e-5f); /* pass normalized vec + distance to bvh */ hit.index = -1; @@ -1041,9 +1041,9 @@ void rigid_deform_end(int cancel) #define MESHDEFORM_TAG_INTERIOR 2 #define MESHDEFORM_TAG_EXTERIOR 3 -#define MESHDEFORM_LEN_THRESHOLD 1e-6 +#define MESHDEFORM_LEN_THRESHOLD 1e-6f -#define MESHDEFORM_MIN_INFLUENCE 0.0005 +#define MESHDEFORM_MIN_INFLUENCE 0.0005f static int MESHDEFORM_OFFSET[7][3] = {{0,0,0}, {1,0,0}, {-1,0,0}, {0,1,0}, {0,-1,0}, {0,0,1}, {0,0,-1}}; @@ -1146,7 +1146,7 @@ static int meshdeform_tri_intersect(float orig[3], float end[3], float vert0[3], isectco[1]= (1.0f - u - v)*vert0[1] + u*vert1[1] + v*vert2[1]; isectco[2]= (1.0f - u - v)*vert0[2] + u*vert1[2] + v*vert2[2]; - uvw[0]= 1.0 - u - v; + uvw[0]= 1.0f - u - v; uvw[1]= u; uvw[2]= v; |