Changeset 8286

Timestamp:

05/08/08 15:56:28

Author:

robert

Message:

From Paul Martz, "As I discovered prior to the 2.4 release, the FLT export geometry backend was using some old turn-on code, originally written just to enable other development but not intended for actual release. Sadly, my OSG training commitments prevented me from fixing this prior to 2.4.

In essence, the FLT exporter was emitting a full set of Mesh records each time it encountered a PrimitiveSet?.

Attached is a fix. The code now emits the Mesh set up records, then iterates over all PrimitiveSets? and emits a Mesh Primitive record per PrimitiveSet?.

It also loops over PrimitiveSets? twice, first writing Face records according to the mode, the writing Mesh records (again according to the mode).

The final change included here is support for GL_POINTS as single-vertex Face records.

Billboards are still to come."

Files:

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

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

@@ -357 +357 @@
-        ScopedStatePushPop drawableGuard( this, geom->getStateSet() );
-
-
-
+
+
+
+
+
-            // If at least one record will be a Face record, then we
-ool
+alette
-            _vertexPalette->add( *geom );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-            {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
+        }
+
+        if (atLeastOneMesh( *geom ))
+        {
+            // If at least one Mesh record, write out preamble mesh records
+            //   followed by a Mesh Primitive record per PrimitiveSet.
+            writeMesh( node, *geom );
+
+            writeMatrix( node.getUserData() );
+            writeComment( node );
+            writeMultitexture( *geom );
+            writeLocalVertexPool( *geom );
+
+            writePush();
+
+            unsigned int jdx;
+            for (jdx=0; jdx < geom->getNumPrimitiveSets(); jdx++)
+            {
+                osg::PrimitiveSet* prim = geom->getPrimitiveSet( jdx );
+                if ( !isMesh( prim->getMode() ) )
+                    continue;
+
+                if (prim->getType() == osg::PrimitiveSet::DrawArraysPrimitiveType)
+                    handleDrawArrays( dynamic_cast<osg::DrawArrays*>( prim ), *geom, node );
+                else if (prim->getType() == osg::PrimitiveSet::DrawArrayLengthsPrimitiveType)
+                    handleDrawArrayLengths( dynamic_cast<osg::DrawArrayLengths*>( prim ), *geom, node );
+                else if ( (prim->getType() == osg::PrimitiveSet::DrawElementsUBytePrimitiveType) ||
+                        (prim->getType() == osg::PrimitiveSet::DrawElementsUShortPrimitiveType) ||
+                        (prim->getType() == osg::PrimitiveSet::DrawElementsUIntPrimitiveType) )
+                    handleDrawElements( dynamic_cast<osg::DrawElements*>( prim ), *geom, node );
+                else
+                {
+                    std::string warning( "fltexp: Unknown PrimitiveSet type." );
+                    osg::notify( osg::WARN ) << warning << std::endl;
+                    _fltOpt->getWriteResult().warn( warning );
+                    return;
+                }
+            }
+
+            writePop();
-        }
-    }

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

@@ -125 +125 @@
-    // Geometry records
-    void writeFace( const osg::Geode& geode, const osg::Geometry& geom, GLenum mode );
-, GLenum mode
+
-    int writeVertexList( int first, unsigned int count );
-    int writeVertexList( const std::vector<unsigned int>& indices, unsigned int count );
-    void writeMeshPrimitive( const std::vector<unsigned int>& indices, GLenum mode );
-, GLenum mode
+
-    void writeMultitexture( const osg::Geometry& geom );
-    void writeUVList( int numVerts, const osg::Geometry& geom );
@@ -159 +159 @@
-    bool isLit( const osg::Geometry& geom ) const;
-    bool isTextured( int unit, const osg::Geometry& geom ) const;
-
+
+
+
-
-    osg::ref_ptr< ExportOptions > _fltOpt;

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

@@ -68 +68 @@
-
-bool
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    unsigned int jdx;
-    for (jdx=0; jdx < geom.getNumPrimitiveSets(); jdx++)
-    {
-        const osg::PrimitiveSet* prim = geom.getPrimitiveSet( jdx );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -283 +304 @@
-
-void
-, GLenum mode
+
-{
-    enum DrawMode
@@ -355 +376 @@
-    osg::StateSet const* ss = getCurrentStateSet();
-
-    switch( mode )
-    {
-    case GL_POINTS:
-    {
-        std::string warning( "fltexp: GL_POINTS not supported in FLT export." );
-        osg::notify( osg::WARN ) << warning << std::endl;
-        _fltOpt->getWriteResult().warn( warning );
-        return;
-        break;
-    }
-    case GL_LINES:
-    case GL_LINE_STRIP:
-    case GL_LINE_LOOP:
-    case GL_TRIANGLES:
-    case GL_QUADS:
-    {
-        std::string warning( "fltexp: Wrong mode in Mesh record." );
-        osg::notify( osg::WARN ) << warning << std::endl;
-        _fltOpt->getWriteResult().warn( warning );
-        return;
-        break;
-    }
-    case GL_TRIANGLE_STRIP:
-    case GL_TRIANGLE_FAN:
-    case GL_QUAD_STRIP:
-    case GL_POLYGON:
-    {
-        // Default to no facet culling
@@ -395 +390 @@
-            // Note: OpenFlt can't handle FRONT or FRONT_AND_BACK settings, so ignore these(??)
-        }
-        break;
-    }
-    }
-
@@ -545 +538 @@
-
-void
-, GLenum mode
+
-{
-    // Attribute Mask
@@ -837 +830 @@
-        break;
-    case GL_POINTS:
+        n = 1;
+        break;
+    case GL_LINES:
+        n = 2;
+        break;
+    case GL_TRIANGLES:
+        n = 3;
+        break;
+    case GL_QUADS:
+        n = 4;
+        break;
-    case GL_LINE_STRIP:
-    case GL_LINE_LOOP:
@@ -843 +847 @@
-        n = count;
-        break;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    if (useMesh)
-    {
-        writeMesh( geode, geom, mode );
-
-        writeMatrix( geode.getUserData() );
-        writeComment( geode );
-        writeMultitexture( geom );
-        writeLocalVertexPool( geom, mode );
-
-        writePush();
-
-        std::vector< unsigned int > indices;
-        int jdx;
@@ -873 +856 @@
-            indices.push_back( first+jdx );
-        writeMeshPrimitive( indices, mode );
-
-        writePop();
-    }
-    else
@@ -881 +862 @@
-        while ((unsigned int)( first+n ) <= max)
-        {
-            // Need:
-            // * Geode for record name (but also need to handle
-            //   multi Geometry objects and multi PrimitiveSet objects;
-            //   all Face records can't have the same name).
-            // * Mode
-            writeFace( geode, geom, mode );
-
@@ -920 +896 @@
-        break;
-    case GL_POINTS:
+        n = 1;
+        break;
+    case GL_LINES:
+        n = 2;
+        break;
+    case GL_TRIANGLES:
+        n = 3;
+        break;
+    case GL_QUADS:
+        n = 4;
+        break;
-    case GL_LINE_STRIP:
-    case GL_LINE_LOOP:
@@ -925 +912 @@
-    default:
-        break;
-    case GL_LINES:
-        n = 2;
-        break;
-    case GL_TRIANGLES:
-        n = 3;
-        break;
-    case GL_QUADS:
-        n = 4;
-        break;
-    }
-
@@ -941 +919 @@
-    if (useMesh)
-    {
-        writeMesh( geode, geom, mode );
-
-        writeMatrix( geode.getUserData() );
-        writeComment( geode );
-        writeMultitexture( geom );
-        writeLocalVertexPool( geom, mode );
-
-        writePush();
-
-        int idx( 0 );
-        for( osg::DrawArrayLengths::const_iterator itr=dal->begin();
@@ -960 +929 @@
-            writeMeshPrimitive( indices, mode );
-        }
-
-        writePop();
-    }
-    else
@@ -1017 +984 @@
-        break;
-    case GL_POINTS:
+        n = 1;
+        break;
+    case GL_LINES:
+        n = 2;
+        break;
+    case GL_TRIANGLES:
+        n = 3;
+        break;
+    case GL_QUADS:
+        n = 4;
+        break;
-    case GL_LINE_STRIP:
-    case GL_LINE_LOOP:
@@ -1023 +1001 @@
-        n = de->getNumIndices();
-        break;
-    case GL_LINES:
-        n = 2;
-        break;
-    case GL_TRIANGLES:
-        n = 3;
-        break;
-    case GL_QUADS:
-        n = 4;
-        break;
-    }
-
@@ -1039 +1008 @@
-    if (useMesh)
-    {
-        writeMesh( geode, geom, mode );
-
-        writeMatrix( geode.getUserData() );
-        writeComment( geode );
-        writeMultitexture( geom );
-        writeLocalVertexPool( geom, mode );
-
-        writePush();
-
-        std::vector< unsigned int > indices;
-        int idx;
@@ -1053 +1013 @@
-            indices.push_back( de->index( idx ) );
-        writeMeshPrimitive( indices, mode );
-
-        writePop();
-    }
-    else