[paragui-cvs] CVS: paragui/src/draw drawfont.cpp,NONE,1.1.2.1 Makefile.am,1.3.2.2,1.3.2.3 draw.cpp,1.1.2.6,1.1.2.7 drawable.cpp,1.1.2.4,1.1.2.5 drawtile.cpp,1.3.2.2,1.3.2.3

[Teunis Peters <address@hidden>]

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

Modified Files:
      Tag: devel-opengl
        Makefile.am draw.cpp drawable.cpp drawtile.cpp 
Added Files:
      Tag: devel-opengl
        drawfont.cpp 
Log Message:
Add driver support
expand debugging code (but mostly disabled)
Some more clarification....  hope I got everything - T


***** Error reading new file: [Errno 2] No such file or directory: 
'drawfont.cpp'
Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/Makefile.am,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** Makefile.am 26 Jun 2002 03:25:04 -0000      1.3.2.2
--- Makefile.am 7 Oct 2002 22:23:26 -0000       1.3.2.3
***************
*** 1,4 ****
--- 1,12 ----
  noinst_LTLIBRARIES = libpgdraw.la
  
+ SUBDIRS = @VIDEO_SUBDIRS@
+ 
+ DIST_SUBDIRS = dummy windx opengl
+ 
+ # DRIVERS = @VIDEO_DRIVERS@
+ # now modular...
+ DRIVERS =
+ 
  libpgdraw_la_SOURCES = \
        draw.cpp \
***************
*** 13,18 ****
        drawtile.cpp \
        gradient.cpp \
!       pgglcore.cpp \
!       glSDL.c
  
  EXTRA_DIST =
--- 21,28 ----
        drawtile.cpp \
        gradient.cpp \
!       drawfont.cpp
! 
! libpgdraw_la_LIBADD = $(DRIVERS)
! libpgdraw_la_DEPENDENCIES = $(DRIVERS)
  
  EXTRA_DIST =

Index: draw.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/Attic/draw.cpp,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** draw.cpp    12 Sep 2002 06:38:50 -0000      1.1.2.6
--- draw.cpp    7 Oct 2002 22:23:26 -0000       1.1.2.7
***************
*** 40,43 ****
--- 40,44 ----
    if (defaultdraw == NULL) {
      defaultdraw = new PG_Draw();
+     defaultdraw->preinit();
    };
    return defaultdraw;
***************
*** 84,87 ****
--- 85,89 ----
  
  void PG_Draw::PG_Draw::quit() {
+   fprintf(stderr, "%s:%s:%i flags %x\n", __FILE__, __FUNCTION__, __LINE__, 
flags);
    SDL_QuitSubSystem(flags);
  };
***************
*** 136,146 ****
  
    // flags = flags | SDL_GLSDL;
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
!   dumpflags(flags);
    t = SDL_SetVideoMode(width,height,depth,flags);
    if (t == NULL) { PG_LogERR("SDL: %s", SDL_GetError()); exit(-1); }
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
!   dumpflags(t->flags);
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
    surf = new PG_DrawableSurface(t);
    screen = surf;
--- 138,147 ----
  
    // flags = flags | SDL_GLSDL;
!   /* fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__); */
!   // dumpflags(flags);
    t = SDL_SetVideoMode(width,height,depth,flags);
    if (t == NULL) { PG_LogERR("SDL: %s", SDL_GetError()); exit(-1); }
!   /* fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__); */
!   /* dumpflags(t->flags); */
    surf = new PG_DrawableSurface(t);
    screen = surf;

Index: drawable.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/Attic/drawable.cpp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** drawable.cpp        12 Sep 2002 06:38:50 -0000      1.1.2.4
--- drawable.cpp        7 Oct 2002 22:23:26 -0000       1.1.2.5
***************
*** 60,64 ****
  
  PG_Draw::PG_DrawableSurface::PG_DrawableSurface() {
-   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
    ref = NULL;
  };
--- 60,63 ----

Index: drawtile.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/drawtile.cpp,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** drawtile.cpp        31 Aug 2002 04:01:23 -0000      1.3.2.2
--- drawtile.cpp        7 Oct 2002 22:23:26 -0000       1.3.2.3
***************
*** 75,79 ****
      }
    }
-   
    SetClipRect(oldclip);
  };
--- 75,78 ----