Changeset 8292

Timestamp:

05/08/08 18:48:49

Author:

robert

Message:

From Eric Sokolowsky, "I found one compilation error in OSG 2.4 in the Inventor plugin, where one node (SoTextureCoordinate3) was assumed to be available in all versions of Inventor but is actually only available in Coin. The use of the node is now protected by #ifdef COIN constructs. The attachment is based on OSG 2.4, not SVN."

Files:

• OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertToInventor.cpp (modified) (5 diffs)

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

@@ -68 +68 @@
-#include <Inventor/nodes/SoTexture2.h>
-#include <Inventor/nodes/SoTextureCoordinate2.h>
-#include <Inventor/nodes/SoTextureCoordinate3.h>
-#include <Inventor/nodes/SoTextureCoordinateEnvironment.h>
-#include <Inventor/nodes/SoTransform.h>
@@ -75 +74 @@
-#include <Inventor/fields/SoFields.h>
-#ifdef __COIN__
+#include <Inventor/nodes/SoTextureCoordinate3.h>
-#include <Inventor/nodes/SoTransparencyType.h>
-#include <Inventor/VRMLnodes/SoVRMLBillboard.h>
@@ -1229 +1229 @@
-        }
-      } else
+#ifdef __COIN__
-      if (ivTexCoords->isOfType(SoTextureCoordinate3::getClassTypeId())) {
-        nonIndexedTexCoords = new SoTextureCoordinate3;
@@ -1240 +1241 @@
-        }
-      } else
+#endif  // __COIN__
-        nonIndexedTexCoords = ivTexCoords;
-
@@ -1540 +1542 @@
-        texCoords = new SoTextureCoordinate2;
-        osgArray2ivMField(g->getTexCoordArray(0), ((SoTextureCoordinate2*)texCoords)->point);
-
+
+
+
-        texCoords = new SoTextureCoordinate3;
-        osgArray2ivMField(g->getTexCoordArray(0), ((SoTextureCoordinate3*)texCoords)->point);
-      }
+#endif   // __COIN__
-    }
-    if (texCoords)