Changeset 11498 for OpenSceneGraph/trunk/src/osgPlugins/ac/ac3d.cpp

Timestamp:

05/28/10 18:30:36 (3 years ago)

Author:

robert

Message:

Converted osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ac/ac3d.cpp (modified) (17 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ac/ac3d.cpp

@@ -86 +86 @@
             // GWM added Dec 2003 - get full path name (change in osgDB handling of files).
             std::string fileName = osgDB::findDataFile( file, options );
-            osg::notify(osg::INFO) << "osgDB ac3d reader: starting reading \"" << fileName << "\"" << std::endl;
+            OSG_INFO << "osgDB ac3d reader: starting reading \"" << fileName << "\"" << std::endl;
             
             // Anders Backmann - correct return if path not found
@@ -177 +177 @@
             }
             else
-                osg::notify(osg::WARN)<<"File must start with a geode "<<std::endl;
+                OSG_WARN<<"File must start with a geode "<<std::endl;
             
             fout.flush();
@@ -343 +343 @@
         if (absFileName.empty())
         {
-            osg::notify(osg::FATAL) << "osgDB ac3d reader: could not find texture \"" << name << "\"" << std::endl;
+            OSG_FATAL << "osgDB ac3d reader: could not find texture \"" << name << "\"" << std::endl;
             return false;
         }
@@ -349 +349 @@
         if (!mImage.valid())
         {
-            osg::notify(osg::FATAL) << "osgDB ac3d reader: could not read texture \"" << name << "\"" << std::endl;
+            OSG_FATAL << "osgDB ac3d reader: could not read texture \"" << name << "\"" << std::endl;
             return false;
         }
@@ -631 +631 @@
          if (_vertices.size() <= i)
          {
-             osg::notify(osg::FATAL) << "osgDB ac3d reader: internal error, got invalid vertex index!" << std::endl;
+             OSG_FATAL << "osgDB ac3d reader: internal error, got invalid vertex index!" << std::endl;
              return VertexIndex(0, 0);
          }
@@ -729 +729 @@
         // Check if we have enough for a line or someting broken ...
         if (nRefs < 2) {
-            osg::notify(osg::WARN) << "osgDB ac3d reader: detected line with less than 2 vertices!" << std::endl;
+            OSG_WARN << "osgDB ac3d reader: detected line with less than 2 vertices!" << std::endl;
             return false;
         }
@@ -753 +753 @@
             type = osg::PrimitiveSet::LINE_STRIP;
         else {
-            osg::notify(osg::FATAL) << "osgDB ac3d reader: non surface flags in surface bin!" << std::endl;
+            OSG_FATAL << "osgDB ac3d reader: non surface flags in surface bin!" << std::endl;
             return false;
         }
@@ -817 +817 @@
         // Check if we have enough for a line or someting broken ...
         if (nRefs < 3) {
-            osg::notify(osg::WARN) << "osgDB ac3d reader: detected surface with less than 3 vertices!" << std::endl;
+            OSG_WARN << "osgDB ac3d reader: detected surface with less than 3 vertices!" << std::endl;
             return false;
         }
@@ -1230 +1230 @@
                     
                     if (token != "SURF") {
-                        osg::notify(osg::FATAL) << "osgDB ac3d reader: expected SURF line while reading object \""
+                        OSG_FATAL << "osgDB ac3d reader: expected SURF line while reading object \""
                                                 << group->getName() << "\"!" << std::endl;
                         return group.release();
@@ -1240 +1240 @@
                     stream >> token;
                     if (token != "mat") {
-                        osg::notify(osg::FATAL) << "osgDB ac3d reader: expected mat line while reading object \""
+                        OSG_FATAL << "osgDB ac3d reader: expected mat line while reading object \""
                                                 << group->getName() << "\"!" << std::endl;
                         return group.release();
@@ -1249 +1249 @@
                     stream >> matIdx;
                     if (primitiveBins.size() <= matIdx) {
-                        osg::notify(osg::FATAL) << "osgDB ac3d reader: invalid material number while reading object \""
+                        OSG_FATAL << "osgDB ac3d reader: invalid material number while reading object \""
                                                 << group->getName() << "\"" << std::endl;
                         return group.release();
@@ -1258 +1258 @@
                     primitiveBin = primitiveBins[matIdx].getOrCreatePrimitiveBin(flags, vertexSet.get());
                     if (!primitiveBin) {
-                        osg::notify(osg::FATAL) << "osgDB ac3d reader: unexpected primitive flags while reading object \""
+                        OSG_FATAL << "osgDB ac3d reader: unexpected primitive flags while reading object \""
                                                 << group->getName() << "\"" << std::endl;
                         return group.release();
@@ -1266 +1266 @@
                     stream >> token;
                     if (token != "refs") {
-                        osg::notify(osg::FATAL) << "osgDB ac3d reader: expected refs line while reading object \""
+                        OSG_FATAL << "osgDB ac3d reader: expected refs line while reading object \""
                                                 << group->getName() << "\"" << std::endl;
                         return group.release();
@@ -1274 +1274 @@
                     stream >> nRefs;
                     if (!stream) {
-                        osg::notify(osg::FATAL) << "osgDB ac3d reader: could not read number of refs while reading object \""
+                        OSG_FATAL << "osgDB ac3d reader: could not read number of refs while reading object \""
                                                 << group->getName() << "\"" << std::endl;
                         return group.release();
@@ -1288 +1288 @@
                         if (vertexSet->size() <= index)
                         {
-                            osg::notify(osg::FATAL) << "osgDB ac3d reader: invalid ref vertex index while reading object \""
+                            OSG_FATAL << "osgDB ac3d reader: invalid ref vertex index while reading object \""
                                                     << group->getName() << "\"" << std::endl;
                             return group.release();
@@ -1297 +1297 @@
                         stream >> texCoord[0] >> texCoord[1];
                         if (!stream) {
-                            osg::notify(osg::WARN) << "osgDB ac3d reader: could not parse texture coords while reading object \""
+                            OSG_WARN << "osgDB ac3d reader: could not parse texture coords while reading object \""
                                                    << group->getName() << "\" setting to (0,0)" << std::endl;
                             stream.clear();
@@ -1335 +1335 @@
                     osg::Node *k = readObject(stream, fileData, transform*parentTransform, textureData);
                     if (k == 0) {
-                        osg::notify(osg::FATAL) << "osgDB ac3d reader: error reading child object" << std::endl;
+                        OSG_FATAL << "osgDB ac3d reader: error reading child object" << std::endl;
                         return group.release();
                     }