From 47ab79916809afde9137105316f176bcca60ff22 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 26 May 2020 16:05:34 +0200 Subject: [PATCH] Use new method supportsEnvironment() from class ReaderWriter in client code --- src/osgPlugins/curl/ReaderWriterCURL.cpp | 11 ++++++----- src/osgPlugins/txp/ReaderWriterTXP.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/osgPlugins/curl/ReaderWriterCURL.cpp b/src/osgPlugins/curl/ReaderWriterCURL.cpp index 628da025a..ca03b638d 100644 --- a/src/osgPlugins/curl/ReaderWriterCURL.cpp +++ b/src/osgPlugins/curl/ReaderWriterCURL.cpp @@ -388,11 +388,12 @@ 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]."); - supportsOption("OSG_CURL_SSL_VERIFYPEER","Specify ssl verification peer [default = 1 = 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]."); + supportsEnvironment("OSG_CURL_SSL_VERIFYPEER","Specify ssl verification peer [default = 1 = set]."); } ReaderWriterCURL::~ReaderWriterCURL() diff --git a/src/osgPlugins/txp/ReaderWriterTXP.h b/src/osgPlugins/txp/ReaderWriterTXP.h index 406e9a2ef..7e7a8c398 100644 --- a/src/osgPlugins/txp/ReaderWriterTXP.h +++ b/src/osgPlugins/txp/ReaderWriterTXP.h @@ -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