use radians instead of degrees (almost) everywhere

Andrew Meadows committed 12 years ago

Commit aa8c2fc1 parent de8165c51 files · +302 −306Browse files

Showing the changes to interface/src/Util.cpp (1 of 51 files). Show all

Unified · Split

     printf("%4.2f, %4.2f, %4.2f\n", vec.x, vec.y, vec.z);
 }
-//  Return the azimuth angle in degrees between two points.
+//  Return the azimuth angle (in radians) between two points.
 float azimuth_to(glm::vec3 head_pos, glm::vec3 source_pos) {
-    return atan2(head_pos.x - source_pos.x, head_pos.z - source_pos.z) * 180.0f / PIf;
+    return atan2(head_pos.x - source_pos.x, head_pos.z - source_pos.z);
 }
-//  Return the angle in degrees between the head and an object in the scene.  The value is zero if you are looking right at it.  The angle is negative if the object is to your right.
+// Return the angle (in radians) between the head and an object in the scene.
+// The value is zero if you are looking right at it.
+// The angle is negative if the object is to your right.
 float angle_to(glm::vec3 head_pos, glm::vec3 source_pos, float render_yaw, float head_yaw) {
-    return atan2(head_pos.x - source_pos.x, head_pos.z - source_pos.z) * 180.0f / PIf + render_yaw + head_yaw;
+    return atan2(head_pos.x - source_pos.x, head_pos.z - source_pos.z) + render_yaw + head_yaw;
 }
-//  Helper function returns the positive angle in degrees between two 3D vectors
+//  Helper function returns the positive angle (in radians) between two 3D vectors
 float angleBetween(const glm::vec3& v1, const glm::vec3& v2) {
-    return acos((glm::dot(v1, v2)) / (glm::length(v1) * glm::length(v2))) * 180.f / PIf;
+    return acosf((glm::dot(v1, v2)) / (glm::length(v1) * glm::length(v2)));
 }
 //  Helper function return the rotation from the first vector onto the second
         return glm::quat();
     }
     glm::vec3 axis;
-    if (angle > 179.99f) { // 180 degree rotation; must use another axis
+    if (angle > 179.99f * RADIANS_PER_DEGREE) { // 180 degree rotation; must use another axis
         axis = glm::cross(v1, glm::vec3(1.0f, 0.0f, 0.0f));
         float axisLength = glm::length(axis);
         if (axisLength < EPSILON) { // parallel to x; y will work
     return textRenderer(mono)->computeWidth(ch) * (scale / 0.10);
 }
-void drawText(int x, int y, float scale, float rotate, int mono,
+void drawText(int x, int y, float scale, float radians, int mono,
               char const* string, const float* color) {
     //
     //  Draws text on screen as stroked so it can be resized
     glPushMatrix();
     glTranslatef(static_cast<float>(x), static_cast<float>(y), 0.0f);
     glColor3fv(color);
-    glRotated(rotate,0,0,1);
+    glRotated(double(radians * DEGREES_PER_RADIAN), 0.0, 0.0, 1.0);
-    glScalef(scale / 0.10, scale / 0.10, 1.0);
+    glScalef(scale / 0.1f, scale / 0.1f, 1.f);
     textRenderer(mono)->draw(0, 0, string);
     glPopMatrix();
 }
-void drawvec3(int x, int y, float scale, float rotate, float thick, int mono, glm::vec3 vec, float r, float g, float b) {
+void drawvec3(int x, int y, float scale, float radians, float thick, int mono, glm::vec3 vec, float r, float g, float b) {
     //
-    //  Draws text on screen as stroked so it can be resized
+    //  Draws vec3 on screen as stroked so it can be resized
     //
     char vectext[20];
     sprintf(vectext,"%3.1f,%3.1f,%3.1f", vec.x, vec.y, vec.z);
     glPushMatrix();
     glTranslatef(static_cast<float>(x), static_cast<float>(y), 0);
     glColor3f(r,g,b);
-    glRotated(180+rotate,0,0,1);
+    glRotated(180.0 + double(radians * DEGREES_PER_RADIAN), 0.0, 0.0, 1.0);
-    glRotated(180,0,1,0);
+    glRotated(180.0, 0.0, 1.0, 0.0);
     glLineWidth(thick);
-    glScalef(scale, scale, 1.0);
+    glScalef(scale, scale, 1.f);
     len = (int) strlen(vectext);
 	for (i = 0; i < len; i++) {
         if (!mono) glutStrokeCharacter(GLUT_STROKE_ROMAN, int(vectext[i]));
     glBegin(GL_LINE_STRIP);
     for (int i=0; i<numSides+1; i++) {
-        float r = ((float)i / (float)numSides) * PIf * 2.0;
+        float r = ((float)i / (float)numSides) * TWO_PI;
-        float s = radius * sin(r);
+        float s = radius * sinf(r);
-        float c = radius * cos(r);
+        float c = radius * cosf(r);
         glVertex3f
         (
     glBegin(GL_LINE_STRIP);
     for (int i=0; i<numSides+1; i++) {
-        float r = ((float)i / (float)numSides) * PIf * 2.0;
+        float r = ((float)i / (float)numSides) * TWO_PI;
-        float s = radius * sin(r);
+        float s = radius * sinf(r);
-        float c = radius * cos(r);
+        float c = radius * cosf(r);
         glVertex3f
         (
             position.x + perp1.x * s + perp2.x * c,
         numPointsCorner = MAX_POINTS_CORNER;
     }
-    // Precompute sin and cos for [0, pi/2) for the number of points (numPointCorner)
+    // Precompute sin and cos for [0, PI/2) for the number of points (numPointCorner)
     double radiusTimesSin[MAX_POINTS_CORNER];
     double radiusTimesCos[MAX_POINTS_CORNER];
     int i = 0;
     for (int i = 0; i < numPointsCorner; i++) {
-        double t = i * PIf /  (2.0f * (numPointsCorner - 1));
+        double t = (double)i * (double)PI_OVER_TWO / (double)(numPointsCorner - 1);
         radiusTimesSin[i] = radius * sin(t);
         radiusTimesCos[i] = radius * cos(t);
     }