FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for multiple --login url username password entries to osgviewer

Browse Source
This commit is contained in:
Robert Osfield 2017-10-05 15:37:03 +01:00
parent d75564c7e3
commit ddf8c68d26
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
applications/osgviewer/osgviewer.cpp
View File

@ -74,15 +74,11 @@ int main(int argc, char** argv)
std::string url, username, password; std::string url, username, password;
while(arguments.read("--login",url, username, password)) while(arguments.read("--login",url, username, password))
{ {
if (!osgDB::Registry::instance()->getAuthenticationMap()) osgDB::Registry::instance()->getOrCreateAuthenticationMap()->addAuthenticationDetails(
{
osgDB::Registry::instance()->setAuthenticationMap(new osgDB::AuthenticationMap);
osgDB::Registry::instance()->getAuthenticationMap()->addAuthenticationDetails(
url, url,
new osgDB::AuthenticationDetails(username, password) new osgDB::AuthenticationDetails(username, password)
); );
} }
}
std::string device; std::string device;
while(arguments.read("--device", device)) while(arguments.read("--device", device))

7
include/osgDB/Registry
View File

@ -366,6 +366,13 @@ class OSGDB_EXPORT Registry : public osg::Referenced
/** Set the password map to be used by plugins when access files from secure locations.*/ /** Set the password map to be used by plugins when access files from secure locations.*/
void setAuthenticationMap(AuthenticationMap* authenticationMap) { _authenticationMap = authenticationMap; } void setAuthenticationMap(AuthenticationMap* authenticationMap) { _authenticationMap = authenticationMap; }
/** Get the password map to be used by plugins when access files from secure locations. Create a AuthenticationMap if one isn't already assigned.*/
AuthenticationMap* getOrCreateAuthenticationMap()
{
if (!_authenticationMap) _authenticationMap = new AuthenticationMap;
return _authenticationMap.get();
}
/** Get the password map to be used by plugins when access files from secure locations.*/ /** Get the password map to be used by plugins when access files from secure locations.*/
AuthenticationMap* getAuthenticationMap() { return _authenticationMap.get(); } AuthenticationMap* getAuthenticationMap() { return _authenticationMap.get(); }