Revision: 7515
http://playerstage.svn.sourceforge.net/playerstage/?rev=7515&view=rev
Author: hsujohnhsu
Date: 2009-03-17 01:30:27 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
check resource environment variables as well as resouce files.
Modified Paths:
--------------
code/gazebo/branches/ogre-1.4.9/server/GazeboConfig.cc
Modified: code/gazebo/branches/ogre-1.4.9/server/GazeboConfig.cc
===================================================================
--- code/gazebo/branches/ogre-1.4.9/server/GazeboConfig.cc 2009-03-17
01:28:04 UTC (rev 7514)
+++ code/gazebo/branches/ogre-1.4.9/server/GazeboConfig.cc 2009-03-17
01:30:27 UTC (rev 7515)
@@ -67,31 +67,34 @@
this->gazeboPaths.push_back(gazebo_resource_path);
}
- // if both paths are set, don't check the config file or use the defaults.
- if(ogre_resource_path && gazebo_resource_path)
- return;
-
-
if (cfgFile)
{
XMLConfig rc;
XMLConfigNode *node;
rc.Load(rcFilename);
- node = rc.GetRootNode()->GetChild("gazeboPath");
- while (node)
+ // if gazebo path is set, skip reading from .gazeborc
+ if(!gazebo_resource_path)
{
- gzmsg(1) << "Gazebo Path[" << node->GetValue() << "]\n";
- this->gazeboPaths.push_back(node->GetValue());
- node = node->GetNext("gazeboPath");
+ node = rc.GetRootNode()->GetChild("gazeboPath");
+ while (node)
+ {
+ gzmsg(1) << "Gazebo Path[" << node->GetValue() << "]\n";
+ this->gazeboPaths.push_back(node->GetValue());
+ node = node->GetNext("gazeboPath");
+ }
}
- node = rc.GetRootNode()->GetChild("ogrePath");
- while (node)
+ // if ogre path is set, skip reading from .gazeborc
+ if(!ogre_resource_path)
{
- gzmsg(1) << "Ogre Path[" << node->GetValue() << "]\n";
- this->ogrePaths.push_back( node->GetValue() );
- node = node->GetNext("ogrePath");
+ node = rc.GetRootNode()->GetChild("ogrePath");
+ while (node)
+ {
+ gzmsg(1) << "Ogre Path[" << node->GetValue() << "]\n";
+ this->ogrePaths.push_back( node->GetValue() );
+ node = node->GetNext("ogrePath");
+ }
}
this->RTTMode = rc.GetRootNode()->GetString("RTTMode", "PBuffer");
@@ -99,9 +102,18 @@
else
{
gzmsg(0) << "Unable to find the file ~/.gazeborc. Using default paths.
This may cause OGRE to fail.\n";
- this->gazeboPaths.push_back("/usr/local/share/gazebo");
- this->ogrePaths.push_back("/usr/local/lib/OGRE");
- this->ogrePaths.push_back("/usr/lib/OGRE");
+
+ if ( !gazebo_resource_path )
+ {
+ this->gazeboPaths.push_back("/usr/local/share/gazebo");
+ }
+
+ if ( !ogre_resource_path )
+ {
+ this->ogrePaths.push_back("/usr/local/lib/OGRE");
+ this->ogrePaths.push_back("/usr/lib/OGRE");
+ }
+
this->RTTMode="PBuffer";
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
