Changeset 21

Timestamp:

02/29/08 22:34:30 (4 years ago)

Author:

sokoow

Message:

Added:
- Multitexturing

Files:

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

branches/pdfcube-0.0.3/src/pdfcube.cc

@@ -1034 +1034 @@
       glNewList(cube_faces+i,GL_COMPILE);
       glBegin(GL_QUADS);
-      glTexCoord2f((1.0 - mapping[i][4]) * tex_width,
+     glMultiTexCoord2f(GL_TEXTURE0_ARB,(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,
+     glMultiTexCoord2f(GL_TEXTURE0_ARB,(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,
+  glMultiTexCoord2f(GL_TEXTURE0_ARB,(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,
+    glMultiTexCoord2f(GL_TEXTURE0_ARB,(1.0 - mapping[i][2]) * tex_width,
                    mapping[i][3] * tex_height);
       glVertex3fv(&v[faces[i][3]][0]);
@@ -1062 +1062 @@
       if (i == current_face) {
         glEnable(GL_TEXTURE_RECTANGLE_ARB);
+        glActiveTextureARB(GL_TEXTURE0_ARB);    
         glBindTexture(GL_TEXTURE_RECTANGLE_ARB,
                       textures[texmap[0]]);
       } else if (i == prev_face()) {
         glEnable(GL_TEXTURE_RECTANGLE_ARB);
+        glActiveTextureARB(GL_TEXTURE0_ARB);    
         glBindTexture(GL_TEXTURE_RECTANGLE_ARB,
                       textures[texmap[1]]);
       } else if (i == next_face()) {
         glEnable(GL_TEXTURE_RECTANGLE_ARB);
+        glActiveTextureARB(GL_TEXTURE0_ARB);    
         glBindTexture(GL_TEXTURE_RECTANGLE_ARB,
                       textures[texmap[2]]);