Changeset 33

Timestamp:

03/29/07 16:51:07 (2 years ago)

Author:

astraw

Message:

runs on OSG 1.2

Files:

• trunk/pyosg/osg/CameraNode.cpp (modified) (1 diff)
• trunk/pyosg/osg/Vec4ub.cpp (modified) (1 diff)
• trunk/pyosg/osg/osg.cpp (modified) (2 diffs)
• trunk/pyosg/osgProducer/osgProducer.cpp (modified) (2 diffs)

trunk/pyosg/osg/CameraNode.cpp

@@ -9 +9 @@
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+#include <osg/Version>
-#if (OSG_VERSION_MAJOR>=1)
-#include <boost/python/module.hpp>

trunk/pyosg/osg/Vec4ub.cpp

@@ -9 +9 @@
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
+#include <osg/Version>
-#if (OSG_VERSION_MAJOR>=1)
-#include <boost/python/class.hpp>

trunk/pyosg/osg/osg.cpp

@@ -78 +78 @@
-    void init_Vec3d();
-    void init_Vec4();
+#if (OSG_VERSION_MAJOR>=1)
-    void init_Vec4ub();
+#endif
-    void init_Quat();
-//    void init_UByte4();
@@ -148 +150 @@
-    void init_CollectOccludersVisitor();
-    void init_PointSprite();
+#if (OSG_VERSION_MAJOR>=1)
-    void init_CameraNode();
+#endif
-    void init_Shader();
-    void init_Program();

trunk/pyosg/osgProducer/osgProducer.cpp

@@ -22 +22 @@
-void init_OsgSceneHandler();
-void init_Viewer();
+#if ((OSG_VERSION_MAJOR==1) && (OSG_VERSION_MINOR < 1))
-void init_EventAdapter();
+#endif
-
-void __init_osgProducer()
@@ -33 +35 @@
-    init_OsgCameraGroup();
-    init_Viewer();
+#if ((OSG_VERSION_MAJOR==1) && (OSG_VERSION_MINOR < 1))
-    init_EventAdapter();
+#endif
-}
-}