Changeset 8074

Timestamp:

04/11/08 12:16:38

Author:

robert

Message:

From Bob Kuehne, "1) add simplifier command "--simplifier .5" to reduce complexity
2) complementarily add a "--overallNormal" to replace
per-vert/per-facet normals with an overall. simplifier doesn't work

in certain cases without less complex normals. this gets that done.
3) add env var output with full verbose output so people realize it's
active when the app is run - i see this all the time in training where
people run osgconv, with unintended data transformations due to
osgUtil:;Optimzer, for example"

Files:

• OpenSceneGraph/trunk/applications/osgconv/osgconv.cpp (modified) (9 diffs)

OpenSceneGraph/trunk/applications/osgconv/osgconv.cpp

@@ -6 +6 @@
-#include <osg/Notify>
-#include <osg/Vec3>
+#include <osg/ProxyNode>
-#include <osg/Geometry>
-#include <osg/Texture2D>
@@ -19 +20 @@
-
-#include <osgUtil/Optimizer>
+#include <osgUtil/Simplifier>
-#include <osgUtil/SmoothingVisitor>
-
@@ -73 +75 @@
-    private:
-        osg::ref_ptr<osg::GraphicsContext> _gc;
+};
+
+class DefaultNormalsGeometryVisitor
+    : public osg::NodeVisitor
+{
+public:
+
+    DefaultNormalsGeometryVisitor()
+        : osg::NodeVisitor( osg::NodeVisitor::TRAVERSE_ALL_CHILDREN ) {
+    }
+
+    virtual void apply( osg::Geode & geode )
+    {
+        for( unsigned int ii = 0; ii < geode.getNumDrawables(); ++ii )
+        {
+            osg::ref_ptr< osg::Geometry > geometry = dynamic_cast< osg::Geometry * >( geode.getDrawable( ii ) );
+            if( geometry.valid() )
+            {
+                osg::ref_ptr< osg::Vec3Array > newnormals = new osg::Vec3Array;
+                newnormals->push_back( osg::Z_AXIS );
+                geometry->setNormalArray( newnormals.get() );
+                geometry->setNormalBinding( osg::Geometry::BIND_OVERALL );
+            }
+        }
+    }
+
+    virtual void apply( osg::Node & node )
+    {
+        traverse( node );
+    }
+
-};
-
@@ -370 +403 @@
-        osg::notify(osg::NOTICE) << msg << std::endl;
-    }
+
+    // basic usage
-    osg::notify(osg::NOTICE)<< std::endl;
-    osg::notify(osg::NOTICE)<<"usage:"<< std::endl;
-    osg::notify(osg::NOTICE)<<"    " << prog << " [options] infile1 [infile2 ...] outfile"<< std::endl;
-    osg::notify(osg::NOTICE)<< std::endl;
+
+    // print env options - especially since optimizer is always _on_
+    osg::notify(osg::NOTICE)<<"environment:" << std::endl;
+    osg::ApplicationUsage::UsageMap um = osg::ApplicationUsage::instance()->getEnvironmentalVariables();
+    std::string envstring;
+    osg::ApplicationUsage::instance()->getFormattedString( envstring, um );
+    osg::notify(osg::NOTICE)<<envstring << std::endl;
+
+    // print tool options
-    osg::notify(osg::NOTICE)<<"options:"<< std::endl;
-    osg::notify(osg::NOTICE)<<"    -O option          - ReaderWriter option"<< std::endl;
@@ -431 +475 @@
-                              "                         absolute position in world space\n"
-                              << std::endl;
+    osg::notify(osg::NOTICE)<<"    --simplify n       - Run simplifier on prior to output. Argument must be a" << std::endl
+                            <<"                         normalized value for the resultant percentage reduction." << std::endl
+                            <<"                         Example: --simplify .5 will produce an 50 reduced model." << std::endl
+                            << std::endl;
-    osg::notify(osg::NOTICE)<<"    -s scale           - Scale size of model.  Scale argument must be the \n"
-                              "                         following :\n"
@@ -443 +491 @@
-    osg::notify(osg::NOTICE)<<"    --addMissingColors - Adding a white color value to all geometry that don't have\n"
-                              "                         their own color values (--addMissingColours also accepted)."<< std::endl;
+    osg::notify(osg::NOTICE)<<"    --overallNormal    - Replace normals with a single overall normal."<< std::endl;
-
-}
@@ -548 +597 @@
-    }
-
+    float simplifyPercent = 1.0;
+    bool do_simplify = false;
+    while ( arguments.read( "--simplify",str ) )
+    {
+        float nsimp = 1.0;
+        if( sscanf( str.c_str(), "%f",
+                &nsimp ) != 1 )
+        {
+            usage( argv[0], "Scale argument format incorrect." );
+            return 1;
+        }
+        std::cout << str << " " << nsimp << std::endl;
+        simplifyPercent = nsimp;
+        osg::notify( osg::INFO ) << "Simplifying with percentage: " << simplifyPercent << std::endl;
+        do_simplify = true;
+    }
+
-    while (arguments.read("-t",str))
-    {
@@ -587 +653 @@
-    while(arguments.read("--addMissingColours") || arguments.read("--addMissingColors")) { addMissingColours = true; }
-
+    bool do_overallNormal = false;
+    while(arguments.read("--overallNormal") || arguments.read("--overallNormal")) { do_overallNormal = true; }
+
-    // any option left unread are converted into errors to write out later.
-    arguments.reportRemainingOptionsAsUnrecognized();
@@ -672 +741 @@
-            }
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        osgDB::ReaderWriter::WriteResult result = osgDB::Registry::instance()->writeNode(*root,fileNameOut,osgDB::Registry::instance()->getOptions());
-        if (result.success())