Index: OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertFromInventor.h =================================================================== --- OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertFromInventor.h (revision 9053) +++ OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertFromInventor.h (revision 11032) @@ -11,4 +11,5 @@ #include #include +#include class ConvertFromInventor @@ -18,40 +19,51 @@ ~ConvertFromInventor(); + /// Conversts from IV to OSG scene graph osg::Node* convert(SoNode* rootIVNode); + /** + * Preprocessing restructure the scene for the convertor + * to be able to convert some peculiar scene constructions. + * Resulting scene is geometrically equivalent to the source + * scene. The preprocessing is related to grouping nodes only + * (SoSeparator, SoGroup, SoLOD, SoSwitch,...) and their + * treatment with traversal state. + */ + void preprocess(SoNode *root); + private: - // Callback functions for converting inventor scene graph to osg + // Callback functions for converting inventor scene graph to osg // scene graph + static SoCallbackAction::Response preNode(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response postNode(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response preTransformSeparator(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response postTransformSeparator(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response preLOD(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response postLOD(void* data, + SoCallbackAction* action, const SoNode* node); static SoCallbackAction::Response preShape(void* data, SoCallbackAction* action, const SoNode* node); static SoCallbackAction::Response postShape(void* data, SoCallbackAction* action, const SoNode* node); - static SoCallbackAction::Response preGroup(void* data, - SoCallbackAction* action, const SoNode* node); - static SoCallbackAction::Response postGroup(void* data, - SoCallbackAction* action, const SoNode* node); - static SoCallbackAction::Response preTexture(void* data, - SoCallbackAction* action, const SoNode* node); - static SoCallbackAction::Response preLight(void* data, - SoCallbackAction* action, const SoNode* node); - static SoCallbackAction::Response preRotor(void* data, - SoCallbackAction* action, const SoNode* node); - static SoCallbackAction::Response prePendulum(void* data, - SoCallbackAction* action, const SoNode* node); - static SoCallbackAction::Response preShuttle(void* data, - SoCallbackAction* action, const SoNode* node); - static SoCallbackAction::Response postLOD(void* data, - SoCallbackAction* action, const SoNode* node); - ///Callback for VRMLImageTexture - ///\param data The pointer to ConvertFromInventor object - ///\param action The action handling class - ///\param node The current VRMLImageTexture node - 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, + static SoCallbackAction::Response postTexture(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response preLight(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response preEnvironment(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response preShaderProgram(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response preRotor(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response prePendulum(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response preShuttle(void* data, SoCallbackAction* action, const SoNode* node); static SoCallbackAction::Response preInfo(void* data, @@ -68,16 +80,21 @@ const SoPrimitiveVertex *v0); + static SoCallbackAction::Response restructure(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response restructurePreNode(void* data, + SoCallbackAction* action, const SoNode* node); + static SoCallbackAction::Response restructurePostNode(void* data, + SoCallbackAction* action, const SoNode* node); + 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, + + void addVertex(SoCallbackAction* action, const SoPrimitiveVertex* v, int index); osg::ref_ptr getStateSet(SoCallbackAction* action); - osg::Texture2D* convertIVTexToOSGTex(const SoNode* soNode, + osg::Texture2D* convertIVTexToOSGTex(const SoNode* soNode, SoCallbackAction* action); @@ -100,5 +117,5 @@ std::vector textureCoords; - // Num of primitive and primitive type + // Num of primitive and primitive type int numPrimitives; osg::PrimitiveSet::Mode primitiveType; @@ -108,22 +125,102 @@ VertexOrder vertexOrder; - // Stack of group nodes (used to build the scene graph) - std::stack groupStack; - // Stack of texture nodes (used for attaching the right texture to the - // geosets). Supported types are SoTexture2 and SoVRMLImageTexture for now. - std::stack soTexStack; - // Mapping from SoTexture2 and SoVRMLImageTexture to already converted // osg::Texture2D - avoids duplication of same texture objects std::map ivToOsgTexMap; - // Stack to maintain the list of lights at each level of the - // scenegraph - typedef std::vector LightList; - std::stack lightStack; - osg::ref_ptr _root;/// lightGroup; + /** + * IvStateItem aids lack of some state retrieval methods + * of SoCallbackAction. State is maintained in stack + * manner separately from Open Inventor. + */ + class IvStateItem { + public: + + // Pop flags and node caused the push + enum Flags { + DEFAULT_FLAGS = 0, + MULTI_POP = 1, + KEEP_CHILDREN_ORDER = 2, + APPEND_AT_PUSH = 4, + UPDATE_STATE = 8, + UPDATE_STATE_EXCEPT_TRANSFORM = 0x10 // this has the same + // effect as UPDATE_STATE at the present time + }; + int flags; + const SoNode *pushInitiator; + + // Tracking of model transformation + SbMatrix inheritedTransformation; + SbMatrix lastUsedTransformation; + + // Active texture node (used for attaching the right texture to the + // geosets). Supported types are SoTexture2 and SoVRMLImageTexture for now. + // No multitexturing yet. + const SoNode* inheritedTexture; + const SoNode* currentTexture; + + // List of active lights + std::vector > inheritedLights; + std::vector > currentLights; + + // Active OpenGL glProgram and associated shaders + osg::ref_ptr inheritedGLProgram; + osg::ref_ptr currentGLProgram; + + // Ambient light (of SoEnvironment) + SbColor inheritedAmbientLight; + SbColor currentAmbientLight; + + // Generated OSG graph + osg::ref_ptr osgStateRoot; + + // Extra variables + const SoNode *keepChildrenOrderParent; + + IvStateItem(const SoNode *initiator, osg::Group *root = NULL) : + flags(IvStateItem::DEFAULT_FLAGS), + pushInitiator(initiator), + inheritedTransformation(SbMatrix::identity()), + lastUsedTransformation(SbMatrix::identity()), + inheritedTexture(NULL), + currentTexture(NULL), + inheritedLights(), + currentLights(), + inheritedGLProgram(NULL), + currentGLProgram(NULL), + inheritedAmbientLight(SbColor(0.2f,0.2f,0.2f)), + currentAmbientLight(SbColor(0.2f,0.2f,0.2f)), + osgStateRoot(root ? root : new osg::Group) {} + + IvStateItem(const IvStateItem& i, const SoCallbackAction *action, + const SoNode *initiator, const int f, + osg::Group *root) : + flags(f), + pushInitiator(initiator), + inheritedTransformation(action->getModelMatrix()), + lastUsedTransformation(action->getModelMatrix()), + inheritedTexture(i.currentTexture), + currentTexture(i.currentTexture), + inheritedLights(i.currentLights), + currentLights(i.currentLights), + inheritedGLProgram(i.currentGLProgram), + currentGLProgram(i.currentGLProgram), + inheritedAmbientLight(i.inheritedAmbientLight), + currentAmbientLight(i.currentAmbientLight), + osgStateRoot(root) {} + }; + + /// State stack for Inventor scene traversal + std::stack ivStateStack; + + void ivPushState(const SoCallbackAction *action, + const SoNode *initiator, const int flags = IvStateItem::DEFAULT_FLAGS, + osg::Group *root = new osg::Group); + void ivPopState(const SoCallbackAction *action, const SoNode *initator); + + void appendNode(osg::Node *n, const SoCallbackAction *action); + };