Commit ff534d1cb590037b46053e1f4b0dba07024f3c59
2008-05-08T23:45:05
use float constants when assigning to floats
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109
diff --git a/demo/trackball.c b/demo/trackball.c
index d1fa869..37d7f86 100644
--- a/demo/trackball.c
+++ b/demo/trackball.c
@@ -62,7 +62,7 @@
* simple example, though, so that is left as an Exercise for the
* Programmer.
*/
-#define TRACKBALLSIZE (0.4)
+#define TRACKBALLSIZE (0.4f)
/*
* Local function prototypes (not defined in trackball.h)
@@ -130,7 +130,7 @@ vscale(float *v, float div)
static void
vnormal(float *v)
{
- vscale(v,1.0/vlength(v));
+ vscale(v,1.0f/vlength(v));
}
static float
@@ -190,14 +190,14 @@ trackball(float q[4], float p1x, float p1y, float p2x, float p2y)
* Figure out how much to rotate around that axis.
*/
vsub(p1,p2,d);
- t = vlength(d) / (2.0*TRACKBALLSIZE);
+ t = vlength(d) / (2.0f*TRACKBALLSIZE);
/*
* Avoid problems with out-of-control values...
*/
- if (t > 1.0) t = 1.0;
- if (t < -1.0) t = -1.0;
- phi = 2.0 * asin(t);
+ if (t > 1.0f) t = 1.0f;
+ if (t < -1.0f) t = -1.0f;
+ phi = 2.0f * asin(t);
axis_to_quat(a,phi,q);
}
@@ -210,8 +210,8 @@ axis_to_quat(float a[3], float phi, float q[4])
{
vnormal(a);
vcopy(a,q);
- vscale(q,sin(phi/2.0));
- q[3] = cos(phi/2.0);
+ vscale(q,sin(phi/2.0f));
+ q[3] = cos(phi/2.0f);
}
/*
@@ -224,10 +224,10 @@ tb_project_to_sphere(float r, float x, float y)
float d, t, z;
d = sqrt(x*x + y*y);
- if (d < r * 0.70710678118654752440) { /* Inside sphere */
+ if (d < r * 0.70710678118654752440f) { /* Inside sphere */
z = sqrt(r*r - d*d);
} else { /* On hyperbola */
- t = r / 1.41421356237309504880;
+ t = r / 1.41421356237309504880f;
z = t*t / d;
}
return z;
@@ -304,24 +304,24 @@ normalize_quat(float q[4])
void
build_rotmatrix(float m[4][4], float q[4])
{
- m[0][0] = 1.0 - 2.0 * (q[1] * q[1] + q[2] * q[2]);
- m[0][1] = 2.0 * (q[0] * q[1] - q[2] * q[3]);
- m[0][2] = 2.0 * (q[2] * q[0] + q[1] * q[3]);
- m[0][3] = 0.0;
-
- m[1][0] = 2.0 * (q[0] * q[1] + q[2] * q[3]);
- m[1][1]= 1.0 - 2.0 * (q[2] * q[2] + q[0] * q[0]);
- m[1][2] = 2.0 * (q[1] * q[2] - q[0] * q[3]);
- m[1][3] = 0.0;
-
- m[2][0] = 2.0 * (q[2] * q[0] - q[1] * q[3]);
- m[2][1] = 2.0 * (q[1] * q[2] + q[0] * q[3]);
- m[2][2] = 1.0 - 2.0 * (q[1] * q[1] + q[0] * q[0]);
- m[2][3] = 0.0;
-
- m[3][0] = 0.0;
- m[3][1] = 0.0;
- m[3][2] = 0.0;
- m[3][3] = 1.0;
+ m[0][0] = 1.0f - 2.0f * (q[1] * q[1] + q[2] * q[2]);
+ m[0][1] = 2.0f * (q[0] * q[1] - q[2] * q[3]);
+ m[0][2] = 2.0f * (q[2] * q[0] + q[1] * q[3]);
+ m[0][3] = 0.0f;
+
+ m[1][0] = 2.0f * (q[0] * q[1] + q[2] * q[3]);
+ m[1][1]= 1.0f - 2.0f * (q[2] * q[2] + q[0] * q[0]);
+ m[1][2] = 2.0f * (q[1] * q[2] - q[0] * q[3]);
+ m[1][3] = 0.0f;
+
+ m[2][0] = 2.0f * (q[2] * q[0] - q[1] * q[3]);
+ m[2][1] = 2.0f * (q[1] * q[2] + q[0] * q[3]);
+ m[2][2] = 1.0f - 2.0f * (q[1] * q[1] + q[0] * q[0]);
+ m[2][3] = 0.0f;
+
+ m[3][0] = 0.0f;
+ m[3][1] = 0.0f;
+ m[3][2] = 0.0f;
+ m[3][3] = 1.0f;
}