Revision: 7139 http://playerstage.svn.sourceforge.net/playerstage/?rev=7139&view=rev Author: natepak Date: 2008-11-12 23:54:19 +0000 (Wed, 12 Nov 2008)
Log Message: ----------- Fixed bugs to make gazebo ogre-1.4.9 compatible Modified Paths: -------------- code/gazebo/branches/ogre-1.4.9/SConstruct code/gazebo/branches/ogre-1.4.9/server/gui/GLFrame.cc code/gazebo/branches/ogre-1.4.9/server/rendering/MovableText.cc code/gazebo/branches/ogre-1.4.9/server/rendering/MovableText.hh code/gazebo/branches/ogre-1.4.9/server/rendering/OgreCreator.cc code/gazebo/branches/ogre-1.4.9/server/sensors/camera/StereoCameraSensor.cc Modified: code/gazebo/branches/ogre-1.4.9/SConstruct =================================================================== --- code/gazebo/branches/ogre-1.4.9/SConstruct 2008-11-12 22:28:14 UTC (rev 7138) +++ code/gazebo/branches/ogre-1.4.9/SConstruct 2008-11-12 23:54:19 UTC (rev 7139) @@ -6,7 +6,7 @@ exec(open('build.py')) PKG_CONFIG_VERSION = '0.23' -OGRE_VERSION = '= 1.6.0' +OGRE_VERSION = '= 1.4.9' ODE_VERSION = '>= 0.10.1' if 'release' in COMMAND_LINE_TARGETS: Modified: code/gazebo/branches/ogre-1.4.9/server/gui/GLFrame.cc =================================================================== --- code/gazebo/branches/ogre-1.4.9/server/gui/GLFrame.cc 2008-11-12 22:28:14 UTC (rev 7138) +++ code/gazebo/branches/ogre-1.4.9/server/gui/GLFrame.cc 2008-11-12 23:54:19 UTC (rev 7139) @@ -129,6 +129,9 @@ this->glWindow->GetCamera()->SetSaveFramePathname(this->savePathname); CameraManager::Instance()->ConnectAddCameraSignal( boost::bind(&GLFrame::CameraAddedSlot, this, _1) ); + + this->show(); + this->redraw(); } //////////////////////////////////////////////////////////////////////////////// Modified: code/gazebo/branches/ogre-1.4.9/server/rendering/MovableText.cc =================================================================== --- code/gazebo/branches/ogre-1.4.9/server/rendering/MovableText.cc 2008-11-12 22:28:14 UTC (rev 7138) +++ code/gazebo/branches/ogre-1.4.9/server/rendering/MovableText.cc 2008-11-12 23:54:19 UTC (rev 7139) @@ -689,10 +689,10 @@ //////////////////////////////////////////////////////////////////////////////// /// Method to allow a caller to abstractly iterate over the Renderable instances -void MovableText::visitRenderables( Ogre::Renderable::Visitor* /*visitor*/, - bool /*debug*/) +/*void MovableText::visitRenderables( Ogre::Renderable::Visitor* visitor, + bool debug) { return; -} +}*/ Modified: code/gazebo/branches/ogre-1.4.9/server/rendering/MovableText.hh =================================================================== --- code/gazebo/branches/ogre-1.4.9/server/rendering/MovableText.hh 2008-11-12 22:28:14 UTC (rev 7138) +++ code/gazebo/branches/ogre-1.4.9/server/rendering/MovableText.hh 2008-11-12 23:54:19 UTC (rev 7139) @@ -108,8 +108,8 @@ /// \brief Method to allow a caller to abstractly iterate over the // Renderable instances - public: virtual void visitRenderables( Ogre::Renderable::Visitor* visitor, - bool debug = false ); + /*public: virtual void visitRenderables( Ogre::Renderable::Visitor* visitor, + bool debug = false );*/ /// \brief setup the geometry (from MovableText) protected: void _setupGeometry(); Modified: code/gazebo/branches/ogre-1.4.9/server/rendering/OgreCreator.cc =================================================================== --- code/gazebo/branches/ogre-1.4.9/server/rendering/OgreCreator.cc 2008-11-12 22:28:14 UTC (rev 7138) +++ code/gazebo/branches/ogre-1.4.9/server/rendering/OgreCreator.cc 2008-11-12 23:54:19 UTC (rev 7139) @@ -571,16 +571,16 @@ Ogre::RenderWindow *window = NULL; /// Ogre 1.4 required this method to create windows - /*params["parentWindowHandle"] = Ogre::StringConverter::toString(display) + + params["parentWindowHandle"] = Ogre::StringConverter::toString(display) + ":" + Ogre::StringConverter::toString(screen) + ":" + Ogre::StringConverter::toString(winId); - */ /// As of Ogre 1.6 this is the params method that makes a resizable window - params["externalWindowHandle"] = Ogre::StringConverter::toString(display) + + /*params["externalWindowHandle"] = Ogre::StringConverter::toString(display) + ":" + Ogre::StringConverter::toString(screen) + ":" + Ogre::StringConverter::toString(winId) + ":" + Ogre::StringConverter::toString(fl_visual); + */ params["FSAA"] = "2"; Modified: code/gazebo/branches/ogre-1.4.9/server/sensors/camera/StereoCameraSensor.cc =================================================================== --- code/gazebo/branches/ogre-1.4.9/server/sensors/camera/StereoCameraSensor.cc 2008-11-12 22:28:14 UTC (rev 7138) +++ code/gazebo/branches/ogre-1.4.9/server/sensors/camera/StereoCameraSensor.cc 2008-11-12 23:54:19 UTC (rev 7139) @@ -254,8 +254,8 @@ autoParamDataSource.setCurrentViewport(vp); autoParamDataSource.setCurrentRenderTarget(this->renderTargets[i]); autoParamDataSource.setCurrentSceneManager(sceneMgr); - autoParamDataSource.setCurrentCamera(this->GetOgreCamera(), true); - pass->_updateAutoParamsNoLights(&autoParamDataSource); + autoParamDataSource.setCurrentCamera(this->GetOgreCamera()); + pass->_updateAutoParamsNoLights(autoParamDataSource); // These two lines don't seem to do anything useful renderSys->_setProjectionMatrix(this->GetOgreCamera()->getProjectionMatrixRS()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Playerstage-commit mailing list Playerstage-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/playerstage-commit