Changeset 26 for trunk/Classes/TextureAtlas.cpp

Timestamp:

2010-05-28 07:39:52 (2 years ago)

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/TextureAtlas.cpp (modified) (6 diffs)

trunk/Classes/TextureAtlas.cpp

@@ -73 +73 @@
             break;
         case MAP_BASE_TRANSITION:
-            //filename += "base_transition.map.png";
+#ifdef __IPAD__         
+            filename += "map.base_transition.png";
+#else
             filename += "map.base_transition.pvrtc";
             pvrtcSize = 1024;
+#endif
             break;
         case MAP_OVERLAY_MISC:
@@ -204 +207 @@
     
     glGenTextures(1, &gTexIds[mapId]);  
-    glBindTexture(GL_TEXTURE_2D, gTexIds[mapId]);
+    //glBindTexture(GL_TEXTURE_2D, gTexIds[mapId]);
+    cacheBindTexture(GL_TEXTURE_2D, gTexIds[mapId], true);
+
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -238 +243 @@
         fclose(fp);
         glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG, pvrtcSize, pvrtcSize, 0, dataSize, data);
+        
+#ifndef NDEBUG      
         GLenum err = glGetError();
         if (err != GL_NO_ERROR)
@@ -245 +252 @@
             std::cerr << buffer;
         }
+#endif
         
         free(data);
@@ -479 +487 @@
     maxv = (GLfloat) (clippedSrc.y + clippedSrc.h) / gTexH[tinfo.mapId];
     
-    GLshort vertices[8];
+    GLshort vertices[12];
     GLfloat texCoords[8];
 
     vertices[0] = minx;
     vertices[1] = miny;
-    vertices[2] = maxx;
-    vertices[3] = miny;
-    vertices[4] = minx;
-    vertices[5] = maxy;
-    vertices[6] = maxx;
+    vertices[2] = 0;
+    vertices[3] = maxx;
+    vertices[4] = miny;
+    vertices[5] = 0;
+    vertices[6] = minx;
     vertices[7] = maxy;
+    vertices[8] = 0;
+    vertices[9] = maxx;
+    vertices[10] = maxy;
+    vertices[11] = 0;
 /*  
     B---C       ->      A B
@@ -522 +534 @@
 //  glTexCoordPointer(2, GL_FLOAT, 0, texCoords);
 //  glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-    renderQueueAddTexture(vertices, texCoords, gTexIds[tinfo.mapId], drawColor, brightness);
-    
+    
+    renderQueueAddTexture(vertices, texCoords, gTexIds[tinfo.mapId], drawColor, brightness);    
 }