Changeset 20 for branches

Timestamp:

02/29/08 22:07:19 (4 years ago)

Author:

sokoow

Message:

Added:

-GL call lists at cube model

Files:

• branches/pdfcube-0.0.3/src/pdfcube.cc (modified) (8 diffs)

branches/pdfcube-0.0.3/src/pdfcube.cc

@@ -26 +26 @@
 #include <cmath>
 #include <sstream>
-
+#define NDEBUG
 // Gtk+ (pkg-config gtk+-2.0)
 #include <gtk/gtk.h>
@@ -114 +114 @@
     texmap[1] = 1;
     texmap[2] = 2;
+    cube_faces=0;
     pixmap =
       gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, tex_width,
@@ -179 +180 @@
     for (ii = 0; ii < total_pages; ++ii) {
       if (page_transition[ii])
-        ection--;
+        section--;
       if (section == 0)
         break;
@@ -220 +221 @@
     glDisable(GL_DEPTH_TEST);
 
-    glEnable(GL_DEPTH_TEST);
-    glDepthFunc(GL_LEQUAL);
+//    glEnable(GL_DEPTH_TEST);
+//    glDepthFunc(GL_LEQUAL);
     glLightfv(GL_LIGHT0, GL_POSITION, position);
     glLightModelfv(GL_LIGHT_MODEL_LOCAL_VIEWER, local_view);
@@ -285 +286 @@
 
     matrix_setup();
+    buildLists();
   }
 
@@ -1006 +1008 @@
   // OpenGL Textures
   GLuint textures[3];
+  GLuint cube_faces;
 
   // Width and Height of the rendered pixmap (aspect
@@ -1022 +1025 @@
                                   1.0 * iWidth / w, 0, pm);
   }
+
+void buildLists()
+{
+    int i;
+  cube_faces=glGenLists(6);
+
+    for (i = 0; i < 6; i++) {
+      glNewList(cube_faces+i,GL_COMPILE);
+      glBegin(GL_QUADS);
+      glTexCoord2f((1.0 - mapping[i][4]) * tex_width,
+                   mapping[i][5] * tex_height);
+      glVertex3fv(&v[faces[i][0]][0]);
+
+      glTexCoord2f((1.0 - mapping[i][6]) * tex_width,
+                   mapping[i][7] * tex_height);
+      glVertex3fv(&v[faces[i][1]][0]);
+
+      glTexCoord2f((1.0 - mapping[i][0]) * tex_width,
+                   mapping[i][1] * tex_height);
+      glVertex3fv(&v[faces[i][2]][0]);
+
+      glTexCoord2f((1.0 - mapping[i][2]) * tex_width,
+                   mapping[i][3] * tex_height);
+      glVertex3fv(&v[faces[i][3]][0]);
+      glEnd();
+      glEndList();
+    }
+  
+}
 
   void
@@ -1048 +1080 @@
       }
       glPolygonMode(GL_FRONT, GL_FILL);
-      glBegin(GL_QUADS);
-      //      glNormal3fv(&n[i][0]);
-      glTexCoord2f((1.0 - mapping[i][4]) * tex_width,
-                   mapping[i][5] * tex_height);
-      glVertex3fv(&v[faces[i][0]][0]);
-
-      glTexCoord2f((1.0 - mapping[i][6]) * tex_width,
-                   mapping[i][7] * tex_height);
-      glVertex3fv(&v[faces[i][1]][0]);
-
-      glTexCoord2f((1.0 - mapping[i][0]) * tex_width,
-                   mapping[i][1] * tex_height);
-      glVertex3fv(&v[faces[i][2]][0]);
-
-      glTexCoord2f((1.0 - mapping[i][2]) * tex_width,
-                   mapping[i][3] * tex_height);
-      glVertex3fv(&v[faces[i][3]][0]);
-
-      glEnd();
+      glCallList(cube_faces+i);
     }
   }