[paragui-cvs] CVS: paragui/test animation.cpp,1.2.2.3,1.2.2.4 dblbuffer.cpp,1.4.2.4,1.4.2.5 gltest.cpp,1.1.2.2,1.1.2.3 list.cpp,1.1.2.2,1.1.2.3 paratest.cpp,1.9.2.4,1.9.2.5 windowtest.cpp,1.1.1.1.2.3,1.1.1.1.2.4

[Teunis Peters <address@hidden>]

Update of /cvsroot/paragui/paragui/test
In directory subversions:/tmp/cvs-serv1777/test

Modified Files:
      Tag: devel-opengl
        animation.cpp dblbuffer.cpp gltest.cpp list.cpp paratest.cpp 
        windowtest.cpp 
Log Message:
first operational opengl version - tag "gotta start somewhere"
also removed -most- of debug code - or at least commented it out.


Index: animation.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/animation.cpp,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** animation.cpp       31 Aug 2002 04:01:25 -0000      1.2.2.3
--- animation.cpp       12 Sep 2002 06:38:50 -0000      1.2.2.4
***************
*** 213,217 ****
        tickstate++;
        
!       PG_LogDBG("eventTimer(%i, %i)", id, interval);
        
        if(tickstate >= 40) {
--- 213,217 ----
        tickstate++;
        
!       /* PG_LogDBG("eventTimer(%i, %i)", id, interval); */
        
        if(tickstate >= 40) {

Index: dblbuffer.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/dblbuffer.cpp,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** dblbuffer.cpp       31 Aug 2002 04:01:25 -0000      1.4.2.4
--- dblbuffer.cpp       12 Sep 2002 06:38:50 -0000      1.4.2.5
***************
*** 340,345 ****
                }
  
                PG_Application::GetDrawingEnvironment()->Flip();
! #if 0
                /* Update the screen! */
                if ( (screen->getScreen()->flags & SDL_DOUBLEBUF) == 
SDL_DOUBLEBUF ) {
--- 340,347 ----
                }
  
+ #if 1
+               /* working method */
                PG_Application::GetDrawingEnvironment()->Flip();
! #else
                /* Update the screen! */
                if ( (screen->getScreen()->flags & SDL_DOUBLEBUF) == 
SDL_DOUBLEBUF ) {

Index: gltest.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/Attic/gltest.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** gltest.cpp  31 Aug 2002 04:01:25 -0000      1.1.2.2
--- gltest.cpp  12 Sep 2002 06:38:50 -0000      1.1.2.3
***************
*** 33,41 ****
--- 33,44 ----
    app.LoadTheme("default");
    
+   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
    app.InitScreen(640, 480, 0);
    app.SetEmergencyQuit(true);
    
+   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
    PG_ListBox listbox(NULL, PG_Rect(10,10,300,100));
    listbox.sigSelectItem.connect(slot(handleListBoxItem));
+   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
    
    new PG_ListBoxItem(&listbox, 25, "Item1");
***************
*** 50,56 ****
--- 53,61 ----
    new PG_ListBoxItem(&listbox, 25, "Item10");
    listbox.Show();
+   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
    
    
    app.Run();
+   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
    
    return 0;

Index: list.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/list.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** list.cpp    31 Aug 2002 04:01:25 -0000      1.1.2.2
--- list.cpp    12 Sep 2002 06:38:50 -0000      1.1.2.3
***************
*** 19,41 ****
        PG_Application& app = PG_Application::GetInstance();
        
-   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        app.LoadTheme( "default" );
        
-   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        app.InitScreen( 640, 480, 0 );
-   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        app.SetEmergencyQuit(true);
        
-   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        PG_ListBox listbox(NULL, PG_Rect(10,10,300,100));
-   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        listbox.sigSelectItem.connect(slot(handleListBoxItem));
-   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        
        listbox.Show();
-   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
  
        new PG_ListBoxItem(&listbox, 25, "Item1");
-   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        new PG_ListBoxItem(&listbox, 25, "Item2");
        new PG_ListBoxItem(&listbox, 25, "Item3");
--- 19,33 ----
***************
*** 47,51 ****
        new PG_ListBoxItem(&listbox, 25, "Item9");
        new PG_ListBoxItem(&listbox, 25, "Item10");
-   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
  
        app.Run();
--- 39,42 ----

Index: paratest.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/paratest.cpp,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -r1.9.2.4 -r1.9.2.5
*** paratest.cpp        31 Aug 2002 04:01:25 -0000      1.9.2.4
--- paratest.cpp        12 Sep 2002 06:38:50 -0000      1.9.2.5
***************
*** 516,519 ****
--- 516,520 ----
        if(!bTestMode) {
            app.Run();
+           // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
            return EXIT_SUCCESS;
        }

Index: windowtest.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/windowtest.cpp,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -C2 -r1.1.1.1.2.3 -r1.1.1.1.2.4
*** windowtest.cpp      31 Aug 2002 04:01:25 -0000      1.1.1.1.2.3
--- windowtest.cpp      12 Sep 2002 06:38:50 -0000      1.1.1.1.2.4
***************
*** 40,51 ****
        CMyWidget *mywidget;
        PG_MessageBox *msgbox;
!       PG_Application* app;
  
!       PG_Application& app1 = PG_Application::GetInstance();
!       app = &app1;
        // app = new PG_Application();
!       app->SetEmergencyQuit(true);
!       app->LoadTheme("default");
!       app->InitScreen(800,600,16,SDL_SWSURFACE);
  
        mywidget=new CMyWidget(NULL,PG_Rect(200,200,350,250));
--- 40,50 ----
        CMyWidget *mywidget;
        PG_MessageBox *msgbox;
!       // PG_Application* app;
  
!       PG_Application& app = PG_Application::GetInstance();
        // app = new PG_Application();
!       app.SetEmergencyQuit(true);
!       app.LoadTheme("default");
!       app.InitScreen(800,600,16,SDL_SWSURFACE);
  
        mywidget=new CMyWidget(NULL,PG_Rect(200,200,350,250));
***************
*** 71,75 ****
        msgbox->Hide();
        
!       app->Run();
        
  
--- 70,74 ----
        msgbox->Hide();
        
!       app.Run();
        
  
***************
*** 83,88 ****
        // app=new PG_Application();
        // app->SetEmergencyQuit(true);
!       app->LoadTheme("simple");
!       app->InitScreen(800,600,0,SDL_SWSURFACE);
  
        mywidget=new CMyWidget(NULL,PG_Rect(200,200,350,250));
--- 82,87 ----
        // app=new PG_Application();
        // app->SetEmergencyQuit(true);
!       app.LoadTheme("simple");
!       app.InitScreen(800,600,0,SDL_SWSURFACE);
  
        mywidget=new CMyWidget(NULL,PG_Rect(200,200,350,250));