[paragui-cvs] CVS: paragui/src/core pgapplication.cpp,1.10.2.1,1.10.2.2 pgcolors.cpp,1.1,1.1.2.1 pgsurfacecache.cpp,1.2.2.1,1.2.2.2 physfsrwops.h,1.1.4.1,1.1.4.2

[Teunis Peters <address@hidden>]

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

Modified Files:
      Tag: devel-opengl
        pgapplication.cpp pgcolors.cpp pgsurfacecache.cpp 
        physfsrwops.h 
Log Message:
Added in patches from paragui-main
removed glSDL dependency
started preparing OpenGL drawable classes
As of this point most demos are working fine :)


Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -r1.10.2.1 -r1.10.2.2
*** pgapplication.cpp   18 Jun 2002 22:40:38 -0000      1.10.2.1
--- pgapplication.cpp   26 Jun 2002 03:25:04 -0000      1.10.2.2
***************
*** 48,52 ****
  
  SDL_mutex* PG_Application::mutexScreen = NULL;
! PG_Application* PG_Application::pGlobalApp = NULL;
  PG_Draw::PG_DrawableSurface* PG_Application::screen = NULL;
  std::string PG_Application::app_path = "";
--- 48,52 ----
  
  SDL_mutex* PG_Application::mutexScreen = NULL;
! //PG_Application* PG_Application::pGlobalApp = NULL;
  PG_Draw::PG_DrawableSurface* PG_Application::screen = NULL;
  std::string PG_Application::app_path = "";
***************
*** 88,97 ****
  
  
! PG_Application::PG_Application() {
  
!       if(pGlobalApp != NULL) {
                PG_LogWRN("PG_Application Object already exists !");
                exit(-1);
        }
  
        atexit(PARAGUI_ShutDownCode);
--- 88,98 ----
  
  
! PG_Application::PG_Application() : PG_Singleton<PG_Application>() {
  
! /*    if(pGlobalApp != NULL) {
                PG_LogWRN("PG_Application Object already exists !");
                exit(-1);
        }
+ */
  
        atexit(PARAGUI_ShutDownCode);
***************
*** 120,124 ****
        drawable->init(SDL_INIT_VIDEO);
  
!       pGlobalApp = this;
        screen = NULL;
  
--- 121,125 ----
        drawable->init(SDL_INIT_VIDEO);
  
!       //pGlobalApp = this;
        screen = NULL;
  
***************
*** 130,134 ****
  
  PG_Application::~PG_Application() {
!       pGlobalApp = NULL;
        Shutdown();
  }
--- 131,135 ----
  
  PG_Application::~PG_Application() {
!       //pGlobalApp = NULL;
        Shutdown();
  }
***************
*** 286,290 ****
                  return false;
          
!         screen->getScreen()->flags |= SDL_GLSDL;
        screen = drawable->SetMode(
                     event->w, event->h,
--- 287,291 ----
                  return false;
          
!         // screen->getScreen()->flags |= SDL_GLSDL;
        screen = drawable->SetMode(
                     event->w, event->h,

Index: pgcolors.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgcolors.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** pgcolors.cpp        15 Apr 2002 14:53:56 -0000      1.1
--- pgcolors.cpp        26 Jun 2002 03:25:04 -0000      1.1.2.1
***************
*** 408,414 ****
        colors["magenta1"] = magenta1;
        colors["VioletRed2"] = VioletRed2;
! #ifndef __BORLANDC__
!       colors["tan"] = tan;
! #endif
        colors["SeaGreen2"] = SeaGreen2;
        colors["gray59"] = gray59;
--- 408,412 ----
        colors["magenta1"] = magenta1;
        colors["VioletRed2"] = VioletRed2;
!       colors["tan"] = tan1;
        colors["SeaGreen2"] = SeaGreen2;
        colors["gray59"] = gray59;

Index: pgsurfacecache.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgsurfacecache.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** pgsurfacecache.cpp  18 Jun 2002 22:40:38 -0000      1.2.2.1
--- pgsurfacecache.cpp  26 Jun 2002 03:25:04 -0000      1.2.2.2
***************
*** 58,64 ****
  
  // Don't need custom comparision for strings.
! typedef std::hash_map<std::string, pg_surface_cache_t*, pg_surface_hash> 
pg_surfacemap_t;
  // Don't need custom hash or comparision functions when the key is a long.
! typedef std::hash_map<unsigned long, pg_surface_cache_t* > 
pg_surfacemap_index_t;
  
  typedef pg_surfacemap_t::iterator pg_surfacemap_iter_t;
--- 58,64 ----
  
  // Don't need custom comparision for strings.
! typedef STL_MAP<std::string, pg_surface_cache_t*, pg_surface_hash> 
pg_surfacemap_t;
  // Don't need custom hash or comparision functions when the key is a long.
! typedef STL_MAP<unsigned long, pg_surface_cache_t* > pg_surfacemap_index_t;
  
  typedef pg_surfacemap_t::iterator pg_surfacemap_iter_t;

Index: physfsrwops.h
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/physfsrwops.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -r1.1.4.1 -r1.1.4.2
*** physfsrwops.h       18 Jun 2002 22:40:38 -0000      1.1.4.1
--- physfsrwops.h       26 Jun 2002 03:25:04 -0000      1.1.4.2
***************
*** 24,29 ****
  
  #include "physfs.h"
! // #include "SDL.h"
! #include "glSDL.h"
  
  #ifdef __cplusplus
--- 24,28 ----
  
  #include "physfs.h"
! #include "SDL.h"
  
  #ifdef __cplusplus