Changeset 2090 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/camera.cpp

Timestamp:

02/05/07 13:29:55 (17 years ago)

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/camera.cpp (modified) (2 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/camera.cpp

@@ -174 +174 @@
 
     switch (type) {
-    case OCTAHEDRON:
-        cameras = (Camera *)malloc(sizeof(Camera) * type);
+    case 0:
+        cameras = (Camera *)malloc(sizeof(Camera) * OCTAHEDRON);
         if (cameras == NULL) {
             fprintf(stderr, "Error allocating memory\n");
             exit(1);
         }
-        *numCameras = type;
+        *numCameras = OCTAHEDRON;
         drawOctahedron(cameras, radius);
         break;
-    case ICOSAHEDRON:
-        cameras = (Camera *)malloc(sizeof(Camera) * type);
+    case 1:
+        cameras = (Camera *)malloc(sizeof(Camera) * CUBE);
         if (cameras == NULL) {
             fprintf(stderr, "Error allocating memory\n");
             exit(1);
         }
-        *numCameras = type;
-        drawIcosahedron(cameras, radius);
+        *numCameras = CUBE;
+        drawCube(cameras, radius);
         break;
-    case DODECAHEDRON:
-        cameras = (Camera *)malloc(sizeof(Camera) * type);
+    case 2:
+        cameras = (Camera *)malloc(sizeof(Camera) * ICOSAHEDRON);
         if (cameras == NULL) {
             fprintf(stderr, "Error allocating memory\n");
             exit(1);
         }
-        *numCameras = type;
+        *numCameras = ICOSAHEDRON;
+        drawIcosahedron(cameras, radius);
+        break;
+    case 3:
+        cameras = (Camera *)malloc(sizeof(Camera) * DODECAHEDRON);
+        if (cameras == NULL) {
+            fprintf(stderr, "Error allocating memory\n");
+            exit(1);
+        }
+        *numCameras = DODECAHEDRON;
         drawDodecahedron(cameras, radius);
         break;
     default:
-        printf("Error cameras not defined\n");
+        printf("Error, cameras not defined\n");
         exit(1);
         break;
     }
+
+    printf("Number of cameras: %d\n", *numCameras);
 
     return cameras;
@@ -506 +517 @@
     copyToCameras(cameras, 12, vertices);
 }
+
+void VMI::drawCube(Camera *cameras, GLdouble r) // any radius in which the polyhedron is inscribed
+{
+    GLdouble vertices[8][3] = {
+        {-1, -1, 1},   // vertex v0
+        {1,  -1, 1},   // vertex v1
+        {1,  -1, -1},  // vertex v2
+        {-1, -1, -1},  // vertex v3
+        {-1, 1,  1},   // vertex v4
+        {1,  1,  1},   // vertex v5
+        {1,  1,  -1},  // vertex v6 
+        {-1, 1,  -1},  // vertex v7
+    }; // 8 vertices with x, y, z coordinates
+    int i;
+#ifdef DRAW_DEBUG
+    int tindex[12][3] = {
+        
+        {0, 1, 4}, //polygon v0,v1,v4
+        {1, 5, 4}, //polygon v1,v5,v4
+        {1, 2, 5}, //polygon v1,v2,v5
+        {2, 6, 5}, //polygon v2,v6,v5
+        {2, 3, 6}, //polygon v2,v3,v6
+        {3, 7, 6}, //polygon v3,v7,v6
+        {3, 0, 7}, //polygon v3,v0,v7
+        {0, 4, 7}, //polygon v0,v4,v7
+        {4, 5, 7}, //polygon v4,v5,v7
+        {5, 6, 7}, //polygon v5,v6,v7
+        {3, 2, 0}, //polygon v3,v2,v0
+        {2, 1, 0}, //polygon v2,v1,v0
+    };
+#endif
+    
+    for(i=0; i<8; i++)
+    {
+        vertices[i][0]*=r;
+        vertices[i][1]*=r;
+        vertices[i][2]*=r;
+    }
+
+    // map vertices to 12 faces 
+#ifdef DRAW_DEBUG
+    
+    for (i=0; i<12; i++) { 
+        
+        glBegin(GL_POINTS );
+        glVertex3fv(&vertices[tindex[i][0]][0]); 
+        glVertex3fv(&vertices[tindex[i][1]][0]); 
+        glVertex3fv(&vertices[tindex[i][2]][0]);    
+        glEnd(); 
+    }
+
+#endif
+    
+    copyToCameras(cameras, 8, vertices);
+}
+