Changeset 8003

Timestamp:

03/28/08 13:44:33 (5 years ago)

Author:

robert

Message:

From Paul Martz, "Here's the mods to the OpenFlight? plugin to support FLT export. The ZIP file contains the new .cpp/h files as well as existing files that I modified.

Changes to existing files:

ReaderWriter?.cpp -- to support writeNode() of course.
ReaderWriterATTR.cpp -- to support writeObject -- we write .attr files for textures, if they don't already exist.
AttrData?.cpp/.h -- Minor fixes.
CMakeLists.txt -- to include the new files in the build."

From Robert Osfield, port to non Windows platforms just required fixing of header capitilization errors
that windows lets through the net due to having a case insensitive file system.

Location:

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight

Files:

• AttrData.cpp (modified) (1 diff)
• AttrData.h (modified) (3 diffs)
• CMakeLists.txt (modified) (3 diffs)
• DataInputStream.h (modified) (1 diff)
• DataOutputStream.cpp (added)
• DataOutputStream.h (added)
• Document.h (modified) (1 diff)
• ExportOptions.cpp (added)
• ExportOptions.h (added)
• FltExportVisitor.cpp (added)
• FltExportVisitor.h (added)
• FltWriteResult.h (added)
• LightSourcePaletteManager.cpp (added)
• LightSourcePaletteManager.h (added)
• MaterialPaletteManager.cpp (added)
• MaterialPaletteManager.h (added)
• Opcodes.h (added)
• Pools.h (modified) (1 diff)
• ReaderWriterATTR.cpp (modified) (5 diffs)
• ReaderWriterFLT.cpp (modified) (5 diffs)
• RecordInputStream.cpp (modified) (1 diff)
• Registry.h (modified) (1 diff)
• TexturePaletteManager.cpp (added)
• TexturePaletteManager.h (added)
• Types.h (added)
• Utils.h (added)
• VertexPaletteManager.cpp (added)
• VertexPaletteManager.h (added)
• expAncillaryRecords.cpp (added)
• expControlRecords.cpp (added)
• expGeometryRecords.cpp (added)
• expPrimaryRecords.cpp (added)

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

@@ -25 +25 @@
 AttrData::AttrData() :
     texels_u(0),
-    textel_v(0),
+    texels_v(0),
     direction_u(0),
     direction_v(0),

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

@@ -23 +23 @@
 #include <string>
 #include <osg/Object>
-#include "types.h"
+#include "Types.h"
 
 namespace flt {
@@ -113 +113 @@
   
         int32   texels_u;               // Number of texels in u direction
-        int32   textel_v;               // Number of texels in v direction
+        int32   texels_v;               // Number of texels in v direction
         int32   direction_u;            // Real world size u direction
         int32   direction_v;            // Real world size v direction
@@ -329 +329 @@
         }
     #endif
+        int32   numSubtextures;             // # of subtextures
 
 };

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/CMakeLists.txt

@@ -7 +7 @@
     ControlRecords.cpp
     DataInputStream.cpp
+    DataOutputStream.cpp
     Document.cpp
+    expAncillaryRecords.cpp
+    expControlRecords.cpp
+    expGeometryRecords.cpp
+    expPrimaryRecords.cpp
+    ExportOptions.cpp
+    FltExportVisitor.cpp
     GeometryRecords.cpp
     LightPointRecords.cpp
+    LightSourcePaletteManager.cpp
+    MaterialPaletteManager.cpp
     PaletteRecords.cpp
     Pools.cpp
@@ -20 +29 @@
     ReservedRecords.cpp
     RoadRecords.cpp
+    TexturePaletteManager.cpp
     Vertex.cpp
+    VertexPaletteManager.cpp
     VertexRecords.cpp
 )
@@ -27 +38 @@
     AttrData.h
     DataInputStream.h
+    DataOutputStream.h
+    ExportOptions.h
+    FltExportVisitor.h
+    FltWriteResult.h
     Document.h
+    LightSourcePaletteManager.h
+    MaterialPaletteManager.h
     Pools.h
     Record.h
     RecordInputStream.h
     Registry.h
+    TexturePaletteManager.h
     Vertex.h
-    opcodes.h
-    types.h
+    VertexPaletteManager.h
+    Opcodes.h
+    Types.h
+    Utils.h
 )
 

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

@@ -26 +26 @@
 #include <osg/Vec3d>
 #include <osg/Vec4f>
-#include "types.h"    
+#include "Types.h"    
 
 namespace flt {

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

@@ -27 +27 @@
 #include <osgDB/ReaderWriter>
 
-#include "types.h"
+#include "Types.h"
 #include "Record.h"
 #include "Pools.h"

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

@@ -29 +29 @@
 #include <osg/Light>
 #include <osg/Program>
-#include "types.h"
+#include "Types.h"
 
 

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

@@ -30 +30 @@
 #include "AttrData.h"
 #include "DataInputStream.h"
+#include "DataOutputStream.h"
 
 using namespace osg;
@@ -48 +49 @@
 
         virtual ReadResult readObject(const std::string& fileName, const ReaderWriter::Options*) const;
+        virtual ReaderWriter::WriteResult writeObject(const osg::Object& object, const std::string& fileName, const Options* options) const;
 };
 
@@ -75 +77 @@
     {
         attr->texels_u  = in.readInt32();
-        attr->textel_v  = in.readInt32();
+        attr->texels_v  = in.readInt32();
         attr->direction_u  = in.readInt32();
         attr->direction_v  = in.readInt32();
@@ -171 +173 @@
         attr->attrVersion = in.readInt32();
         attr->controlPoints = in.readInt32();
-        in.forward(4);
+        attr->numSubtextures = in.readInt32();
 #endif
     }
@@ -188 +190 @@
 
 
+ReaderWriter::WriteResult
+ReaderWriterATTR::writeObject(const osg::Object& object, const std::string& fileName, const Options* options) const
+{
+    using std::ios;
+
+    std::string ext = osgDB::getLowerCaseFileExtension( fileName );
+    if (!acceptsExtension(ext)) return WriteResult::FILE_NOT_HANDLED;
+
+    const AttrData* attr = dynamic_cast< const AttrData* >( &object );
+    if (attr == NULL)
+    {
+        osg::notify( osg::FATAL ) << "AttrWriter: Invalid Object." << std::endl;
+        return WriteResult::FILE_NOT_HANDLED;
+    }
+
+    std::ofstream fOut;
+    fOut.open( fileName.c_str(), std::ios::out | std::ios::binary );
+
+    if ( fOut.fail())
+        return WriteResult::ERROR_IN_WRITING_FILE;
+
+    flt::DataOutputStream out( fOut.rdbuf() );
+
+
+    out.writeInt32( attr->texels_u );
+    out.writeInt32( attr->texels_v );
+    out.writeInt32( attr->direction_u );
+    out.writeInt32( attr->direction_v );
+    out.writeInt32( attr->x_up );
+    out.writeInt32( attr->y_up );
+    out.writeInt32( attr->fileFormat );
+    out.writeInt32( attr->minFilterMode );
+    out.writeInt32( attr->magFilterMode );
+    out.writeInt32( attr->wrapMode );
+
+    out.writeInt32( attr->wrapMode_u );
+    out.writeInt32( attr->wrapMode_v );
+
+    out.writeInt32( attr->modifyFlag );
+    out.writeInt32( attr->pivot_x );
+    out.writeInt32( attr->pivot_y );
+
+    out.writeInt32( attr->texEnvMode );
+    out.writeInt32( attr->intensityAsAlpha );
+    out.writeFill( 4*8 );
+    out.writeFloat64( attr->size_u );
+    out.writeFloat64( attr->size_v );
+    out.writeInt32( attr->originCode );
+    out.writeInt32( attr->kernelVersion );
+    out.writeInt32( attr->intFormat );
+    out.writeInt32( attr->extFormat );
+    out.writeInt32( attr->useMips );
+    for (int n=0; n<8; n++)
+        out.writeFloat32( attr->of_mips[n] );
+    out.writeInt32( attr->useLodScale );
+    out.writeFloat32( attr->lod0 );
+    out.writeFloat32( attr->scale0 );
+    out.writeFloat32( attr->lod1 );
+    out.writeFloat32( attr->scale1 );
+    out.writeFloat32( attr->lod2 );
+    out.writeFloat32( attr->scale2 );
+    out.writeFloat32( attr->lod3 );
+    out.writeFloat32( attr->scale3 );
+    out.writeFloat32( attr->lod4 );
+    out.writeFloat32( attr->scale4 );
+    out.writeFloat32( attr->lod5 );
+    out.writeFloat32( attr->scale5 );
+    out.writeFloat32( attr->lod6 );
+    out.writeFloat32( attr->scale6 );
+    out.writeFloat32( attr->lod7 );
+    out.writeFloat32( attr->scale7 );
+    out.writeFloat32( attr->clamp );
+    out.writeInt32( attr->magFilterAlpha );
+    out.writeInt32( attr->magFilterColor );
+    out.writeFill( 4 );
+    out.writeFill( 4*8 );
+    out.writeFloat64( attr->lambertMeridian );
+    out.writeFloat64( attr->lambertUpperLat );
+    out.writeFloat64( attr->lambertlowerLat );
+    out.writeFill( 8 );
+    out.writeFill( 4*5 );
+    out.writeInt32( attr->useDetail );
+    out.writeInt32( attr->txDetail_j );
+    out.writeInt32( attr->txDetail_k );
+    out.writeInt32( attr->txDetail_m );
+    out.writeInt32( attr->txDetail_n );
+    out.writeInt32( attr->txDetail_s );
+    out.writeInt32( attr->useTile );
+    out.writeFloat32( attr->txTile_ll_u );
+    out.writeFloat32( attr->txTile_ll_v );
+    out.writeFloat32( attr->txTile_ur_u );
+    out.writeFloat32( attr->txTile_ur_v );
+    out.writeInt32( attr->projection );
+    out.writeInt32( attr->earthModel );
+    out.writeFill( 4 );
+    out.writeInt32( attr->utmZone );
+    out.writeInt32( attr->imageOrigin );
+    out.writeInt32( attr->geoUnits );
+    out.writeFill( 4 );
+    out.writeFill( 4 );
+    out.writeInt32( attr->hemisphere );
+    out.writeFill( 4 );
+    out.writeFill( 4 );
+    out.writeFill( 149*4 );
+    out.writeString( attr->comments, 512 );
+
+    out.writeFill( 13*4 );
+    out.writeInt32( attr->attrVersion );
+    out.writeInt32( attr->controlPoints );
+    out.writeInt32( attr->numSubtextures );
+
+
+    fOut.close();
+
+    return WriteResult::FILE_SAVED;
+}
+
+
 
 // now register with Registry to instantiate the above
 // reader/writer.
 REGISTER_OSGPLUGIN(attr, ReaderWriterATTR)
-
-
-
-
-
-
-
-
-
-
-
-

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

@@ -31 +31 @@
 #include "Document.h"
 #include "RecordInputStream.h"
+#include "DataOutputStream.h"
+#include "FltExportVisitor.h"
+#include "ExportOptions.h"
 
 #define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)  
@@ -82 +85 @@
 
 
+/*!
+
+FLTReaderWriter supports importing and exporting OSG scene grqphs
+from/to OpenFlight files.
+
+<table>
+  <tr>
+    <th></th>
+    <th align="center">Node</th>
+    <th align="center">Object</th>
+    <th align="center">Image</th>
+    <th align="center">HeightField</th>
+  </tr>
+  <tr>
+    <td align="right">Read</td>
+    <td align="center"><strong>X</strong></td>
+    <td></td>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td align="right">Write</td>
+    <td align="center"><strong>X</strong></td>
+    <td></td>
+    <td></td>
+    <td></td>
+  </tr>
+</table>
+
+*/
+
 class FLTReaderWriter : public ReaderWriter
 {
     public:
+        FLTReaderWriter()
+          : _implicitPath( "." )
+        {}
+
         virtual const char* className() const { return "FLT Reader/Writer"; }
 
@@ -348 +386 @@
         }
 
-        virtual WriteResult writeNode(const Node& /*node*/,const std::string& /*fileName*/, const osgDB::ReaderWriter::Options* /*options*/) const
-        {
-            return WriteResult::FILE_NOT_HANDLED;
-        }
-        
+        virtual WriteResult writeNode( const osg::Node& node, const std::string& fileName, const Options* options ) const
+        {
+            if ( fileName.empty() )
+            {
+                osg::notify( osg::FATAL ) << "fltexp: writeNode: empty file name" << std::endl;
+                return WriteResult::FILE_NOT_HANDLED;
+            }
+            std::string ext = osgDB::getLowerCaseFileExtension( fileName );
+            if ( !acceptsExtension(ext) )
+                return WriteResult::FILE_NOT_HANDLED;
+
+            // Get and save the implicit path name (in case a path wasn't specified in Options).
+            std::string filePath = osgDB::getFilePath( fileName );
+            if (!filePath.empty())
+                _implicitPath = filePath;
+
+            std::ofstream fOut;
+            fOut.open( fileName.c_str(), std::ios::out | std::ios::binary );
+            if ( fOut.fail())
+            {
+                osg::notify( osg::FATAL ) << "fltexp: Failed to open output stream." << std::endl;
+                return WriteResult::ERROR_IN_WRITING_FILE;
+            }
+
+            WriteResult wr = WriteResult::FILE_NOT_HANDLED;
+            wr = writeNode( node, fOut, options );
+            fOut.close();
+
+            return wr;
+        }
+
+
         virtual WriteResult writeObject(const Object& object,std::ostream& fout, const osgDB::ReaderWriter::Options* options) const
         {
@@ -360 +425 @@
         }
 
-        virtual WriteResult writeNode(const Node& /*node*/,std::ostream& /*fout*/, const osgDB::ReaderWriter::Options* /*options*/) const
-        {
-            return WriteResult::FILE_NOT_HANDLED;
+        virtual WriteResult writeNode( const osg::Node& node, std::ostream& fOut, const Options* options ) const
+        {
+            // Convert Options to FltOptions.
+            ExportOptions* fltOpt = new ExportOptions( options );
+            fltOpt->parseOptionsString();
+
+            // If user didn't specify a temp dir, use the output directory
+            //   that was implicit in the output file name.
+            if (fltOpt->getTempDir().empty())
+                fltOpt->setTempDir( _implicitPath );
+            if (!fltOpt->getTempDir().empty())
+            {
+                // If the temp directory doesn't already exist, make it.
+                if ( !osgDB::makeDirectory( fltOpt->getTempDir() ) )
+                {
+                    osg::notify( osg::FATAL ) << "fltexp: Error creating temp dir: " << fltOpt->getTempDir() << std::endl;
+                    return WriteResult::ERROR_IN_WRITING_FILE;
+                }
+            }
+
+            flt::DataOutputStream dos( fOut.rdbuf(), fltOpt->getValidateOnly() );
+            flt::FltExportVisitor fnv( &dos, fltOpt );
+
+            // Hm. 'node' is const, but in order to write out this scene graph,
+            //   must use Node::accept() which requires 'node' to be non-const.
+            //   Pretty much requires casting away const.
+            osg::Node* nodeNonConst = const_cast<osg::Node*>( &node );
+            nodeNonConst->accept( fnv );
+            fnv.complete( node );
+
+            // FIXME: Error-handling?
+            return WriteResult::FILE_SAVED;
         }
 
     protected:
+        mutable std::string _implicitPath;
 
         mutable OpenThreads::ReentrantMutex _serializerMutex;
@@ -373 +468 @@
 // reader/writer.
 REGISTER_OSGPLUGIN(OpenFlight, FLTReaderWriter)
-
-
-
-
-
-
-
-
-
-
-
-
-

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

@@ -19 +19 @@
 
 #include <iostream>
-#include "opcodes.h"
+#include "Opcodes.h"
 #include "Registry.h"
 #include "Document.h"

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

@@ -24 +24 @@
 #include <map>
 #include <osg/ref_ptr>
-#include "opcodes.h"
+#include "Opcodes.h"
 #include "Record.h"