Changeset 344 for trunk

Timestamp:

02/18/10 13:40:04 (2 years ago)

Author:

tholt

Message:

Make AVANGO compile with OSG 2.6

Location:

trunk/avango-osg

Files:

• python/avango/osg/OSGCameraAttachment.cpp (modified) (1 diff)
• src/avango/osg/Camera.cpp (modified) (1 diff)

trunk/avango-osg/python/avango/osg/OSGCameraAttachment.cpp

@@ -62 +62 @@
     .value("DEPTH_BUFFER", ::osg::Camera::DEPTH_BUFFER)
     .value("STENCIL_BUFFER", ::osg::Camera::STENCIL_BUFFER)
+#if OPENSCENEGRAPH_MAJOR_VERSION >= 2 && OPENSCENEGRAPH_MINOR_VERSION >= 8
     .value("PACKED_DEPTH_STENCIL_BUFFER", ::osg::Camera::PACKED_DEPTH_STENCIL_BUFFER)
+#endif
     .value("COLOR_BUFFER", ::osg::Camera::COLOR_BUFFER)
     .value("COLOR_BUFFER0", ::osg::Camera::COLOR_BUFFER0)

trunk/avango-osg/src/avango/osg/Camera.cpp

@@ -199 +199 @@
     a->BufferComponent.setValue(i->first);
     a->InternalFormat.setValue(i->second._internalFormat);
-    if (i->second._texture)
+    if (i->second._texture.valid())
     {
       Texture* texture = dynamic_cast<Texture*>(i->second._texture->getUserData());
       if (texture) a->Texture.setValue(texture);
     }
-    if (i->second._image)
+    if (i->second._image.valid())
     {
       Image* image = dynamic_cast<Image*>(i->second._image->getUserData());