1 --- OpenNI-OpenNI-1e9524f/Samples/NiViewer/glh/glh_linear.h.orig 2013-11-12 17:30:03.000000000 +0100
2 +++ OpenNI-OpenNI-1e9524f/Samples/NiViewer/glh/glh_linear.h 2017-11-29 16:09:12.957112371 +0100
4 #define GLH_EPSILON GLH_REAL(10e-6)
\r
5 #define GLH_PI GLH_REAL(3.1415926535897932384626433832795)
\r
7 -#define equivalent(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
\r
8 +#define glh_equivalent(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
\r
14 real norm = q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3];
\r
16 - s = (equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
\r
17 + s = (glh_equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
\r
23 real sin_theta = real(sin(theta));
\r
25 - if (!equivalent(sqnorm,GLH_ONE))
\r
26 + if (!glh_equivalent(sqnorm,GLH_ONE))
\r
27 sin_theta /= real(sqrt(sqnorm));
\r
28 x = sin_theta * axis.v[0];
\r
29 y = sin_theta * axis.v[1];
\r
30 @@ -1216,14 +1216,14 @@
34 - if(equivalent(alpha,GLH_ONE))
\r
35 + if(glh_equivalent(alpha,GLH_ONE))
\r
37 *this = identity();
\r
41 // ensures that the anti-parallel case leads to a positive dot
\r
42 - if(equivalent(alpha,-GLH_ONE))
\r
43 + if(glh_equivalent(alpha,-GLH_ONE))
\r
50 real rnorm = GLH_ONE / real(sqrt(w * w + x * x + y * y + z * z));
\r
51 - if (equivalent(rnorm, GLH_ZERO))
\r
52 + if (glh_equivalent(rnorm, GLH_ZERO))
\r
56 @@ -1439,10 +1439,10 @@
58 bool operator == ( const quaternion & q1, const quaternion & q2 )
\r
60 - return (equivalent(q1.x, q2.x) &&
\r
61 - equivalent(q1.y, q2.y) &&
\r
62 - equivalent(q1.z, q2.z) &&
\r
63 - equivalent(q1.w, q2.w) );
\r
64 + return (glh_equivalent(q1.x, q2.x) &&
\r
65 + glh_equivalent(q1.y, q2.y) &&
\r
66 + glh_equivalent(q1.z, q2.z) &&
\r
67 + glh_equivalent(q1.w, q2.w) );
\r