[Pingus-CVS] r3858 - trunk/pingus/src/display

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-17 21:29:38 +0200 (Thu, 17 Jul 2008)
New Revision: 3858

Modified:
   trunk/pingus/src/display/opengl_framebuffer.cpp
   trunk/pingus/src/display/opengl_framebuffer_surface_impl.cpp
Log:
Fixed color for fill_rect() and implemented draw_rect() and draw_line() for 
OpenGL renderer

Modified: trunk/pingus/src/display/opengl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/opengl_framebuffer.cpp     2008-07-17 19:29:08 UTC 
(rev 3857)
+++ trunk/pingus/src/display/opengl_framebuffer.cpp     2008-07-17 19:29:38 UTC 
(rev 3858)
@@ -107,13 +107,13 @@
   
   glBindTexture(GL_TEXTURE_2D, texture->get_handle());
   
-  float vertices[] = {
+  int vertices[] = {
     pos.x,                     pos.y,
     pos.x+srcrect.get_width(), pos.y,
     pos.x+srcrect.get_width(), pos.y+srcrect.get_height(),
     pos.x,                     pos.y+srcrect.get_height(),
   };
-  glVertexPointer(2, GL_FLOAT, 0, vertices);
+  glVertexPointer(2, GL_INT, 0, vertices);
   
   float uvs[] = {
     float(srcrect.left)/texture->get_texture_size().width,  
float(srcrect.top)/texture->get_texture_size().height,
@@ -131,27 +131,59 @@
 void
 OpenGLFramebuffer::draw_line(const Vector2i& pos1, const Vector2i& pos2, const 
Color& color)
 {
+  glDisable(GL_TEXTURE_2D);
+  glColor4ub(color.r, color.g, color.b, color.a);
+  glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+  int vertices[] = {
+    pos1.x, pos1.y,
+    pos2.x, pos2.y,
+  };
+  glVertexPointer(2, GL_INT, 0, vertices);
+
+  glDrawArrays(GL_LINES, 0, 2);
+
+  glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+  glEnable(GL_TEXTURE_2D);
+  glColor4f(1, 1, 1, 1);
 }
 
 void
 OpenGLFramebuffer::draw_rect(const Rect& rect, const Color& color)
 {
+  glDisable(GL_TEXTURE_2D);
+  glColor4ub(color.r, color.g, color.b, color.a);
+  glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+  int vertices[] = {
+    rect.left,  rect.top,
+    rect.right, rect.top,
+    rect.right, rect.bottom,
+    rect.left,  rect.bottom,
+  };
+  glVertexPointer(2, GL_INT, 0, vertices);
+
+  glDrawArrays(GL_LINE_LOOP, 0, 4);
+
+  glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+  glEnable(GL_TEXTURE_2D);
+  glColor4f(1, 1, 1, 1);
 }
 
 void
 OpenGLFramebuffer::fill_rect(const Rect& rect, const Color& color)
 {
   glDisable(GL_TEXTURE_2D);
-  glColor4i(color.r, color.g, color.b, color.a);
+  glColor4ub(color.r, color.g, color.b, color.a);
   glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
-  float vertices[] = {
-    rect.left,                  rect.top,
-    rect.left+rect.get_width(), rect.top,
-    rect.left+rect.get_width(), rect.top+rect.get_height(),
-    rect.left,                  rect.top+rect.get_height()
+  int vertices[] = {
+    rect.left,  rect.top,
+    rect.right, rect.top,
+    rect.right, rect.bottom,
+    rect.left,  rect.bottom,
   };
-  glVertexPointer(2, GL_FLOAT, 0, vertices);
+  glVertexPointer(2, GL_INT, 0, vertices);
 
   glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 

Modified: trunk/pingus/src/display/opengl_framebuffer_surface_impl.cpp
===================================================================
--- trunk/pingus/src/display/opengl_framebuffer_surface_impl.cpp        
2008-07-17 19:29:08 UTC (rev 3857)
+++ trunk/pingus/src/display/opengl_framebuffer_surface_impl.cpp        
2008-07-17 19:29:38 UTC (rev 3858)
@@ -29,9 +29,10 @@
 } // namespace 
 
 OpenGLFramebufferSurfaceImpl::OpenGLFramebufferSurfaceImpl(SDL_Surface* src)
+  : size(src->w, src->h)
 {
   glGenTextures(1, &handle);
-
+  
   texture_size.width  = next_power_of_two(src->w);
   texture_size.height = next_power_of_two(src->h);