Changeset 11491 for OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertToInventor.cpp

Timestamp:

05/28/10 18:25:41 (3 years ago)

Author:

robert

Message:

Converted osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertToInventor.cpp (modified) (23 diffs)

OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertToInventor.cpp

@@ -203 +203 @@
 {
 #ifdef DEBUG_IV_WRITER
-  osg::notify(osg::INFO) << "IvWriter: node traversed" << std::endl;
+  OSG_INFO << "IvWriter: node traversed" << std::endl;
 #endif
 
@@ -416 +416 @@
   };
 
-  osg::notify(osg::WARN) << "IvWriter: No direct conversion for array. "
+  OSG_WARN << "IvWriter: No direct conversion for array. "
     << "The file may be broken." << std::endl;
 }
@@ -485 +485 @@
                                  srcField->getNum(), drawElemIndices, numToProcess);
     else {
-      osg::notify(osg::WARN) << "IvWriter: NOT IMPLEMENTED" << std::endl;
+      OSG_WARN << "IvWriter: NOT IMPLEMENTED" << std::endl;
       assert(0); // FIXME:
     }
@@ -491 +491 @@
     destField->finishEditing();
     if (!ok)
-      osg::notify(osg::WARN) << "IvWriter: Can not deindex - bug in model: index out of range." << std::endl;
+      OSG_WARN << "IvWriter: Can not deindex - bug in model: index out of range." << std::endl;
 
   } else {
@@ -518 +518 @@
       osgArray2ivMField(drawElemIndices, ivIndices, startIndex, stopIndex, numItemsUntilMinusOne);
     else {
-      osg::notify(osg::WARN) << "IvWriter: NOT IMPLEMENTED" << std::endl;
+      OSG_WARN << "IvWriter: NOT IMPLEMENTED" << std::endl;
       assert(0); // FIXME:
     }
@@ -830 +830 @@
         // warn if face culling is on
         if (ivState->osgCullFaceEnabled)
-          osg::notify(osg::WARN) << "IvWriter: Using face culling and two-sided lighting together! "
+          OSG_WARN << "IvWriter: Using face culling and two-sided lighting together! "
                                     "Ignoring face culling." << std::endl;
 
@@ -849 +849 @@
             // Warn if culling the lit faces while rendering unlit faces.
             // Inventor does not support this setup and it lits the unculled faces only.
-            osg::notify(osg::WARN) << "IvWriter: Culling was set in a way that one-sided lighting will lit the culled sides of faces. "
+            OSG_WARN << "IvWriter: Culling was set in a way that one-sided lighting will lit the culled sides of faces. "
                                       "Using lighting on correct faces." << std::endl; 
 
@@ -947 +947 @@
           ivState->osgMaterial->getEmissionFrontAndBack() == false ||
           ivState->osgMaterial->getShininessFrontAndBack() == false)
-        osg::notify(osg::WARN) << "IvWriter: Model contains different materials for front and "
+      {
+        OSG_WARN << "IvWriter: Model contains different materials for front and "
                                   "back faces. This is not handled properly. Using front material only." << std::endl;
-
+      }
     
       // Convert colors
@@ -958 +959 @@
       // alpha and SoBaseColor may be useful on pre-lit scene.
       if (ivState->osgMaterial->getColorMode() != osg::Material::DIFFUSE &&
-          ivState->osgMaterial->getColorMode() != osg::Material::OFF) {
-
-      if (ivState->osgMaterial->getColorMode() == osg::Material::AMBIENT_AND_DIFFUSE)
-        osg::notify(osg::WARN) << "IvWriter: The model is using AMBIENT_AND_DIFFUSE material "
-                                  "mode while Inventor supports DIFFUSE mode only. "
-                                  "The model colors may not much exactly." << std::endl;
-      else
-        osg::notify(osg::WARN) << "IvWriter: The model is not using DIFFUSE material mode and "
-                                  "Inventor supports DIFFUSE mode only. "
-                                  "The model colors may not be correct." << std::endl;
+          ivState->osgMaterial->getColorMode() != osg::Material::OFF)
+      {
+
+        if (ivState->osgMaterial->getColorMode() == osg::Material::AMBIENT_AND_DIFFUSE)
+        {
+            OSG_WARN << "IvWriter: The model is using AMBIENT_AND_DIFFUSE material "
+                                    "mode while Inventor supports DIFFUSE mode only. "
+                                    "The model colors may not much exactly." << std::endl;
+        }
+        else
+        {
+            OSG_WARN << "IvWriter: The model is not using DIFFUSE material mode and "
+                                    "Inventor supports DIFFUSE mode only. "
+                                    "The model colors may not be correct." << std::endl;
+        }
       }
 
@@ -1319 +1325 @@
           break;
       default:
-          osg::notify(osg::WARN) << "IvWriter: NOT IMPLEMENTED" << std::endl;
+          OSG_WARN << "IvWriter: NOT IMPLEMENTED" << std::endl;
           assert(0);
       }
@@ -1347 +1353 @@
           break;
       case GL_TRIANGLE_FAN:
-          osg::notify(osg::WARN) << "IvWriter: GL_TRIANGLE_FAN NOT IMPLEMENTED" << std::endl;
+          OSG_WARN << "IvWriter: GL_TRIANGLE_FAN NOT IMPLEMENTED" << std::endl;
           ((SoTriangleStripSet*)shape)->numVertices.setNum(1);
           ((SoTriangleStripSet*)shape)->numVertices.set1Value(0, elementsCount);
@@ -1366 +1372 @@
           break;
       default:
-          osg::notify(osg::WARN) << "IvWriter: NOT IMPLEMENTED" << std::endl;
+          OSG_WARN << "IvWriter: NOT IMPLEMENTED" << std::endl;
           assert(0);
       }
@@ -1394 +1400 @@
           break;
       default:
-          osg::notify(osg::WARN) << "IvWriter: NOT IMPLEMENTED" << std::endl;
+          OSG_WARN << "IvWriter: NOT IMPLEMENTED" << std::endl;
           assert(0);
       }
     } else {
-      osg::notify(osg::WARN) << "IvWriter: NOT IMPLEMENTED" << std::endl;
+      OSG_WARN << "IvWriter: NOT IMPLEMENTED" << std::endl;
       assert(0 && "Unknown non-indexed shape type.");
     }
@@ -1715 +1721 @@
 
       default:
-        osg::notify(osg::WARN) << "IvWriter: NOT IMPLEMENTED" << std::endl;
+        OSG_WARN << "IvWriter: NOT IMPLEMENTED" << std::endl;
     }
   }
@@ -1791 +1797 @@
     
     void warnNonSupported() {
-      osg::notify(osg::WARN) << "IvWriter: Not supported ShapeDrawable found. Skipping it." << std::endl;
+      OSG_WARN << "IvWriter: Not supported ShapeDrawable found. Skipping it." << std::endl;
     }
     virtual void apply(const osg::Capsule&)        { warnNonSupported(); }
@@ -1827 +1833 @@
   }
   else
-    osg::notify(osg::WARN) << "IvWriter: Unsupported drawable found: \"" << d->className() <<
+    OSG_WARN << "IvWriter: Unsupported drawable found: \"" << d->className() <<
                               "\". Skipping it." << std::endl;
 
@@ -1838 +1844 @@
 {
 #ifdef DEBUG_IV_WRITER
-  osg::notify(osg::INFO) << "IvWriter: Geode traversed" << std::endl;
+  OSG_INFO << "IvWriter: Geode traversed" << std::endl;
 #endif
 
@@ -1859 +1865 @@
 {
 #ifdef DEBUG_IV_WRITER
-  osg::notify(osg::INFO) << "IvWriter: Group traversed" << std::endl;
+  OSG_INFO << "IvWriter: Group traversed" << std::endl;
 #endif
 
@@ -1874 +1880 @@
 {
 #ifdef DEBUG_IV_WRITER
-  osg::notify(osg::INFO) << "IvWriter: Billboard traversed" << std::endl;
+  OSG_INFO << "IvWriter: Billboard traversed" << std::endl;
 #endif
 
@@ -1952 +1958 @@
 {
 #ifdef DEBUG_IV_WRITER
-  osg::notify(osg::INFO) << "IvWriter: MatrixTransform traversed" << std::endl;
+  OSG_INFO << "IvWriter: MatrixTransform traversed" << std::endl;
 #endif
 
@@ -1977 +1983 @@
 {
 #ifdef DEBUG_IV_WRITER
-  osg::notify(osg::INFO) << "IvWriter: PositionAttitudeTransform traversed" << std::endl;
+  OSG_INFO << "IvWriter: PositionAttitudeTransform traversed" << std::endl;
 #endif
 
@@ -1997 +2003 @@
 {
 #ifdef DEBUG_IV_WRITER
-  osg::notify(osg::INFO) << "IvWriter: LOD traversed" << std::endl;
+  OSG_INFO << "IvWriter: LOD traversed" << std::endl;
 #endif
 
@@ -2035 +2041 @@
     
     // undefined mode -> put warning
-    osg::notify(osg::WARN) << "IvWriter: Undefined LOD::RangeMode value." << std::endl;
+    OSG_WARN << "IvWriter: Undefined LOD::RangeMode value." << std::endl;
     ivLOD = new SoGroup;
   }