Updates for osgdem. Including new read/writeHeightField() methods.

2003-10-29 11:11:17 +00:00
parent b9775a1a3e
commit f1c4dc3b0d
17 changed files with 557 additions and 63 deletions
--- a/src/osg/Geometry.cpp
+++ b/src/osg/Geometry.cpp
@@ -765,7 +765,6 @@ void Geometry::drawImplementation(State& state) const
    unsigned int colorIndex = 0;
    unsigned int secondaryColorIndex = 0;
    unsigned int fogCoordIndex = 0;
-    unsigned int vertexAttribIndex = 0;

 #if USE_DEFAULT_NORMAL
    // if no values are defined for normal and color provide some defaults...
--- a/src/osg/Shape.cpp
+++ b/src/osg/Shape.cpp
@@ -15,7 +15,7 @@

 using namespace osg;

-void HeightField::allocateGrid(unsigned int numColumns,unsigned int numRows)
+void HeightField::allocate(unsigned int numColumns,unsigned int numRows)
 {
    if (_columns!=numColumns || _rows!=numRows)
    {