X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fscreen.cpp;fp=src%2Fscreen.cpp;h=01e736470d0222fcf99ffb37c3ba76c463abb2d2;hp=5f32f0d3bc546acf5c61dd1fee34ea097caa242f;hb=029e93dad12c51c69e47aa74dcc39f84d315bca3;hpb=4f0feb025e48aaaa0ffe0226c5135e116d1cb986

diff --git a/src/screen.cpp b/src/screen.cpp
index 5f32f0d..01e7364 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -19,11 +19,11 @@ Screen::Screen()
 
 	m_gl_context = SDL_GL_CreateContext(m_window);
 
-	glClearColor(1.f,1.f,1.f,1.f);
-	glClear(GL_COLOR_BUFFER_BIT);
+	ResizeViewport(800, 600);
+
+	Clear();
 	Present();
 	
-	ResizeViewport(800, 600);
 
 }
 
@@ -34,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);
@@ -134,12 +140,16 @@ void Screen::ScreenShot(const char * filename) const
 		Fatal("Failed to allocate %d x %d x 4 = %d pixel array", w, h, w*h*4);
 
 
-	glReadBuffer(GL_FRONT);
-	glPixelStorei(GL_PACK_ALIGNMENT, 1);
-
-	glReadPixels(0,0,w, h, GL_BGRA, 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());