Changeset 7348

Timestamp:

09/03/07 15:52:19 (6 years ago)

Author:

robert

Message:

From Jan Peciva, Added write support into Inventor plugin.

Note from Robert Osfield. A couple of lines of code in ConvertToInventor?.cpp
would not compile under g++ 4.1.2, so rather than hold back the dev release till
this is resolved I've optional compiled out the problem section.
The #define DISABLE_PROBLEM_COMPILE_SECTIONS is used to compile out the problem
section, this define is add via the CMakeLists.txt file.

Location:

OpenSceneGraph/trunk/src/osgPlugins/Inventor

Files:

• CMakeLists.txt (modified) (3 diffs)
• ConvertFromInventor.cpp (modified) (7 diffs)
• ConvertToInventor.cpp (added)
• ConvertToInventor.h (added)
• README.txt (modified) (2 diffs)
• ReaderWriterIV.cpp (modified) (3 diffs)
• ReaderWriterIV.h (modified) (2 diffs)

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

@@ -3 +3 @@
 INCLUDE_DIRECTORIES( ${INVENTOR_INCLUDE_DIR} )
 
+# Disable the build of a problem section in ConvertToInventor.cpp
+ADD_DEFINITIONS(-DDISABLE_PROBLEM_COMPILE_SECTIONS)
 
 SET(TARGET_SRC
+    ConvertToInventor.cpp
     ConvertFromInventor.cpp
     GroupSoLOD.cpp
@@ -10 +13 @@
     ReaderWriterIV.cpp
     ShuttleCallback.cpp
-    )
+)
 SET(TARGET_HDRS
+    ConvertToInventor.h
     ConvertFromInventor.h
     GroupSoLOD.h
@@ -17 +21 @@
     ReaderWriterIV.h
     ShuttleCallback.h
-    )
+)
 
 SET(TARGET_EXTERNAL_LIBRARIES ${INVENTOR_LIBRARY} )

OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertFromInventor.cpp

@@ -41 +41 @@
 #include <Inventor/SbLinear.h>
 
-#ifdef COIN_BASIC_H
+#ifdef __COIN__
 #include <Inventor/VRMLnodes/SoVRMLImageTexture.h>
 #endif
@@ -96 +96 @@
     cbAction.addPostCallback(SoGroup::getClassTypeId(), postGroup, this);
     cbAction.addPreCallback(SoTexture2::getClassTypeId(), preTexture, this);
-#ifdef COIN_BASIC_H
+#ifdef __COIN__
     cbAction.addPreCallback(SoVRMLImageTexture::getClassTypeId(),
                             preVRMLImageTexture, this);
@@ -499 +499 @@
     stateSet->clear();
 
+    // Convert the IV texture to OSG texture if any
+    osg::ref_ptr<osg::Texture2D> texture;
+    const SoNode *ivTexture = soTexStack.top();
+    if (ivTexture)
+    {
+        osg::notify(osg::INFO)<<"Have texture"<<std::endl;
+
+        // Found a corresponding OSG texture object
+        if (ivToOsgTexMap[ivTexture])
+            texture = ivToOsgTexMap[ivTexture];
+        else
+        {
+            // Create a new osg texture
+            texture = convertIVTexToOSGTex(ivTexture, action);
+
+            // Add the new texture to the database
+            ivToOsgTexMap[ivTexture] = texture.get();
+        }
+        
+        stateSet->setTextureAttributeAndModes(0, texture.get(), osg::StateAttribute::ON);
+
+        // Set the texture environment
+        osg::ref_ptr<osg::TexEnv> texEnv = new osg::TexEnv;
+        switch (action->getTextureModel())
+        {
+            case SoTexture2::MODULATE:
+                texEnv->setMode(osg::TexEnv::MODULATE);
+                break;
+            case SoTexture2::DECAL:
+                texEnv->setMode(osg::TexEnv::DECAL);
+                break;
+            case SoTexture2::BLEND:
+                texEnv->setMode(osg::TexEnv::BLEND);
+                break;
+
+            // SGI's Inventor does not have REPLACE mode, but the Coin 3D library does.
+            // Coin supports REPLACE since 2.2 release, TGS Inventor from 4.0.
+            // Let's convert to the TexEnv anyway.
+            case (SoTexture2::Model)GL_REPLACE: // SoTexture2::REPLACE is the same as GL_REPLACE
+                texEnv->setMode(osg::TexEnv::REPLACE);
+                break;
+        }
+        stateSet->setTextureAttributeAndModes(0,texEnv.get(),osg::StateAttribute::ON);
+    }
+
     SbColor ambient, diffuse, specular, emission;
     float shininess, transparency;
@@ -507 +552 @@
     
     // Set transparency
-    if (transparency > 0)
+    SbBool hasTextureTransparency = FALSE;
+    if (ivTexture) {
+      SbVec2s tmp;
+      int bpp;
+      if (ivTexture->isOfType(SoTexture2::getClassTypeId()))
+        ((SoTexture2*)ivTexture)->image.getValue(tmp, bpp);
+#ifdef __COIN__
+      else
+      if (ivTexture->isOfType(SoVRMLImageTexture::getClassTypeId())) {
+        const SbImage *img = ((SoVRMLImageTexture*)ivTexture)->getImage();
+        if (img) img->getValue(tmp, bpp);
+        else bpp = 0;
+      }
+#endif
+      hasTextureTransparency = bpp==4 || bpp==2;
+    }
+
+    if (transparency > 0 || hasTextureTransparency)
     {
         osg::ref_ptr<osg::BlendFunc> transparency = new osg::BlendFunc;
@@ -622 +684 @@
     }
     
-    // Convert the IV texture to OSG texture if any
-    osg::ref_ptr<osg::Texture2D> texture;
-    if (soTexStack.top())
-    {
-        osg::notify(osg::INFO)<<"Have texture"<<std::endl;
-
-        // Found a corresponding OSG texture object
-        if (ivToOsgTexMap[soTexStack.top()])
-            texture = ivToOsgTexMap[soTexStack.top()];
-        else
-        {
-            // Create a new osg texture
-            texture = convertIVTexToOSGTex(soTexStack.top(), action);
-
-            // Add the new texture to the database
-            ivToOsgTexMap[soTexStack.top()] = texture.get();
-        }
-        
-        stateSet->setTextureAttributeAndModes(0,texture.get(), osg::StateAttribute::ON);
-
-        // Set the texture environment
-        osg::ref_ptr<osg::TexEnv> texEnv = new osg::TexEnv;
-        switch (action->getTextureModel())
-        {
-            case SoTexture2::MODULATE:
-                texEnv->setMode(osg::TexEnv::MODULATE);
-                break;
-            case SoTexture2::DECAL:
-                texEnv->setMode(osg::TexEnv::DECAL);
-                break;
-            case SoTexture2::BLEND:
-                texEnv->setMode(osg::TexEnv::BLEND);
-                break;
-
-#ifdef __COIN__
-// SGI's Inventor does not have REPLACE mode, but the Coin 3D library does.
-// Coin supports REPLACE since 2.2 release, TGS Inventor from 4.0.
-            case SoTexture2::REPLACE:
-                texEnv->setMode(osg::TexEnv::REPLACE);
-                break;
-#endif
-        }
-        stateSet->setTextureAttributeAndModes(0,texEnv.get(),osg::StateAttribute::ON);
-    }
-
     return stateSet;
 }
@@ -697 +714 @@
     if (soNode->isOfType(SoTexture2::getClassTypeId()))
         fileName = ((SoTexture2*)soNode)->filename.getValue().getString();
-#ifdef COIN_BASIC_H
+#ifdef __COIN__
     else
     if (soNode->isOfType(SoVRMLImageTexture::getClassTypeId()))
@@ -734 +751 @@
          
     // Set texture wrap mode
-#ifdef COIN_BASIC_H
+#ifdef __COIN__
     if (soNode->isOfType(SoVRMLImageTexture::getClassTypeId())) {
         // It looks like there is a high probability of bug in Coin (investigated on version 2.4.6).

OpenSceneGraph/trunk/src/osgPlugins/Inventor/README.txt

@@ -1 +1 @@
 ########################################################
+#                                                      #
 # Inventor plugin                                      #
-# Supported file formats (import only):                #
+#                                                      #
+# Supported import formats:                            #
 # - iv (ascii, binary) file format                     #
-# - vrml 1.0                                           #
-# - vrml 2.0 (when using Coin)                         #
+# - VRML 1.0                                           #
+# - VRML 2.0 (when using Coin)                         #
+#                                                      #
+# Supported export formats:                            #
+# - iv format                                          #
+# - VRML 1.0                                           #
+#                                                      #
 ########################################################
 
@@ -10 +17 @@
 The plugin requires one of Inventor libraries:
 
-- Coin (http://www.coin3d.org) - GPL, support of VRML 2.0
+- Coin - GPL, support of VRML 2.0
+  (http://www.coin3d.org) 
 - SGI Inventor - LGPL
+  (http://oss.sgi.com/projects/inventor/)
 - TGS Inventor - commercial
+  (http://www.tgs.com/)
 
 

OpenSceneGraph/trunk/src/osgPlugins/Inventor/ReaderWriterIV.cpp

@@ -11 +11 @@
 #include <Inventor/nodekits/SoNodeKit.h>
 #include <Inventor/nodes/SoSeparator.h>
+#include <Inventor/actions/SoWriteAction.h>
+#include <Inventor/actions/SoCallbackAction.h>
 
 #ifdef COIN_BASIC_H
@@ -18 +20 @@
 #include "ConvertFromInventor.h"
 #include "GroupSoLOD.h"
+#include "ConvertToInventor.h"
+
 
 // Register with Registry to instantiate the inventor reader.
@@ -82 +86 @@
 }
 
+
+osgDB::ReaderWriter::WriteResult
+ReaderWriterIV::writeNode(const osg::Node& node, const std::string& fileName,
+                          const osgDB::ReaderWriter::Options* options) const
+{
+    // accept extension
+    std::string ext = osgDB::getLowerCaseFileExtension(fileName);
+    if (!acceptsExtension(ext)) return WriteResult::FILE_NOT_HANDLED;
+    bool useVRML1 = !isInventorExtension(osgDB::getFileExtension(fileName));
+
+    osg::notify(osg::INFO) << "osgDB::ReaderWriterIV::writeNode() Writing file " 
+                           << fileName.data() << std::endl;
+    
+    // Initialize Inventor
+    SoInteraction::init();
+
+    // Convert OSG graph to Inventor graph
+    ConvertToInventor osg2iv;
+    osg2iv.setVRML1Conversion(useVRML1);
+    (const_cast<osg::Node*>(&node))->accept(osg2iv);
+    SoNode *ivRoot = osg2iv.getIvSceneGraph();
+    if (ivRoot == NULL)
+        return WriteResult::ERROR_IN_WRITING_FILE;
+    ivRoot->ref();
+
+    // Change prefix according to VRML spec:
+    // Node names must not begin with a digit, and must not contain spaces or
+    // control characters, single or double quote characters, backslashes, curly braces,
+    // the sharp (#) character, the plus (+) character or the period character.
+    if (useVRML1)
+      SoBase::setInstancePrefix("_");
+
+    // Write Inventor graph to file
+    SoOutput out;
+    out.setHeaderString((useVRML1) ? "#VRML V1.0 ascii" : "#Inventor V2.1 ascii");
+    if (!out.openFile(fileName.c_str()))
+        return WriteResult::ERROR_IN_WRITING_FILE;
+    SoWriteAction wa(&out);
+    wa.apply(ivRoot);
+    ivRoot->unref();
+
+    return WriteResult::FILE_SAVED;
+}

OpenSceneGraph/trunk/src/osgPlugins/Inventor/ReaderWriterIV.h

@@ -12 +12 @@
         virtual const char* className() const
         { 
-            return "Inventor Reader"; 
+            return "Inventor reader/writer"; 
         }
         
+        bool isInventorExtension(const std::string& extension) const
+        {
+            return osgDB::equalCaseInsensitive(extension, "iv") ? true : false;
+        }
+
         virtual bool acceptsExtension(const std::string& extension) const
         {
-            return osgDB::equalCaseInsensitive(extension, "iv") ? true :
+            return isInventorExtension(extension) ? true :
                    osgDB::equalCaseInsensitive(extension, "wrl") ? true : false;
         }
@@ -24 +29 @@
                                     const osgDB::ReaderWriter::Options *) const;
 
+        virtual WriteResult writeNode(const osg::Node& node, const std::string& filename,
+                                      const osgDB::ReaderWriter::Options* options = NULL) const;
 };