Fixes for headless mode.

[simgear.git] / simgear / scene / tgdb / ShaderGeometry.cxx

diff --git a/simgear/scene/tgdb/ShaderGeometry.cxx b/simgear/scene/tgdb/ShaderGeometry.cxx
index 265d90e7516d23d39218a728dd8fe72186e34122..36a3093471cb628e5e603c29ef4cec8861ba397f 100644 (file)
--- a/simgear/scene/tgdb/ShaderGeometry.cxx
+++ b/simgear/scene/tgdb/ShaderGeometry.cxx
@@ -32,14 +32,15 @@ using namespace osgDB;
 
 namespace simgear
 {
-void ShaderGeometry::addTree(const TreeBin::Tree& t)
+void ShaderGeometry::addObject(const Vec3& position, float scale,
+                               int texture_index)
 {
     if (!_posScaleArray.valid()) {
         _posScaleArray = new Vec4Array();
         _vertexAttribArray = new FloatArray();
     }
-    _posScaleArray->push_back(Vec4(t.position.osg(), t.scale));
-    _vertexAttribArray->push_back((float)t.texture_index / varieties);
+    _posScaleArray->push_back(Vec4(position, scale));
+    _vertexAttribArray->push_back((float)texture_index / varieties);
     dirtyBound();
 }
 
@@ -66,7 +67,7 @@ BoundingBox ShaderGeometry::computeBound() const
     const Vec4Array* posScales = _posScaleArray.get();
     if (!posScales)
         return bb;
-    size_t numPosScales = posScales->size();
+//    size_t numPosScales = posScales->size();
     for (Vec4Array::const_iterator iter = _posScaleArray->begin(),
              e = _posScaleArray->end();
          iter != e;
@@ -94,7 +95,7 @@ bool ShaderGeometry_readLocalData(Object& obj, Input& fr)
             geom._geometry = drawable;
         }
     }
-    int capacity = 0;
+//    int capacity = 0;
     if (fr.matchSequence("posScale %i {")) {
         int entry = fr[1].getNoNestedBrackets();
         int capacity;