Changeset 8301

Timestamp:

05/10/08 19:25:42

Author:

robert

Message:

From Paul Martz, "This change adds support for osg::Billboards to the OpenFlight? exporter.

It might seem odd that the change actually removes the stub apply(Billboard&) method, but it turns out Billboards are easily supported in subordinate routines of the existing apply(Geode&) method with s dynamic_cast, so there's no need for a separate apply(Billboard&)."

Files:

• OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/FltExportVisitor.cpp (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/FltExportVisitor.h (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/expGeometryRecords.cpp (modified) (3 diffs)

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

@@ -29 +29 @@
-#include <osgDB/FileUtils>
-#include <osgDB/WriteFile>
-#include <osg/Billboard>
-#include <osg/Geode>
-#include <osg/Geometry>
@@ -337 +336 @@
-}
-
+// Billboards also go through this code. The Geode is passed
+// to writeFace and writeMesh. If those methods successfully cast
+// the Geode to a Billboard, then they set the template mode
+// bit accordingly.
-void
-FltExportVisitor::apply( osg::Geode& node )
@@ -438 +441 @@
-
-void
-FltExportVisitor::apply( osg::Billboard& node )
-{
-    _firstNode = false;
-    ScopedStatePushPop guard( this, node.getStateSet() );
-
-    // TBD -- Not yet implemented, but HIGH priority.
-    //   Face record -- HIGH
-    //   Mesh record -- HIGH
-
-    writeMatrix( node.getUserData() );
-    writeComment( node );
-    writePushTraverseWritePop( node );
-}
-
-void
-FltExportVisitor::apply( osg::Node& node )
-{

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/FltExportVisitor.h

@@ -78 +78 @@
-    virtual void apply( osg::LightSource& node );
-    virtual void apply( osg::Geode& node );
-    virtual void apply( osg::Billboard& node );
-    virtual void apply( osg::Node& node );
-    virtual void apply( osg::ProxyNode& node );

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

@@ -25 +25 @@
-#include <osg/Geometry>
-#include <osg/Geode>
+#include <osg/Billboard>
-#include <osg/io_utils>
-#include <osg/Material>
@@ -250 +251 @@
-    }
-
-Check for blending. We're not a Billboard (TBD?)
-  so use either FIXED_NO_ALPHA_BLENDING or FIXED_ALPHA_BLENDING
+Set the appropriate template mode based
+on blending or Billboarding
-    TemplateMode templateMode( FIXED_NO_ALPHA_BLENDING );
-
+
+
+
+
+
+
+
+
+
-    {
-        const osg::BlendFunc* bf = static_cast<const osg::BlendFunc*>(
@@ -417 +426 @@
-    }
-
-Check for blending. We're not a Billboard (TBD?)
-  so use either FIXED_NO_ALPHA_BLENDING or FIXED_ALPHA_BLENDING
+Set the appropriate template mode based
+on blending or Billboarding
-    TemplateMode templateMode( FIXED_NO_ALPHA_BLENDING );
-
+
+
+
+
+
+
+
+
+
-    {
-        const osg::BlendFunc* bf = static_cast<const osg::BlendFunc*>(