[paragui-cvs] CVS: paragui/src/draw/opengl TODO,1.1.2.1,1.1.2.2 pgglsurf.cpp,1.1.2.1,1.1.2.2

[Teunis Peters <address@hidden>]

Update of /cvsroot/paragui/paragui/src/draw/opengl
In directory subversions:/tmp/cvs-serv4924/src/draw/opengl

Modified Files:
      Tag: devel-opengl
        TODO pgglsurf.cpp 
Log Message:
A number of updates - please review.  Probably will remove some of these 
features.  Almost solved the OpenGL driver problems....


Index: TODO
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/opengl/Attic/TODO,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** TODO        10 Oct 2002 19:16:20 -0000      1.1.2.1
--- TODO        24 Oct 2002 16:08:13 -0000      1.1.2.2
***************
*** 15,16 ****
--- 15,25 ----
  - now dependant on glSDL (provided with source as LGPL allows :)
        ! fixme - remove glSDL, it's not really that useful here... - DONE
+ 
+ BUGS:
+ - crashes on UpdateRects
+       (see feature)
+ - (feature) SDL root has no pixel data.  As the pixel data isn't accessible
+       in OpenGL anyways, this situation has to be handled properly..
+       FIXME  - this is where a lot of problems are coming from...
+ - too much debug code *g*
+ - Fonts still don't render.
\ No newline at end of file

Index: pgglsurf.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/opengl/Attic/pgglsurf.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** pgglsurf.cpp        10 Oct 2002 19:16:20 -0000      1.1.2.1
--- pgglsurf.cpp        24 Oct 2002 16:08:13 -0000      1.1.2.2
***************
*** 49,52 ****
--- 49,53 ----
  
  PG_GLDrawableSurface::PG_GLDrawableSurface() : PG_DrawableSurface(), 
glactive(false), scale(1) { host=NULL; };
+ PG_GLDrawableSurface::PG_GLDrawableSurface(SDL_Surface* s) : 
PG_DrawableSurface(s), glactive(false), scale(1) { host=NULL; };
  PG_GLDrawableSurface::PG_GLDrawableSurface(PG_GLDraw* refhost, SDL_Surface* s)
    : PG_DrawableSurface(s), glactive(false), scale(1) {
***************
*** 95,100 ****
--- 96,103 ----
    /* this works more or less */
    if (!is_GL()) {
+     DBG5(DBGLINE());
      PG_DrawableSurface::UpdateRects(numrects, rects);
    } else {
+     DBG5(DBGLINE());
  #if 0 /* not needed at this time... FIXME */
      PG_Rect tr;
***************
*** 115,120 ****
--- 118,125 ----
  #endif
      host->Flip();
+     DBG5(DBGLINE());
    };
  
+   DBG5(DBGLINE());
    /* otherwise caught by the driver
     * FIXME note: it would be a GOOD idea to handle surface update here... */
***************
*** 352,356 ****
  void PG_GLDrawableSurface::DrawTile(const PG_Rect& refr, const PG_Rect& 
drawrect, PG_DrawableSurface* tilemap) {
    DBG5(DBGLINE());
!   // return; // DEBUG
    PG_DrawableSurface::DrawTile(refr, drawrect, tilemap);
  };
--- 357,368 ----
  void PG_GLDrawableSurface::DrawTile(const PG_Rect& refr, const PG_Rect& 
drawrect, PG_DrawableSurface* tilemap) {
    DBG5(DBGLINE());
!   PG_LogMSG("src creator %s", tilemap->getCreator()->getName().c_str());
!   PG_LogMSG("dst creator %s", creator->getName().c_str());
!   return; // DEBUG
!   if (tilemap->getCreator() != creator) {
!     DBG5(DBGLINE());
!     PG_LogERR("ERROR - source tile in DrawTile is from alien driver!");
!     return;
!   };
    PG_DrawableSurface::DrawTile(refr, drawrect, tilemap);
  };
***************
*** 418,422 ****
  
  void PG_GLDrawableSurface::BlitScale(PG_DrawableSurface* src, bool smooth) {
!   PG_LogDBG("opengl DrawableSurface: %s", __FUNCTION__);
    PG_DrawableSurface::BlitScale(src,smooth);
  };
--- 430,442 ----
  
  void PG_GLDrawableSurface::BlitScale(PG_DrawableSurface* src, bool smooth) {
!   // PG_LogDBG("opengl DrawableSurface: %s", __FUNCTION__);
!   // PG_LogMSG("src creator %s", src->getCreator()->getName().c_str());
!   // PG_LogMSG("dst creator %s", creator->getName().c_str());
!   // return; // DEBUG
!   if (src->getCreator() != creator) {
!     DBG5(DBGLINE());
!     PG_LogERR("ERROR - source tile in DrawTile is from alien driver!");
!     return;
!   };
    PG_DrawableSurface::BlitScale(src,smooth);
  };
***************
*** 473,477 ****
                                        PG_DrawableSurface* background,
                                        int bkmode, Uint8 blend) {
!   PG_LogDBG("opengl DrawableSurface: %s", __FUNCTION__);
    PG_DrawableSurface::DrawThemedSurface(r,gradient,background,bkmode,blend);
  };
--- 493,507 ----
                                        PG_DrawableSurface* background,
                                        int bkmode, Uint8 blend) {
!   // PG_LogDBG("opengl DrawableSurface: %s", __FUNCTION__);
!   // PG_LogMSG("dst creator %s", creator->getName().c_str());
!   if (background != NULL) {
!     // PG_LogMSG("background creator %s", 
background->getCreator()->getName().c_str());
!     // return; // DEBUG
!     if (background->getCreator() != creator) {
!       DBG5(DBGLINE());
!       PG_LogERR("ERROR - source tile in DrawTile is from alien driver!");
!       return;
!     };
!   };
    PG_DrawableSurface::DrawThemedSurface(r,gradient,background,bkmode,blend);
  };