X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FQuaternions.h;h=29f82d7f8a7aac5a3eb959d563461c3eb0d37fae;hb=72ad782ae757aab6f247a7b0f58d17756c98734b;hp=cfa2bace88ab4ff0fb5c057400f6501c45898bf3;hpb=24004d6ab1e68faaf85ece11b566449997da5013;p=lugaru.git diff --git a/Source/Quaternions.h b/Source/Quaternions.h index cfa2bac..29f82d7 100644 --- a/Source/Quaternions.h +++ b/Source/Quaternions.h @@ -226,7 +226,8 @@ inline void XYZ::vec(Vector add) inline bool XYZ::operator==(XYZ add) { - if (x == add.x && y == add.y && z == add.z)return 1; + if (x == add.x && y == add.y && z == add.z) + return 1; return 0; } @@ -250,10 +251,11 @@ inline float fast_sqrt (register float arg) // Can replace with slower return std::sqrt(arg); register float result; - if (arg == 0.0) return 0.0; + if (arg == 0.0) + return 0.0; asm { - frsqrte result, arg // Calculate Square root + frsqrte result, arg // Calculate Square root } // Newton Rhapson iterations. @@ -401,12 +403,12 @@ inline bool sphere_line_intersection ( //~ static float x , y , z; static float a, b, c, /*mu,*/ i ; - if (x1 > x3 + r && x2 > x3 + r)return(0); - if (x1 < x3 - r && x2 < x3 - r)return(0); - if (y1 > y3 + r && y2 > y3 + r)return(0); - if (y1 < y3 - r && y2 < y3 - r)return(0); - if (z1 > z3 + r && z2 > z3 + r)return(0); - if (z1 < z3 - r && z2 < z3 - r)return(0); + if (x1 > x3 + r && x2 > x3 + r) return(0); + if (x1 < x3 - r && x2 < x3 - r) return(0); + if (y1 > y3 + r && y2 > y3 + r) return(0); + if (y1 < y3 - r && y2 < y3 - r) return(0); + if (z1 > z3 + r && z2 > z3 + r) return(0); + if (z1 < z3 - r && z2 < z3 - r) return(0); a = square(x2 - x1) + square(y2 - y1) + square(z2 - z1); b = 2 * ( (x2 - x1) * (x1 - x3) + (y2 - y1) * (y1 - y3) @@ -439,12 +441,12 @@ inline bool sphere_line_intersection ( //~ static float x , y , z; static float a, b, c, /*mu,*/ i ; - if (p1->x > p3->x + *r && p2->x > p3->x + *r)return(0); - if (p1->x < p3->x - *r && p2->x < p3->x - *r)return(0); - if (p1->y > p3->y + *r && p2->y > p3->y + *r)return(0); - if (p1->y < p3->y - *r && p2->y < p3->y - *r)return(0); - if (p1->z > p3->z + *r && p2->z > p3->z + *r)return(0); - if (p1->z < p3->z - *r && p2->z < p3->z - *r)return(0); + if (p1->x > p3->x + *r && p2->x > p3->x + *r) return(0); + if (p1->x < p3->x - *r && p2->x < p3->x - *r) return(0); + if (p1->y > p3->y + *r && p2->y > p3->y + *r) return(0); + if (p1->y < p3->y - *r && p2->y < p3->y - *r) return(0); + if (p1->z > p3->z + *r && p2->z > p3->z + *r) return(0); + if (p1->z < p3->z - *r && p2->z < p3->z - *r) return(0); a = square(p2->x - p1->x) + square(p2->y - p1->y) + square(p2->z - p1->z); b = 2 * ( (p2->x - p1->x) * (p1->x - p3->x) + (p2->y - p1->y) * (p1->y - p3->y)