[Playerstage-commit] code/gazebo/gui/fltk GzWindow.cc, 1.1.2.3, 1.1.2.4 main.cc, 1.1.2.4, 1.1.2.5

[Nathan Koenig]

Update of /cvsroot/playerstage/code/gazebo/gui/fltk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26991/gui/fltk

Modified Files:
      Tag: ogre
        GzWindow.cc main.cc 
Log Message:
Updates

Index: main.cc
===================================================================
RCS file: /cvsroot/playerstage/code/gazebo/gui/fltk/Attic/main.cc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** main.cc     14 Apr 2006 20:38:03 -0000      1.1.2.4
--- main.cc     7 Aug 2006 20:52:26 -0000       1.1.2.5
***************
*** 218,226 ****
    struct tms cpu;
  
!   printf("\n\n\nRegister All\n\n\n");
    // Register static models
    ModelFactory::RegisterAll();
  
!   printf("\n\n\nWorld File\n\n\n");
    
    // Load the world file
--- 218,226 ----
    struct tms cpu;
  
!   printf("Register All\n");
    // Register static models
    ModelFactory::RegisterAll();
  
!   printf("World File\n");
    
    // Load the world file
***************
*** 229,260 ****
      return -1;
  
!   printf("\n\n\nWorld New\n\n\n");
  
    // Create the world
    world = new World(optServerId, optServerForce);
  
!   printf("\n\n\nGZWindow\n\n\n");
  
!   window = new GzWindow(100, 290, 800, 400, "OGRE#FLTK Window");
  
!   printf("\n\n\nGZWindow Show\n\n\n");
  
    window->show();
  
!   printf("\n\n\nWorld Load\n\n\n");
    
    // Load the world
    if (world->Load(worldFile) != 0)
    {
!     printf("Failed to load world\n\n");
      return -1;
    }
  
!   printf("\n\n\nWorld Initialize\n\n\n");
  
    // Initialize
    if (world->Initialize() != 0)
    {
!     printf("Failed to Initialize World\n\n");
      return -1;
    }
--- 229,260 ----
      return -1;
  
!   printf("World New\n");
  
    // Create the world
    world = new World(optServerId, optServerForce);
  
!   printf("GZWindow\n");
  
!   window = new GzWindow(100, 290, 640, 480, "OGRE#FLTK Window");
  
!   printf("GZWindow Show\n");
  
    window->show();
  
!   printf("World Load\n");
    
    // Load the world
    if (world->Load(worldFile) != 0)
    {
!     printf("Failed to load world\n");
      return -1;
    }
  
!   printf("World Initialize\n");
  
    // Initialize
    if (world->Initialize() != 0)
    {
!     printf("Failed to Initialize World\n");
      return -1;
    }
***************
*** 336,340 ****
      return -1;
  
!   printf("\n\nInit\n\n");
    // Initalize
    if (Init() != 0)
--- 336,340 ----
      return -1;
  
!   printf("Init\n");
    // Initalize
    if (Init() != 0)
***************
*** 345,349 ****
  
   
!   printf("\n\nMain Loop\n\n");
    
    Fl::add_idle( idle_cp);
--- 345,349 ----
  
   
!   printf("Main Loop\n");
    
    Fl::add_idle( idle_cp);

Index: GzWindow.cc
===================================================================
RCS file: /cvsroot/playerstage/code/gazebo/gui/fltk/Attic/GzWindow.cc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** GzWindow.cc 14 Apr 2006 20:38:03 -0000      1.1.2.3
--- GzWindow.cc 7 Aug 2006 20:52:26 -0000       1.1.2.4
***************
*** 68,80 ****
  void GzWindow::Init()
  {
!   Ogre::NameValuePairList params;
!   Ogre::StringVector paramsVector;
! 
!   printf("\n\n\nOpenDisplay\n\n\n");
    this->OpenDisplay();
  
!   printf("\n\n\nAdaptor Init\n\n\n");
    world->ogreAdaptor->Init(this->display, this->visual, this->windowId, 
this->w(), this->h());
  
  }
  
--- 68,83 ----
  void GzWindow::Init()
  {
!   printf("OpenDisplay\n");
    this->OpenDisplay();
  
!   printf("Adaptor Init\n");
    world->ogreAdaptor->Init(this->display, this->visual, this->windowId, 
this->w(), this->h());
  
+   /*fl_open_display();
+   Fl_Gl_Choice* glChoice = Fl_Gl_Choice::find( FL_DEPTH | FL_DOUBLE, NULL );
+   Fl_X::make_xid( this, glChoice->vis, glChoice->colormap );
+   world->ogreAdaptor->Init(fl_display, fl_visual, fl_xid(this), this->w(), 
this->h());
+   */
+ 
  }
  


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit