Changeset 2127 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/main.cpp

Timestamp:

02/19/07 09:16:59 (17 years ago)

Author:

gumbau

Message:

 

File:

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

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

@@ -8 +8 @@
 
 Camera *cameras = NULL;
-GLuint numCameras = 0;
+int numCameras = 0;
 
 Color *colors = NULL;
 
-GLuint **histogram = NULL,
-        *queries = NULL;
+int **histogram = NULL;
+GLuint *queries = NULL;
 
 Mesh *mesh = NULL;
@@ -28 +28 @@
           bRemoveRedundantVertices = GL_TRUE;
 
-GLuint cameraType = 0,
+int cameraType = 0,
        numDemandedTriangles = 0;
 
@@ -174 +174 @@
 }
 
+void VMI::updateHWAcceleration(Change *c) {
+   
+#ifdef VERTEX_ARRAY_INTERLEAVE
+    if (interleave != NULL) free(interleave);
+    interleave = setupInterleave(mesh, colors);
+#endif
+#ifdef VERTEX_ARRAY
+    updateVertexArray(mesh, c);
+#endif
+#ifdef VERTEX_BUFFER_OBJECTS
+    updateVertexBufferObjects(mesh, c);
+#endif
+
+}
+
 void VMI::setOrthographicProjection(void) {
     // Switch to projection mode
@@ -208 +223 @@
 void VMI::renderGeometry(void) {
 #ifdef IMMEDIATE_MODE
-    GLuint i, v1, v2, v3;
+    int i, v1, v2, v3;
 
     // Immediate mode
@@ -228 +243 @@
 #else
 #ifdef VERTEX_ARRAY
-    glDrawArrays(GL_TRIANGLES, 0, mesh->currentNumTriangles * 3);
+    glDrawArrays(GL_TRIANGLES, 0, mesh->numTriangles * 3);
 #endif
 #ifdef VERTEX_ARRAY_INTERLEAVE
@@ -235 +250 @@
 #endif
 #ifdef VERTEX_BUFFER_OBJECTS
-    glDrawArrays(GL_TRIANGLES, 0, mesh->currentNumTriangles * 3);
+    glDrawArrays(GL_TRIANGLES, 0, mesh->numTriangles * 3);
 #endif
 
@@ -264 +279 @@
     glutSwapBuffers();
 }
-void VMI::renderScene(GLuint **histogram, GLuint numCameras)
-{
-    GLuint i;
+
+void VMI::resetProjectedAreas(int **histogram, int numCameras) {
+    int i = 0;
+
+    // Reset the projected areas for all cameras
+    for (i=0; i<numCameras; i++)
+        resetSWHistogram(histogram[i], mesh->numTriangles);
+}
+
+void VMI::getProjectedAreas(int **histogram, int numCameras)
+{
+    int i;
 
     // draw to the frame buffer
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb);
-        
-    // Apply HW acceleration OpenGL Technique
-    applyHWAcceleration(); 
-
-    glDrawBuffer(GL_BACK);
-    glReadBuffer(GL_BACK);
+
+    //glDrawBuffer(GL_BACK);
+    //glReadBuffer(GL_BACK);
 
     // Get the projected areas for all cameras
@@ -312 +333 @@
     ///////////////////////////////////////////////////////////////////////////
 }
-void VMI::renderSceneWin(GLuint **histogram, GLuint numCameras, Change *c)
-{
-    GLuint i, j, t, background;
+void VMI::getProjectedAreasWin(int **histogram, int numCameras, Change *c)
+{
+    int i, j, t, background;
     int del_area, mod_area;
     GLfloat min[3], max[3];
@@ -325 +346 @@
     //printf("\n(%f,%f,%f)-(%f,%f,%f)\n", min[0], min[1], min[2], max[0], max[1], max[2]);
     
-    // Apply HW acceleration OpenGL Technique
-    applyHWAcceleration(); 
-
-    glDrawBuffer(GL_BACK);
-    glReadBuffer(GL_BACK);
+    // Update HW acceleration OpenGL Technique
+    updateHWAcceleration(c);
+
+    //glDrawBuffer(GL_BACK);
+    //glReadBuffer(GL_BACK);
 
     // Get the projected areas for all cameras
@@ -355 +376 @@
         mod_area = 0;
 
-        for (j=0; j<( GLuint)c->numDel; j++) {
+        for (j=0; j<c->numDel; j++) {
             t = c->deleted[j].id;
             del_area += histogram[i][t + 1];
@@ -362 +383 @@
         }
 
-        for (j=0; j<( GLuint)c->numMod; j++) {
+        for (j=0; j<c->numMod; j++) {
             t = c->modified[j].id;
             del_area += histogram[i][t + 1];
@@ -371 +392 @@
         getSWHistogramWin(histogram[i], pixels, min, max, c); 
 
-        for (j=0; j<( GLuint)c->numMod; j++) {
+        for (j=0; j<c->numMod; j++) {
             t = c->modified[j].id;
             mod_area += histogram[i][t + 1];
@@ -425 +446 @@
     
     glDeleteBuffersARB(1, &color_buf);
+
+    //free(pbuf_vertices);
+    //free(pbuf_colors);
+
+                buf_vertices = NULL;
+    buf_colors = NULL;
+
+#endif
+#ifdef VERTEX_ARRAY
+    //free(pbuf_vertices);
+    //free(pbuf_colors);
+
+                buf_vertices = NULL;
+    buf_colors = NULL;
 #endif
 
@@ -457 +492 @@
 
         start = clock();
+
+        // Apply HW acceleration OpenGL Technique
+  applyHWAcceleration();
 
         getProjectedAreas(histogram, numCameras);