[paragui-cvs] CVS: paragui/src/core Makefile.am,1.4.2.2,1.4.2.3 pgapplication.cpp,1.10.2.8,1.10.2.9 pgdriver.cpp,1.1.2.1,1.1.2.2 pgfilearchive.cpp,1.4.2.4,1.4.2.5

[Teunis Peters <address@hidden>]

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

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


Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/Makefile.am,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** Makefile.am 7 Oct 2002 22:23:26 -0000       1.4.2.2
--- Makefile.am 24 Oct 2002 16:08:13 -0000      1.4.2.3
***************
*** 27,30 ****
--- 27,31 ----
  INCLUDES = \
        $(SIGC_CFLAGS) \
+       $(SIGCX_CFLAGS) \
        $(SDL_CFLAGS) \
        $(PHYSFS_INCLUDE) \

Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.10.2.8
retrieving revision 1.10.2.9
diff -C2 -r1.10.2.8 -r1.10.2.9
*** pgapplication.cpp   10 Oct 2002 19:16:20 -0000      1.10.2.8
--- pgapplication.cpp   24 Oct 2002 16:08:13 -0000      1.10.2.9
***************
*** 65,70 ****
  PG_CURSOR_MODE PG_Application::my_mouse_mode = PG_CURSOR_HARDWARE;
  PG_Font* PG_Application::DefaultFont = NULL;
! PG_Draw::PG_DrawableSurface* PG_Application::my_background;
! PG_Draw::PG_DrawableSurface* PG_Application::my_scaled_background;
  SDL_Color PG_Application::my_backcolor;
  int PG_Application::my_backmode = BKMODE_TILE;
--- 65,70 ----
  PG_CURSOR_MODE PG_Application::my_mouse_mode = PG_CURSOR_HARDWARE;
  PG_Font* PG_Application::DefaultFont = NULL;
! PG_Draw::PG_DrawableSurface* PG_Application::my_background = NULL;
! PG_Draw::PG_DrawableSurface* PG_Application::my_scaled_background = NULL;
  SDL_Color PG_Application::my_backcolor;
  int PG_Application::my_backmode = BKMODE_TILE;
***************
*** 124,128 ****
  
        /* Initialize the SDL library */
!       if (SDL_Init(SDL_INIT_NOPARACHUTE) < 0) {
                PG_LogERR("Could not initialize SDL: %s", SDL_GetError());
                exit(-1);
--- 124,128 ----
  
        /* Initialize the SDL library */
!       if (SDL_Init(/*SDL_INIT_NOPARACHUTE*/0) < 0) {
                PG_LogERR("Could not initialize SDL: %s", SDL_GetError());
                exit(-1);
***************
*** 442,446 ****
                  return false;
          
!       // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        my_background = LoadSurface(filename);
        // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
--- 442,446 ----
                  return false;
          
!       fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        my_background = LoadSurface(filename);
        // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
***************
*** 530,533 ****
--- 530,535 ----
        } else {
                // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, 
__LINE__);
+               PG_LogDBG("ParaGUI app[%s]: %s:%i", __FILE__, __FUNCTION__, 
__LINE__);
+               PG_LogMSG("tile creator %s", 
my_background->getCreator()->getName().c_str());
                screen->DrawTile(screenrect, rect, my_background);
        }
***************
*** 1327,1330 ****
--- 1329,1333 ----
        }
          drawable = d;
+       PG_Draw::PG_Draw::SetDefaultDrawable(drawable);
        d->init(SDL_INIT_VIDEO);
  }

Index: pgdriver.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/Attic/pgdriver.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** pgdriver.cpp        7 Oct 2002 22:23:26 -0000       1.1.2.1
--- pgdriver.cpp        24 Oct 2002 16:08:13 -0000      1.1.2.2
***************
*** 155,158 ****
    prevdriver = v;
    app.SetDrawingEnvironment(driver);
-   /* PG_Draw::PG_Draw::SetDefaultDrawable(driver); */
  };
--- 155,157 ----

Index: pgfilearchive.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgfilearchive.cpp,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** pgfilearchive.cpp   7 Oct 2002 22:23:26 -0000       1.4.2.4
--- pgfilearchive.cpp   24 Oct 2002 16:08:13 -0000      1.4.2.5
***************
*** 322,326 ****
  #endif
                // fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__, 
__LINE__, t);
!               surface = new PG_Draw::PG_DrawableSurface(t);
  
                if(surface == NULL) {
--- 322,327 ----
  #endif
                // fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__, 
__LINE__, t);
!               surface = draw->CreateSDLSurface(t);
!               /* surface = new PG_Draw::PG_DrawableSurface(t); 
draw->attach(surface); */
  
                if(surface == NULL) {