X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_geometry.c;h=730606185e55a92350f4f5b0e6fb6c740045459e;hb=49df0cf2fb8f84ff03fcfc91f4e2b4c4e5774854;hp=e589d4c2ed77be693bf05fa22f22e18af27e95d8;hpb=18b98d967eff786c89bfeed8e1f636f686bb1b10;p=freeglut

diff --git a/src/fg_geometry.c b/src/fg_geometry.c
index e589d4c..7306061 100644
--- a/src/fg_geometry.c
+++ b/src/fg_geometry.c
@@ -28,6 +28,7 @@
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 #include "fg_gl2.h"
+#include <math.h>
 
 /*
  * Need more types of polyhedra? See CPolyhedron in MRPT
@@ -71,24 +72,26 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei n
 {
     GLuint vbo_coords, vbo_normals;
     GLuint numVertices = numFaces * numEdgePerFace;
-    
+
+    int i;
+
     if (numVertices > 0 && attribute_v_coord != -1) {
 	    fghGenBuffers(1, &vbo_coords);
-	    fghBindBuffer(GL_ARRAY_BUFFER, vbo_coords);
-	    fghBufferData(GL_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]),
-			  vertices, GL_STATIC_DRAW);
+	    fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords);
+	    fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]),
+			  vertices, FGH_STATIC_DRAW);
     }
     
     if (numVertices > 0 && attribute_v_normal != -1) {
 	fghGenBuffers(1, &vbo_normals);
-	fghBindBuffer(GL_ARRAY_BUFFER, vbo_normals);
-	fghBufferData(GL_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]),
-		      normals, GL_STATIC_DRAW);
+	fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals);
+	fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]),
+		      normals, FGH_STATIC_DRAW);
     }
     
     if (vbo_coords) {
         fghEnableVertexAttribArray(attribute_v_coord);
-        fghBindBuffer(GL_ARRAY_BUFFER, vbo_coords);
+        fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords);
         fghVertexAttribPointer(
             attribute_v_coord,  // attribute
             3,                  // number of elements per vertex, here (x,y,z)
@@ -101,7 +104,7 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei n
 
     if (vbo_normals) {
         fghEnableVertexAttribArray(attribute_v_normal);
-        fghBindBuffer(GL_ARRAY_BUFFER, vbo_normals);
+        fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals);
         fghVertexAttribPointer(
             attribute_v_normal, // attribute
             3,                  // number of elements per vertex, here (x,y,z)
@@ -112,9 +115,6 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei n
         );
     }
 
-
-    int i;
-    
     /* Draw per face (TODO: could use glMultiDrawArrays if available) */
     for (i=0; i<numFaces; i++)
 	glDrawArrays(GL_LINE_LOOP, i*numEdgePerFace, numEdgePerFace);
@@ -185,28 +185,28 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLubyte
     
     if (numVertices > 0 && attribute_v_coord != -1) {
 	fghGenBuffers(1, &vbo_coords);
-	fghBindBuffer(GL_ARRAY_BUFFER, vbo_coords);
-	fghBufferData(GL_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]),
-		      vertices, GL_STATIC_DRAW);
+	fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords);
+	fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]),
+		      vertices, FGH_STATIC_DRAW);
 	}
     
     if (numVertices > 0 && attribute_v_normal != -1) {
 	fghGenBuffers(1, &vbo_normals);
-	fghBindBuffer(GL_ARRAY_BUFFER, vbo_normals);
-	fghBufferData(GL_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]),
-		      normals, GL_STATIC_DRAW);
+	fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals);
+	fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]),
+		      normals, FGH_STATIC_DRAW);
     }
     
     if (vertIdxs != NULL) {
 	fghGenBuffers(1, &ibo_elements);
-	fghBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo_elements);
-	fghBufferData(GL_ELEMENT_ARRAY_BUFFER, numVertIdxs * sizeof(vertIdxs[0]),
-		      vertIdxs, GL_STATIC_DRAW);
+	fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, ibo_elements);
+	fghBufferData(FGH_ELEMENT_ARRAY_BUFFER, numVertIdxs * sizeof(vertIdxs[0]),
+		      vertIdxs, FGH_STATIC_DRAW);
     }
     
     if (vbo_coords) {
 	fghEnableVertexAttribArray(attribute_v_coord);
-	fghBindBuffer(GL_ARRAY_BUFFER, vbo_coords);
+	fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords);
 	fghVertexAttribPointer(
             attribute_v_coord,  // attribute
             3,                  // number of elements per vertex, here (x,y,z)
@@ -219,7 +219,7 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLubyte
     
     if (vbo_normals) {
 	fghEnableVertexAttribArray(attribute_v_normal);
-	fghBindBuffer(GL_ARRAY_BUFFER, vbo_normals);
+	fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals);
 	fghVertexAttribPointer(
             attribute_v_normal, // attribute
             3,                  // number of elements per vertex, here (x,y,z)
@@ -233,7 +233,7 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLubyte
     if (vertIdxs == NULL) {
 	glDrawArrays(GL_TRIANGLES, 0, numVertices);
     } else {
-	fghBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo_elements);
+	fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, ibo_elements);
 	glDrawElements(GL_TRIANGLES, numVertIdxs, GL_UNSIGNED_BYTE, 0);
     }
     
@@ -796,8 +796,13 @@ static void fghCircleTable(GLfloat **sint, GLfloat **cost, const int n, const GL
 
     for (i=1; i<size; i++)
     {
+#ifdef __cplusplus
         (*sint)[i] = sinf(angle*i);
         (*cost)[i] = cosf(angle*i);
+#else
+        (*sint)[i] = (float)sin((double)(angle*i));
+        (*cost)[i] = (float)cos((double)(angle*i));
+#endif  /* __cplusplus */
     }
 
     
@@ -1147,7 +1152,6 @@ static void fghSphere( double radius, GLint slices, GLint stacks, GLboolean useW
     free(normals);
 }
 
-#endif /* GL_ES_VERSION_2_0 */
 
 
 /* -- INTERFACE FUNCTIONS ---------------------------------------------- */
@@ -1173,6 +1177,7 @@ void FGAPIENTRY glutWireSphere(double radius, GLint slices, GLint stacks)
     fghSphere( radius, slices, stacks, TRUE );
     
 }
+#endif /* GL_ES_VERSION_2_0 */
 
 #ifndef EGL_VERSION_1_0
 /*
@@ -1192,8 +1197,13 @@ void FGAPIENTRY glutSolidCone( double base, double height, GLint slices, GLint s
 
     /* Scaling factors for vertex normals */
 
+#ifdef __cplusplus
     const GLfloat cosn = ( (GLfloat)height / sqrtf( height * height + base * base ));
     const GLfloat sinn = ( (GLfloat)base   / sqrtf( height * height + base * base ));
+#else
+    const GLfloat cosn = ( (GLfloat)height / (GLfloat)sqrt( (double)(height * height + base * base) ));
+    const GLfloat sinn = ( (GLfloat)base   / (GLfloat)sqrt( (double)(height * height + base * base) ));
+#endif  /* __cplusplus */
 
     /* Pre-computed circle */
 
@@ -1262,8 +1272,13 @@ void FGAPIENTRY glutWireCone( double base, double height, GLint slices, GLint st
 
     /* Scaling factors for vertex normals */
 
+#ifdef __cplusplus
     const GLfloat cosn = ( (GLfloat)height / sqrtf( height * height + base * base ));
     const GLfloat sinn = ( (GLfloat)base   / sqrtf( height * height + base * base ));
+#else
+    const GLfloat cosn = ( (GLfloat)height / (GLfloat)sqrt( (double)(height * height + base * base) ));
+    const GLfloat sinn = ( (GLfloat)base   / (GLfloat)sqrt( (double)(height * height + base * base) ));
+#endif  /* __cplusplus */
 
     /* Pre-computed circle */
 
@@ -1464,15 +1479,25 @@ void FGAPIENTRY glutWireTorus( double dInnerRadius, double dOuterRadius, GLint n
 
   for( j=0; j<nRings; j++ )
   {
+#ifdef __cplusplus
     cpsi = cosf( psi ) ;
     spsi = sinf( psi ) ;
+#else
+    cpsi = (float)cos( (double)psi ) ;
+    spsi = (float)sin( (double)psi ) ;
+#endif  /* __cplusplus */
     phi = 0.0f;
 
     for( i=0; i<nSides; i++ )
     {
       int offset = 3 * ( j * nSides + i ) ;
+#ifdef __cplusplus
       cphi = cosf( phi ) ;
       sphi = sinf( phi ) ;
+#else
+      cphi = (float)cos( (double)phi ) ;
+      sphi = (float)sin( (double)phi ) ;
+#endif  /* __cplusplus */
       *(vertex + offset + 0) = cpsi * ( oradius + cphi * iradius ) ;
       *(vertex + offset + 1) = spsi * ( oradius + cphi * iradius ) ;
       *(vertex + offset + 2) =                    sphi * iradius  ;
@@ -1550,15 +1575,25 @@ void FGAPIENTRY glutSolidTorus( double dInnerRadius, double dOuterRadius, GLint
 
   for( j=0; j<nRings; j++ )
   {
+#ifdef __cplusplus
     cpsi = cosf( psi ) ;
     spsi = sinf( psi ) ;
+#else
+    cpsi = (float)cos( (double)psi ) ;
+    spsi = (float)sin( (double)psi ) ;
+#endif  /* __cplusplus */
     phi = 0.0f;
 
     for( i=0; i<nSides; i++ )
     {
       int offset = 3 * ( j * nSides + i ) ;
+#ifdef __cplusplus
       cphi = cosf( phi ) ;
       sphi = sinf( phi ) ;
+#else
+      cphi = (float)cos( (double)phi ) ;
+      sphi = (float)sin( (double)phi ) ;
+#endif  /* __cplusplus */
       *(vertex + offset + 0) = cpsi * ( oradius + cphi * iradius ) ;
       *(vertex + offset + 1) = spsi * ( oradius + cphi * iradius ) ;
       *(vertex + offset + 2) =                    sphi * iradius  ;