Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenlib/intern/math_vector_inline.c')
-rw-r--r--source/blender/blenlib/intern/math_vector_inline.c120
1 files changed, 111 insertions, 9 deletions
diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c
index 8b09cb86d3a..2181150f640 100644
--- a/source/blender/blenlib/intern/math_vector_inline.c
+++ b/source/blender/blenlib/intern/math_vector_inline.c
@@ -45,6 +45,14 @@ MINLINE void zero_v3(float r[3])
r[2]= 0.0f;
}
+MINLINE void zero_v4(float r[4])
+{
+ r[0]= 0.0f;
+ r[1]= 0.0f;
+ r[2]= 0.0f;
+ r[3]= 0.0f;
+}
+
MINLINE void copy_v2_v2(float r[2], const float a[2])
{
r[0]= a[0];
@@ -58,6 +66,14 @@ MINLINE void copy_v3_v3(float r[3], const float a[3])
r[2]= a[2];
}
+MINLINE void copy_v4_v4(float r[4], float a[4])
+{
+ r[0]= a[0];
+ r[1]= a[1];
+ r[2]= a[2];
+ r[3]= a[3];
+}
+
MINLINE void swap_v2_v2(float a[2], float b[2])
{
SWAP(float, a[0], b[0]);
@@ -71,6 +87,14 @@ MINLINE void swap_v3_v3(float a[3], float b[3])
SWAP(float, a[2], b[2]);
}
+MINLINE void swap_v4_v4(float a[4], float b[4])
+{
+ SWAP(float, a[0], b[0]);
+ SWAP(float, a[1], b[1]);
+ SWAP(float, a[2], b[2]);
+ SWAP(float, a[3], b[3]);
+}
+
/********************************* Arithmetic ********************************/
MINLINE void add_v2_v2(float *r, float *a)
@@ -131,6 +155,12 @@ MINLINE void mul_v2_fl(float *v1, float f)
v1[1]*= f;
}
+MINLINE void mul_v2_v2fl(float r[2], const float a[2], float f)
+{
+ r[0]= a[0]*f;
+ r[1]= a[1]*f;
+}
+
MINLINE void mul_v3_fl(float r[3], float f)
{
r[0] *= f;
@@ -138,13 +168,19 @@ MINLINE void mul_v3_fl(float r[3], float f)
r[2] *= f;
}
-MINLINE void mul_v3_v3fl(float r[3], float a[3], float f)
+MINLINE void mul_v3_v3fl(float r[3], const float a[3], float f)
{
r[0]= a[0]*f;
r[1]= a[1]*f;
r[2]= a[2]*f;
}
+MINLINE void mul_v2_v2(float r[2], const float a[2])
+{
+ r[0] *= a[0];
+ r[1] *= a[1];
+}
+
MINLINE void mul_v3_v3(float r[3], float a[3])
{
r[0] *= a[0];
@@ -166,6 +202,12 @@ MINLINE void madd_v3_v3v3(float r[3], float a[3], float b[3])
r[2] += a[2]*b[2];
}
+MINLINE void madd_v2_v2v2fl(float r[2], const float a[2], const float b[2], const float f)
+{
+ r[0] = a[0] + b[0]*f;
+ r[1] = a[1] + b[1]*f;
+}
+
MINLINE void madd_v3_v3v3fl(float r[3], float a[3], float b[3], float f)
{
r[0] = a[0] + b[0]*f;
@@ -263,38 +305,49 @@ MINLINE float len_v3v3(const float a[3], const float b[3])
return len_v3(d);
}
-MINLINE float normalize_v2(float n[2])
+MINLINE float normalize_v2_v2(float r[2], const float a[2])
{
- float d= dot_v2v2(n, n);
+ float d= dot_v2v2(a, a);
if(d > 1.0e-35f) {
d= sqrtf(d);
- mul_v2_fl(n, 1.0f/d);
+ mul_v2_v2fl(r, a, 1.0f/d);
} else {
- zero_v2(n);
+ zero_v2(r);
d= 0.0f;
}
+
return d;
}
-MINLINE float normalize_v3(float n[3])
+MINLINE float normalize_v2(float n[2])
{
- float d= dot_v3v3(n, n);
+ return normalize_v2_v2(n, n);
+}
+
+MINLINE float normalize_v3_v3(float r[3], const float a[3])
+{
+ float d= dot_v3v3(a, a);
/* a larger value causes normalize errors in a
scaled down models with camera xtreme close */
if(d > 1.0e-35f) {
d= sqrtf(d);
- mul_v3_fl(n, 1.0f/d);
+ mul_v3_v3fl(r, a, 1.0f/d);
}
else {
- zero_v3(n);
+ zero_v3(r);
d= 0.0f;
}
return d;
}
+MINLINE float normalize_v3(float n[3])
+{
+ return normalize_v3_v3(n, n);
+}
+
MINLINE void normal_short_to_float_v3(float *out, short *in)
{
out[0] = in[0]*(1.0f/32767.0f);
@@ -309,5 +362,54 @@ MINLINE void normal_float_to_short_v3(short *out, float *in)
out[2] = (short)(in[2]*32767.0f);
}
+/********************************* Comparison ********************************/
+
+MINLINE int is_zero_v3(float *v)
+{
+ return (v[0] == 0 && v[1] == 0 && v[2] == 0);
+}
+
+MINLINE int is_one_v3(float *v)
+{
+ return (v[0] == 1 && v[1] == 1 && v[2] == 1);
+}
+
+MINLINE int equals_v3v3(float *v1, float *v2)
+{
+ return ((v1[0]==v2[0]) && (v1[1]==v2[1]) && (v1[2]==v2[2]));
+}
+
+MINLINE int compare_v3v3(float *v1, float *v2, float limit)
+{
+ if(fabs(v1[0]-v2[0])<limit)
+ if(fabs(v1[1]-v2[1])<limit)
+ if(fabs(v1[2]-v2[2])<limit)
+ return 1;
+
+ return 0;
+}
+
+MINLINE int compare_len_v3v3(float *v1, float *v2, float limit)
+{
+ float x,y,z;
+
+ x=v1[0]-v2[0];
+ y=v1[1]-v2[1];
+ z=v1[2]-v2[2];
+
+ return ((x*x + y*y + z*z) < (limit*limit));
+}
+
+MINLINE int compare_v4v4(float *v1, float *v2, float limit)
+{
+ if(fabs(v1[0]-v2[0])<limit)
+ if(fabs(v1[1]-v2[1])<limit)
+ if(fabs(v1[2]-v2[2])<limit)
+ if(fabs(v1[3]-v2[3])<limit)
+ return 1;
+
+ return 0;
+}
+
#endif /* BLI_MATH_VECTOR_INLINE */