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

Merge pull request #982 from rhabacker/3.4-add-plugin-env-support

Browse Source 
Add support for showing environment variables provided by osg plugins
This commit is contained in:
Robert Osfield 2020-11-10 16:22:36 +00:00 committed by GitHub
commit 61ecf0a7e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -40,7 +40,7 @@ PROJECT(OpenSceneGraph)
SET(OPENSCENEGRAPH_MAJOR_VERSION 3)
SET(OPENSCENEGRAPH_MINOR_VERSION 4)
SET(OPENSCENEGRAPH_PATCH_VERSION 2)
SET(OPENSCENEGRAPH_SOVERSION 132)
SET(OPENSCENEGRAPH_SOVERSION 133)
# set to 0 when not a release candidate, non zero means that any generated
# git tags will be treated as release candidates of given number

1
include/osgDB/PluginQuery
View File

@ -39,6 +39,7 @@ class ReaderWriterInfo : public osg::Referenced
ReaderWriter::FormatDescriptionMap protocols;
ReaderWriter::FormatDescriptionMap extensions;
ReaderWriter::FormatDescriptionMap options;
ReaderWriter::FormatDescriptionMap environment;
ReaderWriter::Features features;
protected:

7
include/osgDB/ReaderWriter
View File

@ -63,6 +63,9 @@ class OSGDB_EXPORT ReaderWriter : public osg::Object
/** Return which list of file extensions supported by ReaderWriter. */
virtual const FormatDescriptionMap& supportedOptions() const { return _supportedOptions; }
/** Return which list of file environment variables supported by ReaderWriter. */
virtual const FormatDescriptionMap& supportedEnvironment() const { return _supportedEnvironment; }
/** Return true if ReaderWriter accepts specified file extension.*/
virtual bool acceptsExtension(const std::string& /*extension*/) const;
@ -276,11 +279,15 @@ class OSGDB_EXPORT ReaderWriter : public osg::Object
* Please note, this should usually only be used internally by subclasses of ReaderWriter. */
void supportsOption(const std::string& opt, const std::string& description);
/** Specify env string as a supported environment string. */
void supportsEnvironment(const std::string& opt, const std::string& description);
protected:
FormatDescriptionMap _supportedProtocols;
FormatDescriptionMap _supportedExtensions;
FormatDescriptionMap _supportedOptions;
FormatDescriptionMap _supportedEnvironment;
};
}

15
src/osgDB/PluginQuery.cpp
View File

@ -80,6 +80,7 @@ bool osgDB::queryPlugin(const std::string& fileName, ReaderWriterInfoList& infoL
rwi->protocols = rw->supportedProtocols();
rwi->extensions = rw->supportedExtensions();
rwi->options = rw->supportedOptions();
rwi->environment = rw->supportedEnvironment();
rwi->features = rw->supportedFeatures();
infoList.push_back(rwi.get());
@ -151,6 +152,13 @@ bool osgDB::outputPluginDetails(std::ostream& out, const std::string& fileName)
if (fdm_itr->first.length()>longestOptionLength) longestOptionLength = fdm_itr->first.length();
}
for(fdm_itr = info.environment.begin();
fdm_itr != info.environment.end();
++fdm_itr)
{
if (fdm_itr->first.length()>longestOptionLength) longestOptionLength = fdm_itr->first.length();
}
unsigned int padLength = longestOptionLength+4;
for(fdm_itr = info.protocols.begin();
@ -173,6 +181,13 @@ bool osgDB::outputPluginDetails(std::ostream& out, const std::string& fileName)
{
out<<" options : "<<padwithspaces(fdm_itr->first, padLength)<<fdm_itr->second<<std::endl;
}
for(fdm_itr = info.environment.begin();
fdm_itr != info.environment.end();
++fdm_itr)
{
out<<" environment: "<<padwithspaces(fdm_itr->first, padLength)<<fdm_itr->second<<std::endl;
}
out<<" }"<<std::endl;
}
out<<"}"<<std::endl<<std::endl;

5
src/osgDB/ReaderWriter.cpp
View File

@ -68,6 +68,11 @@ void ReaderWriter::supportsOption(const std::string& fmt, const std::string& des
_supportedOptions[fmt] = description;
}
void ReaderWriter::supportsEnvironment(const std::string& fmt, const std::string& description)
{
_supportedEnvironment[fmt] = description;
}
ReaderWriter::Features ReaderWriter::supportedFeatures() const
{
int features = FEATURE_NONE;

9
src/osgPlugins/curl/ReaderWriterCURL.cpp
View File

@ -381,10 +381,11 @@ ReaderWriterCURL::ReaderWriterCURL()
supportsExtension("curl","Pseudo file extension, used to select curl plugin.");
supportsExtension("*","Passes all read files to other plugins to handle actual model loading.");
supportsOption("OSG_CURL_PROXY","Specify the http proxy.");
supportsOption("OSG_CURL_PROXYPORT","Specify the http proxy port.");
supportsOption("OSG_CURL_CONNECTTIMEOUT","Specify the connection timeout duration in seconds [default = 0 = not set].");
supportsOption("OSG_CURL_TIMEOUT","Specify the timeout duration of the whole transfer in seconds [default = 0 = not set].");
supportsEnvironment("OSG_CURL_PROXY","Specify the http proxy.");
supportsEnvironment("OSG_CURL_PROXYPORT","Specify the http proxy port.");
supportsEnvironment("OSG_CURL_CONNECTTIMEOUT","Specify the connection timeout duration in seconds [default = 0 = not set].");
supportsEnvironment("OSG_CURL_TIMEOUT","Specify the timeout duration of the whole transfer in seconds [default = 0 = not set].");
}
ReaderWriterCURL::~ReaderWriterCURL()

1
src/osgPlugins/txp/ReaderWriterTXP.h
View File

@ -57,6 +57,7 @@ public:
ReaderWriterTXP()
{
supportsExtension("txp","Terrapage txp format");
supportsEnvironment("OSG_TXP_DEFAULT_MAX_ANISOTROPY", "default value to use when setting up textures");
}
virtual const char* className() const

2
src/osgPlugins/xine/ReaderWriterXine.cpp
View File

@ -306,6 +306,8 @@ class ReaderWriterXine : public osgDB::ReaderWriter
supportsExtension("wmv","");
supportsExtension("xine","Xine plugin Pseduo plugin");
supportsEnvironment("OSG_XINE_AUDIO_DRIVER", "name of default audio driver to use");
_xine = xine_new();
const char* user_home = xine_get_homedir();