Changeset 9053 for OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertFromInventor.h

Timestamp:

10/25/08 15:17:22 (5 years ago)

Author:

robert

Message:

From Jim Vaughan,

- Matrix transform nodes were stripped out, and the
vertices and normals of each node were
transposed by the modelling matrix. My change preserves
the matrix transform nodes, so that
models can still be articulated by changing the matrices.

- Lights were copied from the COIN scenegraph to the OSG
scenegraph, but they were not associated
with a LightSource? node. My change for this creates a
Group and adds a LightSource? for each Light.

- If VRML textures have names, the name is now copied to

--

Form Robert Osfild, changed SbString? to std::string usage

M Inventor/ConvertFromInventor.h
M Inventor/ConvertFromInventor.cpp

Files:

• OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertFromInventor.h (modified) (4 diffs)

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

@@ -8 +8 @@
 #include <osg/Light>
 #include <Inventor/actions/SoCallbackAction.h>
+#include <Inventor/SbLinear.h>
 #include <vector>
 #include <stack>
@@ -50 +51 @@
         static SoCallbackAction::Response preVRMLImageTexture(void* data,
                                  SoCallbackAction* action, const SoNode* node);
+        static SoCallbackAction::Response preVRMLAppearance(void* data,
+                                 SoCallbackAction* action, const SoNode* node);
+        static SoCallbackAction::Response postVRMLAppearance(void* data,
+                                 SoCallbackAction* action, const SoNode* node);
+        static SoCallbackAction::Response preInfo(void* data,
+                                 SoCallbackAction* action, const SoNode* node);
 
         static void addTriangleCB(void* data, SoCallbackAction* action,
@@ -62 +69 @@
 
     private:
+        SbString transformInfoName;
+        SbName appearanceName;
+        bool inAppearanceWithNoTexture;
 
+        void addMatrixTransform(const std::string& name, SbVec3f axis, float angle, SbVec3f center, SbVec3f trans, SbVec3f scale);
         void addVertex(SoCallbackAction* action, const SoPrimitiveVertex* v, 
                        int index);
@@ -113 +124 @@
 
         osg::ref_ptr<osg::MatrixTransform> _root;///<The root node;
+
+        osg::ref_ptr<osg::Group> lightGroup;
 };