Changeset 11203 for OpenSceneGraph/trunk/src/osgPlugins/3ds/WriterCompareTriangle.cpp

Timestamp:

03/11/10 17:53:35 (3 years ago)

Author:

robert

Message:

From Sukender, "I had some conflicts when updating but they seem resolved now. Attached files (four files) are against rev. 11200. Changelog:
- Replaced exceptions with assert() or OSG_NOTIFY
- Replaced osg::notify() with OSG_NOTIFY
- Changed braces and tabs to fit OSG coding convention
- Cleaned a few things in code (names, added deallocations upon error)"

Files:

• OpenSceneGraph/trunk/src/osgPlugins/3ds/WriterCompareTriangle.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgPlugins/3ds/WriterCompareTriangle.cpp

@@ -1 +1 @@
 #include "WriterCompareTriangle.h"
+#include <assert.h>
 
 WriterCompareTriangle::WriterCompareTriangle(const osg::Geode & geode, unsigned int nbVertices) : geode(geode) 
@@ -51 +52 @@
     setMaxMin (nbVerticesX, nbVerticesY, nbVerticesZ); // This function prevent from cutting the scene in too many blocs
 
-    osg::notify(osg::INFO)
+    OSG_NOTIFY(osg::INFO)
         << "Cutting x by " << nbVerticesX << std::endl
         << "Cutting y by " << nbVerticesY << std::endl
@@ -120 +121 @@
     {
         if (x >= boxList[i].xMin() && 
-            x < boxList[i].xMax() &&
+            x <  boxList[i].xMax() &&
             y >= boxList[i].yMin() &&
-            y < boxList[i].yMax() &&
+            y <  boxList[i].yMax() &&
             z >= boxList[i].zMin() &&
-            z < boxList[i].zMax())
+            z <  boxList[i].zMax())
         {
             return i;
         }
     }
-    throw "Point is not in any blocs";
+    assert(false && "Point is not in any blocs");
+    return 0;
 }