[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/src/core pgapplication.cpp,1.10.2.4,1.10.2.5
|
From: |
Teunis Peters <address@hidden> |
|
Subject: |
[paragui-cvs] CVS: paragui/src/core pgapplication.cpp,1.10.2.4,1.10.2.5 pgfilearchive.cpp,1.4.2.2,1.4.2.3 pgsurfacecache.cpp,1.2.2.4,1.2.2.5 physfsrwops.cpp,1.2.2.1,1.2.2.2 |
|
Date: |
Thu, 12 Sep 2002 02:38:52 -0400 |
Update of /cvsroot/paragui/paragui/src/core
In directory subversions:/tmp/cvs-serv1777/src/core
Modified Files:
Tag: devel-opengl
pgapplication.cpp pgfilearchive.cpp pgsurfacecache.cpp
physfsrwops.cpp
Log Message:
first operational opengl version - tag "gotta start somewhere"
also removed -most- of debug code - or at least commented it out.
Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -C2 -r1.10.2.4 -r1.10.2.5
*** pgapplication.cpp 31 Aug 2002 04:01:22 -0000 1.10.2.4
--- pgapplication.cpp 12 Sep 2002 06:38:49 -0000 1.10.2.5
***************
*** 77,86 ****
new shutdown procedure (called at application termination
*/
void PARAGUI_ShutDownCode() {
// shutdown log
PG_LogConsole::Done();
// shutdown SDL
! SDL_Quit();
}
--- 77,102 ----
new shutdown procedure (called at application termination
*/
+ static bool __sdlinit = false;
void PARAGUI_ShutDownCode() {
+ fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
+ PG_Draw::PG_Draw* dr = PG_Draw::PG_Draw::GetDefaultDrawable();
+ fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
+ // this is pretty much the only spot where it's safe to delete in
+ // quite this manner...
+ dr->quit();
+ fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
+ delete dr;
+ fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
+
// shutdown log
+ fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
PG_LogConsole::Done();
+ fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
// shutdown SDL
! if (__sdlinit) {
! SDL_Quit();
! };
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
}
***************
*** 110,114 ****
exit(-1);
}
! atexit(SDL_Quit);
/* drawable handles the videosystem init */
--- 126,131 ----
exit(-1);
}
! __sdlinit = true;
! /* atexit(SDL_Quit); */
/* drawable handles the videosystem init */
***************
*** 133,136 ****
--- 150,159 ----
//pGlobalApp = NULL;
Shutdown();
+
+ // shut down drawable
+ if (drawable != NULL) {
+ delete drawable;
+ drawable = NULL;
+ }
// remove all archives from PG_FileArchive
***************
*** 557,565 ****
PG_Theme* PG_Application::LoadTheme(const char* xmltheme, bool asDefault,
const char* searchpath) {
PG_Theme* theme = NULL;
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
PG_LogDBG("Locating theme '%s' ...", xmltheme);
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(searchpath != NULL) {
if(AddArchive(searchpath)) {
--- 580,588 ----
PG_Theme* PG_Application::LoadTheme(const char* xmltheme, bool asDefault,
const char* searchpath) {
PG_Theme* theme = NULL;
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
PG_LogDBG("Locating theme '%s' ...", xmltheme);
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(searchpath != NULL) {
if(AddArchive(searchpath)) {
***************
*** 568,572 ****
}
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
#ifdef __MACOS__
--- 591,595 ----
}
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
#ifdef __MACOS__
***************
*** 621,627 ****
}
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
theme = PG_Theme::Load(xmltheme);
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(theme && asDefault) {
--- 644,650 ----
}
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
theme = PG_Theme::Load(xmltheme);
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(theme && asDefault) {
***************
*** 640,644 ****
PG_LogMSG("size: %i", DefaultFont->GetSize());
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
my_background = theme->FindSurface("Background", "Background",
"background");
my_backmode = theme->FindProperty("Background", "Background",
"backmode");
--- 663,667 ----
PG_LogMSG("size: %i", DefaultFont->GetSize());
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
my_background = theme->FindSurface("Background", "Background",
"background");
my_backmode = theme->FindProperty("Background", "Background",
"backmode");
***************
*** 656,660 ****
PG_LogWRN("Failed to load !");
}
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if((my_Theme != NULL) && asDefault) {
--- 679,683 ----
PG_LogWRN("Failed to load !");
}
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if((my_Theme != NULL) && asDefault) {
***************
*** 663,671 ****
}
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(asDefault && theme) {
my_Theme = theme;
}
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
return theme;
--- 686,694 ----
}
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(asDefault && theme) {
my_Theme = theme;
}
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
return theme;
Index: pgfilearchive.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgfilearchive.cpp,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** pgfilearchive.cpp 31 Aug 2002 04:01:23 -0000 1.4.2.2
--- pgfilearchive.cpp 12 Sep 2002 06:38:49 -0000 1.4.2.3
***************
*** 191,212 ****
SDL_RWops* PG_FileArchive::OpenFileRWops(const char* filename, PG_OPEN_MODE
mode) {
! fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__, __LINE__,
filename);
SDL_RWops* file = NULL;
switch(mode) {
case PG_OPEN_READ:
! fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__, __LINE__,
filename);
file = PHYSFSRWOPS_openRead(filename);
break;
case PG_OPEN_WRITE:
! fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__, __LINE__,
filename);
file = PHYSFSRWOPS_openWrite(filename);
break;
case PG_OPEN_APPEND:
! fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__, __LINE__,
filename);
file = PHYSFSRWOPS_openAppend(filename);
break;
}
! fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__, __LINE__,
filename);
return file;
}
--- 191,212 ----
SDL_RWops* PG_FileArchive::OpenFileRWops(const char* filename, PG_OPEN_MODE
mode) {
! // fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__, __LINE__,
filename);
SDL_RWops* file = NULL;
switch(mode) {
case PG_OPEN_READ:
! // fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__,
__LINE__, filename);
file = PHYSFSRWOPS_openRead(filename);
break;
case PG_OPEN_WRITE:
! // fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__,
__LINE__, filename);
file = PHYSFSRWOPS_openWrite(filename);
break;
case PG_OPEN_APPEND:
! // fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__,
__LINE__, filename);
file = PHYSFSRWOPS_openAppend(filename);
break;
}
! // fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__, __LINE__,
filename);
return file;
}
***************
*** 238,242 ****
PG_DataContainer* PG_FileArchive::ReadFile(const char* filename) {
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
PG_File *file = OpenFile(filename);
--- 238,242 ----
PG_DataContainer* PG_FileArchive::ReadFile(const char* filename) {
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
PG_File *file = OpenFile(filename);
***************
*** 267,279 ****
PG_Draw::PG_DrawableSurface* PG_FileArchive::LoadSurface(const char*
filename, bool convert) {
PG_Draw::PG_Draw* draw = PG_Draw::PG_Draw::GetDefaultDrawable();
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(filename == NULL) {
return NULL;
}
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
std::string fn = filename;
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(fn == "none") {
return NULL;
--- 267,279 ----
PG_Draw::PG_DrawableSurface* PG_FileArchive::LoadSurface(const char*
filename, bool convert) {
PG_Draw::PG_Draw* draw = PG_Draw::PG_Draw::GetDefaultDrawable();
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(filename == NULL) {
return NULL;
}
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
std::string fn = filename;
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(fn == "none") {
return NULL;
***************
*** 281,299 ****
// take a look into the cache
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
PG_Draw::PG_DrawableSurface* surface = my_cache.FindSurface(fn);
! fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__, __LINE__,
surface);
// return the cache surface if it has been found
if(surface != NULL) {
! fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__,
__LINE__, surface);
my_cache.IncRef(fn);
! fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__,
__LINE__, surface);
return surface;
}
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
surface = NULL;
! fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__, __LINE__,
filename);
SDL_RWops *rw = OpenFileRWops(filename);
--- 281,299 ----
// take a look into the cache
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
PG_Draw::PG_DrawableSurface* surface = my_cache.FindSurface(fn);
! // fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__, __LINE__,
surface);
// return the cache surface if it has been found
if(surface != NULL) {
! // fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__,
__LINE__, surface);
my_cache.IncRef(fn);
! // fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__,
__LINE__, surface);
return surface;
}
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
surface = NULL;
! // fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__, __LINE__,
filename);
SDL_RWops *rw = OpenFileRWops(filename);
***************
*** 302,316 ****
return NULL;
}
! fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__, __LINE__, rw);
{
SDL_Surface* t;
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
#ifdef HAVE_SDLIMAGE
t = IMG_Load_RW(rw, 1);
#else
t = SDL_LoadBMP_RW(rw, 1);
#endif
! fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__,
__LINE__, t);
surface = new PG_Draw::PG_DrawableSurface(t);
--- 302,325 ----
return NULL;
}
! // fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__, __LINE__,
rw);
{
SDL_Surface* t;
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__,
__LINE__);
#ifdef HAVE_SDLIMAGE
t = IMG_Load_RW(rw, 1);
+ // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__,
__LINE__);
+ if (t == NULL) {
+ PG_LogERR("SDL_image reported: '%s'", IMG_GetError());
+ };
#else
+ #error no SDL Image?
t = SDL_LoadBMP_RW(rw, 1);
+ // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__,
__LINE__);
+ if (t == NULL) {
+ PG_LogERR("SDL reported: '%s'", SDL_GetError());
+ };
#endif
! // fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__,
__LINE__, t);
surface = new PG_Draw::PG_DrawableSurface(t);
***************
*** 326,330 ****
}
};
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(convert) {
--- 335,339 ----
}
};
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(convert) {
***************
*** 336,340 ****
}
}
! fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__, __LINE__,
surface);
// add the loaded surface to the cache
--- 345,349 ----
}
}
! // fprintf(stderr, "%s:%s:%i %p\n", __FILE__, __FUNCTION__, __LINE__,
surface);
// add the loaded surface to the cache
Index: pgsurfacecache.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgsurfacecache.cpp,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C2 -r1.2.2.4 -r1.2.2.5
*** pgsurfacecache.cpp 31 Aug 2002 04:01:23 -0000 1.2.2.4
--- pgsurfacecache.cpp 12 Sep 2002 06:38:49 -0000 1.2.2.5
***************
*** 76,80 ****
PG_SurfaceCache::PG_SurfaceCache() {
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
my_surfacemap = (void*)new(pg_surfacemap_t);
my_surfacemap_index = (void*)new(pg_surfacemap_index_t);
--- 76,80 ----
PG_SurfaceCache::PG_SurfaceCache() {
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
my_surfacemap = (void*)new(pg_surfacemap_t);
my_surfacemap_index = (void*)new(pg_surfacemap_index_t);
***************
*** 119,123 ****
int i=0;
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
assert(w != 0 && h != 0);
--- 119,123 ----
int i=0;
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
assert(w != 0 && h != 0);
***************
*** 183,192 ****
pg_surface_cache_t* t = (*MY_SURFACEMAP)[key];
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(t == NULL) {
return NULL;
}
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
return t->surface;
}
--- 183,192 ----
pg_surface_cache_t* t = (*MY_SURFACEMAP)[key];
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
if(t == NULL) {
return NULL;
}
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
return t->surface;
}
***************
*** 199,203 ****
}
! fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
t = FindByKey(key);
if(t != NULL) {
--- 199,203 ----
}
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
t = FindByKey(key);
if(t != NULL) {
***************
*** 227,231 ****
return;
}
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
pg_surface_cache_t* t = FindBySurface(surface);
--- 227,231 ----
return;
}
! // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
pg_surface_cache_t* t = FindBySurface(surface);
Index: physfsrwops.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/physfsrwops.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** physfsrwops.cpp 31 Aug 2002 04:01:23 -0000 1.2.2.1
--- physfsrwops.cpp 12 Sep 2002 06:38:49 -0000 1.2.2.2
***************
*** 173,177 ****
SDL_RWops *PHYSFSRWOPS_openRead(const char *fname)
{
! fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__, __LINE__, fname);
return(create_rwops(PHYSFS_openRead(fname)));
} /* PHYSFSRWOPS_openRead */
--- 173,177 ----
SDL_RWops *PHYSFSRWOPS_openRead(const char *fname)
{
! // fprintf(stderr, "%s:%s:%i %s\n", __FILE__, __FUNCTION__, __LINE__,
fname);
return(create_rwops(PHYSFS_openRead(fname)));
} /* PHYSFSRWOPS_openRead */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/src/core pgapplication.cpp,1.10.2.4,1.10.2.5 pgfilearchive.cpp,1.4.2.2,1.4.2.3 pgsurfacecache.cpp,1.2.2.4,1.2.2.5 physfsrwops.cpp,1.2.2.1,1.2.2.2,
Teunis Peters <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui/src/draw draw.cpp,1.1.2.5,1.1.2.6 drawable.cpp,1.1.2.3,1.1.2.4 pgglcore.cpp,1.1.2.2,1.1.2.3
- Next by Date:
[paragui-cvs] CVS: paragui/test runMe,NONE,1.1.2.1 testMe,NONE,1.1.2.1
- Previous by thread:
[paragui-cvs] CVS: paragui/src/draw draw.cpp,1.1.2.5,1.1.2.6 drawable.cpp,1.1.2.3,1.1.2.4 pgglcore.cpp,1.1.2.2,1.1.2.3
- Next by thread:
[paragui-cvs] CVS: paragui/test runMe,NONE,1.1.2.1 testMe,NONE,1.1.2.1
- Index(es):