Fix InstanceBuilder problems pre OSG 3.6

nywxy · Apr 23, 2020 · 1fabae0 · 1fabae0
1 parent fba7c23
commit 1fabae0
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/osgEarth/InstanceBuilder.cpp b/src/osgEarth/InstanceBuilder.cpp
@@ -34,7 +34,7 @@ using namespace osgEarth;
 
 // OSG in GLCORE mode doesn't set the vertex attribute divisor
 // correctly, so here's a big old hack to get around that.
-
+#if OSG_VERSION_GREATER_OR_EQUAL(3,6,0)
 class InstancedGeometry : public osg::Geometry
 {
 public:
@@ -67,6 +67,7 @@ class InstancedGeometry : public osg::Geometry
 protected:
     std::vector<unsigned int> _divisors;
 };
+#endif
 
 namespace
 {
@@ -131,11 +132,13 @@ namespace
         if (perVertex)
         {
             geom->setVertexAttribArray(index, perVertex, osg::Array::BIND_PER_VERTEX);
+#if OSG_VERSION_GREATER_OR_EQUAL(3,6,0)
             InstancedGeometry* instancedGeom = dynamic_cast<InstancedGeometry*>(geom);
             if (instancedGeom && instancedGeom->getUseVertexArrayObject())
             {
                 instancedGeom->setVertexAttribDivisor(index, 1);
             }
+#endif
             else
             {
                 osg::StateSet* ss = geom->getOrCreateStateSet();
@@ -149,6 +152,7 @@ namespace
     }
 }
 
+#if OSG_VERSION_GREATER_OR_EQUAL(3,6,0)
 InstancedGeometry::InstancedGeometry()
 {
     setUseVertexArrayObject(osgEarth::Registry::capabilities().supportsVertexArrayObjects());
@@ -185,6 +189,7 @@ void InstancedGeometry::compileGLObjects(osg::RenderInfo& renderInfo) const
         state.unbindVertexArrayObject();
     }
 }
+#endif
 
 InstanceBuilder::InstanceBuilder()
 {
@@ -199,7 +204,11 @@ InstanceBuilder::InstanceBuilder()
 
 osg::Geometry* InstanceBuilder::createGeometry()
 {
+#if OSG_VERSION_GREATER_OR_EQUAL(3,6,0)
     return new InstancedGeometry;
+#else
+    return new osg::Geometry;
+#endif
 }
 
 void InstanceBuilder::installInstancing(osg::Geometry* geometry) const