Changeset 26 for trunk/Classes/SDL/src/video/SDL_renderer_gles.c

Timestamp:

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

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/SDL/src/video/SDL_renderer_gles.c (modified) (14 diffs)

trunk/Classes/SDL/src/video/SDL_renderer_gles.c

@@ -33 +33 @@
 // KP: render queue and automatic z-order support
 #include "RenderQueue.h"
+
+extern unsigned char gFlippedGL;
+extern unsigned char gInitializedGL;
+
+unsigned char gInitializedGL = 0;
 
 #if defined(__QNXNTO__)
@@ -343 +348 @@
 */
     
+    glClearDepthf(1.0f);
+    
     data->glDisable(GL_CULL_FACE);
     data->updateSize = SDL_TRUE;
@@ -358 +365 @@
     data->glEnableClientState(GL_TEXTURE_COORD_ARRAY);
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); 
-    data->glClearColor(0.0f,0.0f,0.5f,1.0f);
+    data->glClearColor(0.0f,0.0f,0.0f,1.0f);
+    glClearStencil(0);
     
     // KP: multitexture support used for effects like greyscale
@@ -368 +376 @@
     GLuint texID;
     glGenTextures(1, &texID);
-    glBindTexture(GL_TEXTURE_2D, texID);
+    //glBindTexture(GL_TEXTURE_2D, texID);
+    cacheBindTexture(GL_TEXTURE_2D, texID, 1);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -396 +405 @@
         glMatrixMode(GL_MODELVIEW);
         glLoadIdentity();
+    #ifdef __IPAD__
+        glViewport(0, 0, 768, 1024);
+        if (gFlippedGL)
+            glRotatef(90, 0, 0, 1);
+        else
+            glRotatef(-90, 0, 0, 1);
+        glOrthof(0.0, (GLfloat) 1024, (GLfloat) 768, 0.0, 0, 100.0f);
+    #else
         glViewport(0, 0, 320, 480);
-        glRotatef(-90, 0, 0, 1);
-        glOrthof(0.0, (GLfloat) 480, (GLfloat) 320, 0.0, 400, -400);
-        
+        if (gFlippedGL)
+            glRotatef(90, 0, 0, 1);
+        else
+            glRotatef(-90, 0, 0, 1);
+        glOrthof(0.0, (GLfloat) 480, (GLfloat) 320, 0.0, 0, 100.0f);
+    #endif  
 #else
         data->glMatrixMode(GL_PROJECTION);
@@ -411 +431 @@
         data->updateSize = SDL_FALSE;
     }
+    
+    gInitializedGL = 1;
     return 0;
 }
@@ -631 +653 @@
     GLenum result;
 
-    renderdata->glGetError();
+//    renderdata->glGetError();
 //    renderdata->glEnable(data->type);
     SetupTextureUpdate(renderdata, texture, pitch);
@@ -638 +660 @@
                                 pixels);
 //    renderdata->glDisable(data->type);
+    
+#ifndef NDEBUG  
     result = renderdata->glGetError();
     if (result != GL_NO_ERROR) {
@@ -643 +667 @@
         return -1;
     }
+#endif
     return 0;
 }
@@ -720 +745 @@
     GLES_SetBlendMode(data, renderer->blendMode);
 
-    data->glColor4f((GLfloat) renderer->r * inv255f,
+    cacheColor4f((GLfloat) renderer->r * inv255f,
                     (GLfloat) renderer->g * inv255f,
                     (GLfloat) renderer->b * inv255f,
@@ -746 +771 @@
     GLES_SetBlendMode(data, renderer->blendMode);
 
-    data->glColor4f((GLfloat) renderer->r * inv255f,
+    cacheColor4f((GLfloat) renderer->r * inv255f,
                     (GLfloat) renderer->g * inv255f,
                     (GLfloat) renderer->b * inv255f,
@@ -797 +822 @@
     GLshort maxy = rect->y + rect->h;
 
-    GLshort vertices[8];
+    GLshort vertices[12];
     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;
 /*  
     data->glVertexPointer(3, GL_SHORT, 0, vertices);
@@ -964 +993 @@
         maxv *= texturedata->texh;
 
-        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;
                 
         texCoords[0] = minu;
@@ -1030 +1063 @@
     // KP: clear the buffer after rendering
     //GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
-    glClear( /*GL_COLOR_BUFFER_BIT |*/ GL_DEPTH_BUFFER_BIT );
+//  glClear( /*GL_COLOR_BUFFER_BIT |*/ GL_DEPTH_BUFFER_BIT );
+    glClear(GL_DEPTH_BUFFER_BIT);
 }