Bunch-a-bugfixes!

[ipdf/code.git] / src / screen.cpp

diff --git a/src/screen.cpp b/src/screen.cpp
index e97995c..59d4334 100644 (file)
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -18,9 +18,13 @@ Screen::Screen()
        }
 
        m_gl_context = SDL_GL_CreateContext(m_window);
-       
+
        ResizeViewport(800, 600);
 
+       Clear();
+       Present();
+       
+
 }
 
 Screen::~Screen()
@@ -30,6 +34,12 @@ Screen::~Screen()
        SDL_Quit();
 }
 
+void Screen::Clear(float r, float g, float b, float a)
+{
+       glClearColor(r,g,b,a);
+       glClear(GL_COLOR_BUFFER_BIT);
+}
+
 void Screen::ResizeViewport(int width, int height)
 {
        glViewport(0, 0, width, height);
@@ -129,12 +139,22 @@ void Screen::ScreenShot(const char * filename) const
        if (pixels == NULL)
                Fatal("Failed to allocate %d x %d x 4 = %d pixel array", w, h, w*h*4);
 
-       glReadPixels(0,0,w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+       for (int y = 0; y < h; ++y)
+       {
+               glReadPixels(0,h-y-1,w, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixels[y*w*4]);
+       }
 
-       SDL_Surface * surf = SDL_CreateRGBSurfaceFrom(pixels, w, h, 8*4, w*4, 0,0,0,0);
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+       SDL_Surface * surf = SDL_CreateRGBSurfaceFrom(pixels, w, h, 8*4, w*4, 0x000000ff,0x0000ff00,0x00ff0000,0xff000000);
+#else
+       SDL_Surface * surf = SDL_CreateRGBSurfaceFrom(pixels, w, h, 8*4, w*4, 0xff000000,0x00ff0000,0x0000ff00,0x000000ff);
+#endif
        if (surf == NULL)
                Fatal("Failed to create SDL_Surface from pixel data - %s", SDL_GetError());
 
+       GLenum texture_format = (surf->format->Rmask == 0x000000FF) ? GL_RGBA : GL_BGRA;
+       Debug("SDL_Surface %d BytesPerPixel, format %d (RGB = %d, BGR = %d, RGBA = %d, BGRA = %d)", surf->format->BytesPerPixel, texture_format, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA);
+
        if (SDL_SaveBMP(surf, filename) != 0)
                Fatal("SDL_SaveBMP failed - %s", SDL_GetError());
        
@@ -142,3 +162,62 @@ void Screen::ScreenShot(const char * filename) const
        delete [] pixels;
        Debug("Succeeded!");
 }
+
+/**
+ * Render a BMP
+ * NOT PART OF THE DOCUMENT FORMAT
+ */
+void Screen::RenderBMP(const char * filename) const
+{
+       SDL_Surface * bmp = SDL_LoadBMP(filename);
+       if (bmp == NULL)
+               Fatal("Failed to load BMP from %s - %s", filename, SDL_GetError());
+
+       int w = bmp->w;
+       int h = bmp->h;
+
+       GLenum texture_format; 
+       switch (bmp->format->BytesPerPixel)
+       {
+               case 4: //contains alpha
+                       texture_format = (bmp->format->Rmask == 0x000000FF) ? GL_RGBA : GL_BGRA;
+                       break;
+               case 3: //does not contain alpha
+                       texture_format = (bmp->format->Rmask == 0x000000FF) ? GL_RGB : GL_BGR;  
+                       break;
+               default:
+                       Fatal("Could not understand SDL_Surface format (%d colours)", bmp->format->BytesPerPixel);
+                       break;  
+       }
+
+       //Debug("SDL_Surface %d BytesPerPixel, format %d (RGB = %d, BGR = %d, RGBA = %d, BGRA = %d)", bmp->format->BytesPerPixel, texture_format, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA);
+
+
+       GLuint texID;
+       glEnable(GL_TEXTURE_2D);
+       glGenTextures(1, &texID);
+       glBindTexture(GL_TEXTURE_2D, texID);
+
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+       glTexImage2D(GL_TEXTURE_2D, 0, bmp->format->BytesPerPixel, w, h, 0, texture_format, GL_UNSIGNED_BYTE, bmp->pixels);
+
+       glMatrixMode(GL_PROJECTION);
+       glLoadIdentity();
+       glOrtho(0.0, 1.0, 1.0, 0.0, -1.f, 1.f);
+       glMatrixMode(GL_MODELVIEW);
+       glLoadIdentity();
+
+       glBegin(GL_QUADS);
+               glTexCoord2i(0,0); glVertex2f(0,0);
+               glTexCoord2i(1,0); glVertex2f(1,0);
+               glTexCoord2i(1,1); glVertex2f(1,1);
+               glTexCoord2i(0,1); glVertex2f(0,1);
+       glEnd();
+
+       glDisable(GL_TEXTURE_2D);
+       SDL_FreeSurface(bmp);   
+}