Update of /cvsroot/playerstage/code/gazebo/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26991/server
Modified Files:
Tag: ogre
OgreAdaptor.cc World.cc
Log Message:
Updates
Index: World.cc
===================================================================
RCS file: /cvsroot/playerstage/code/gazebo/server/World.cc,v
retrieving revision 1.92.2.4
retrieving revision 1.92.2.5
diff -C2 -d -r1.92.2.4 -r1.92.2.5
*** World.cc 14 Apr 2006 14:23:45 -0000 1.92.2.4
--- World.cc 7 Aug 2006 20:52:26 -0000 1.92.2.5
***************
*** 648,651 ****
--- 648,652 ----
gz_sim_unlock(this->gz_sim);
+
// Reset poses on request
if (reset)
***************
*** 656,659 ****
--- 657,661 ----
this->Save();
+
// If we are paused, we do something a bit sneaky: we update the
// models, but dont advance the simulator time. This allows models
***************
*** 679,683 ****
model->MasterUpdate( this->stepTime );
}
- printf("\n\nHERE\n\n");
// Increment the time
--- 681,684 ----
Index: OgreAdaptor.cc
===================================================================
RCS file: /cvsroot/playerstage/code/gazebo/server/Attic/OgreAdaptor.cc,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** OgreAdaptor.cc 14 Apr 2006 20:38:03 -0000 1.1.2.7
--- OgreAdaptor.cc 7 Aug 2006 20:52:26 -0000 1.1.2.8
***************
*** 1,4 ****
#include <Ogre.h>
-
#include "OgreAdaptor.hh"
--- 1,3 ----
***************
*** 26,56 ****
this->windowId = windowId;
! printf("\n\n\nSetupREsources\n\n\n");
// Setup the available resources
this->SetupResources();
! printf("\n\n\nSetupRenderingSystem\n\n\n");
// Setup the rendering system
this->SetupRenderSystem();
! printf("\n\n\nRoot Init\n\n\n");
// Initialize the root node, and don't create a window
this->window = this->root->initialise(false);
! printf("\n\n\nCreateWindow\n\n\n");
// Create the window
this->CreateWindow(width,height);
! printf("\n\n\nCreateSceneManager\n\n\n");
// Get the SceneManager, in this case a generic one
this->sceneMgr = this->root->createSceneManager(Ogre::ST_GENERIC);
! printf("\n\n\nCreateCamera\n\n\n");
this->CreateCameras();
! printf("\n\n\nCreateViewports\n\n\n");
this->CreateViewports();
// Set default mipmap level (NB some APIs ignore this)
Ogre::TextureManager::getSingleton().setDefaultNumMipmaps( 2 );
--- 25,57 ----
this->windowId = windowId;
! printf("SetupResources\n");
// Setup the available resources
this->SetupResources();
! printf("SetupRenderingSystem\n");
// Setup the rendering system
this->SetupRenderSystem();
! printf("Root Init\n");
// Initialize the root node, and don't create a window
this->window = this->root->initialise(false);
! printf("CreateWindow[%d %d]\n",width, height);
// Create the window
this->CreateWindow(width,height);
! printf("CreateSceneManager\n");
// Get the SceneManager, in this case a generic one
this->sceneMgr = this->root->createSceneManager(Ogre::ST_GENERIC);
! printf("CreateCamera\n");
this->CreateCameras();
! printf("CreateViewports\n");
this->CreateViewports();
+ printf("SetupTextureManager\n");
+
// Set default mipmap level (NB some APIs ignore this)
Ogre::TextureManager::getSingleton().setDefaultNumMipmaps( 2 );
***************
*** 65,75 ****
OgreGLXWindowInterface* pWindowInterface = NULL;
! printf("\n\n\nWindow->GetCustomAttribute\n\n\n");
this->window->getCustomAttribute("GLXWINDOWINTERFACE", &pWindowInterface);
! printf("\n\n\nWindow->Exposed\n\n\n");
//pWindowInterface->exposed(true);
! printf("\n\n\nDone\n\n\n");
}
--- 66,76 ----
OgreGLXWindowInterface* pWindowInterface = NULL;
! printf("Window->GetCustomAttribute\n");
this->window->getCustomAttribute("GLXWINDOWINTERFACE", &pWindowInterface);
! printf("Window->Exposed\n");
//pWindowInterface->exposed(true);
! printf("Done\n");
}
***************
*** 96,99 ****
--- 97,102 ----
}
}
+
+ this->root->restoreConfig();
}
***************
*** 101,105 ****
{
// Set parameters of render system (window size, etc.)
! if (!this->root->restoreConfig())
{
Ogre::RenderSystemList *rsList = this->root->getAvailableRenderers();
--- 104,108 ----
{
// Set parameters of render system (window size, etc.)
! //if (!this->root->restoreConfig())
{
Ogre::RenderSystemList *rsList = this->root->getAvailableRenderers();
***************
*** 138,148 ****
--- 141,155 ----
void OgreAdaptor::CreateViewports()
{
+
// Create one viewport, entire window
Ogre::Viewport* vp = this->window->addViewport(this->camera);
vp->setBackgroundColour( Ogre::ColourValue( 0,0,0) );
+ printf("1\n");
+
// Alter the camera aspect ratio to match the viewport
this->camera->setAspectRatio( Ogre::Real(vp->getActualWidth()) /
Ogre::Real(vp->getActualHeight()));
+ printf("2\n");
}
***************
*** 156,166 ****
Ogre::NameValuePairList params;
! paramsVector.push_back( Ogre::StringConverter::toString(
reinterpret_cast<unsigned int>(this->display) ) );
! paramsVector.push_back( Ogre::StringConverter::toString(
reinterpret_cast<unsigned int>((unsigned)this->visual->screen) ) );
! paramsVector.push_back( Ogre::StringConverter::toString( (unsigned
int)(this->windowId) ) );
! paramsVector.push_back( Ogre::StringConverter::toString( reinterpret_cast<
unsigned int>(this->visual) ) );
! params["externalWindowHandle"] =
Ogre::StringConverter::toString(paramsVector);
this->window = this->root->createRenderWindow( "WindowName", width, height,
false, ¶ms);
--- 163,173 ----
Ogre::NameValuePairList params;
! paramsVector.push_back( Ogre::StringConverter::toString( (int)this->display
) );
! paramsVector.push_back(
Ogre::StringConverter::toString((int)this->visual->screen));
! paramsVector.push_back(
Ogre::StringConverter::toString((int)this->windowId));
! paramsVector.push_back( Ogre::StringConverter::toString((int)this->visual));
! params["parentWindowHandle"] =
Ogre::StringConverter::toString(paramsVector);
this->window = this->root->createRenderWindow( "WindowName", width, height,
false, ¶ms);
***************
*** 171,173 ****
--- 178,182 ----
//this->root->renderOneFrame();
this->root->_updateAllRenderTargets();
+
+ return 0;
}
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
