Changeset 11489 for OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ExportOptions.cpp

Timestamp:

05/28/10 18:22:02 (3 years ago)

Author:

robert

Message:

Converted osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ExportOptions.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ExportOptions.cpp

@@ -154 +154 @@
         if ( token == _validateOption )
         {
-            osg::notify( osg::INFO ) << "fltexp: Found: " << token << std::endl;
+            OSG_INFO << "fltexp: Found: " << token << std::endl;
             setValidateOnly( true );
             continue;
@@ -160 +160 @@
         if ( token == _stripTextureFilePathOption )
         {
-            osg::notify( osg::INFO ) << "fltexp: Found: " << token << std::endl;
+            OSG_INFO << "fltexp: Found: " << token << std::endl;
             setStripTextureFilePath( true );
             continue;
@@ -167 +167 @@
         if ( pos == str.npos )
         {
-            osg::notify( osg::WARN ) << "fltexp: Bogus OptionString: " << token << std::endl;
+            OSG_WARN << "fltexp: Bogus OptionString: " << token << std::endl;
             continue;
         }
@@ -188 +188 @@
         if (token == _versionOption)
         {
-            osg::notify( osg::INFO ) << "fltexp: Token: " << token << ", Value: " << value << std::endl;
+            OSG_INFO << "fltexp: Token: " << token << ", Value: " << value << std::endl;
             int version( VERSION_16_1 );
             if( value == std::string( "15.7" ) )
@@ -195 +195 @@
                 version = VERSION_15_8;
             else if( value != std::string( "16.1" ) )
-                osg::notify( osg::WARN ) << "fltexp: Unsupported version: " << value << ". Defaulting to 16.1." << std::endl;
+                OSG_WARN << "fltexp: Unsupported version: " << value << ". Defaulting to 16.1." << std::endl;
             setFlightFileVersionNumber( version );
         }
         else if (token == _unitsOption)
         {
-            osg::notify( osg::INFO ) << "fltexp: Token: " << token << ", Value: " << value << std::endl;
+            OSG_INFO << "fltexp: Token: " << token << ", Value: " << value << std::endl;
             FlightUnits units( METERS );
             if( value == std::string( "KILOMETERS" ) )
@@ -211 +211 @@
                 units = NAUTICAL_MILES;
             else if( value != std::string( "METERS" ) )
-                osg::notify( osg::WARN ) << "fltexp: Unsupported units: " << value << ". Defaulting to METERS." << std::endl;
+                OSG_WARN << "fltexp: Unsupported units: " << value << ". Defaulting to METERS." << std::endl;
             setFlightUnits( units );
         }
         else if (token == _tempDirOption)
         {
-            osg::notify( osg::INFO ) << "fltexp: Token: " << token << ", Value: " << value << std::endl;
+            OSG_INFO << "fltexp: Token: " << token << ", Value: " << value << std::endl;
             setTempDir( value );
         }
         else if (token == _lightingOption)
         {
-            osg::notify( osg::INFO ) << "fltexp: Token: " << token << ", Value: " << value << std::endl;
+            OSG_INFO << "fltexp: Token: " << token << ", Value: " << value << std::endl;
             bool lighting( true );
             if (value == std::string( "OFF" ) )
                 lighting = false;
             else if (value != std::string( "ON" ) )
-                osg::notify( osg::WARN ) << "fltexp: Unsupported lighting value: " << value << ". Defaulting to ON." << std::endl;
+                OSG_WARN << "fltexp: Unsupported lighting value: " << value << ". Defaulting to ON." << std::endl;
             setLightingDefault( lighting );
         }
         else
-            osg::notify( osg::WARN ) << "fltexp: Bogus OptionString: " << token << std::endl;
+            OSG_WARN << "fltexp: Bogus OptionString: " << token << std::endl;
     }
 }