Changeset 45

Timestamp:

Dec 13, 2004, 1:17:13 AM (20 years ago)

Author:

darran

Message:

Major changes as per Robert's suggestions

• removed all culling from swwreader
• DrawElements? for primitive set improves speed
• per vertex alpha (vec4 color)

Also,

• initial view angle slightly above plane

Location:

Swollen

Files:

• INSTALL (modified) (3 diffs)
• include/swwreader.h (modified) (4 diffs)
• swollen/bedslope.cpp (modified) (3 diffs)
• swollen/bedslope.h (modified) (2 diffs)
• swollen/main.cpp (modified) (8 diffs)
• swollen/watersurface.cpp (modified) (7 diffs)
• swollen/watersurface.h (modified) (2 diffs)
• swwreader/swwreader.cpp (modified) (6 diffs)

Swollen/INSTALL

@@ -7 +7 @@
    OpenSceneGraph, OpenThreads, and Producer
             - http://openscenegraph.sourceforge.net
-            - available as a bundle, OSG_OP_OT-0.9.7-3
-            - this itself has 3rd party dependencies available 
-              as a downloadable bundle
+            - available as a bundle, OSG_OP_OT-0.9.8
+            - OpenSceneGraph has 3rd party dependencies, these are
+              available as a downloadable .zip for Windows. 
             - ensure you can run the examples that come with OSG
               prior to building the viewer
@@ -39 +39 @@
                     /lib
                     /include
+                 /3rdParty (Windows only)
 
    NETCDF_DIR :  root of NetCDF binary package with needed subdirs 
@@ -47 +48 @@
 
 
-3) For Visual Studio .NET, 
-
-    (i) Open the solution in visualstudio subdir.
-   (ii) Open Menu Tools|Options|Projects|VC++Directories and add a
-        path to $(NETCDF_DIR)/bin and $(OSG_ROOT)/bin.
-  (iii) Build the solution
+3) Compilation
 
 
-4) For Mac OSX
+   WINDOWS
 
-    Run make in swwreader and swollen directories.
+      (i) Open the solution in visualstudio subdir.
+     (ii) Open Menu Tools|Options|Projects|VC++Directories and add a
+          path to $(NETCDF_DIR)/bin and $(OSG_ROOT)/bin.
+     (iii) Build the solution
 
 
-5) For Linux
+   Mac OSX
 
-    Makefiles not yet written
+          Run make in top-level OSG_ROOT directory.
 
+
+   Linux
+
+          Makefiles not yet written
+
+
+
+4) The binary swollen (swollen.exe on Windows) lives in the distribution's
+   bin directory.  Test the build with any of the sample datasets in the
+   distribution's data subdirectory, e.g., 
+         "cd bin; ./swollen ../data/laminar.sww"
+
+
+

Swollen/include/swwreader.h

@@ -66 +66 @@
     virtual osg::ref_ptr<osg::Vec3Array> getBedslopeVertexArray() {return _bedslopevertices;}
     virtual osg::ref_ptr<osg::Vec3Array> getBedslopeNormalArray() {return _bedslopenormals;}
-    virtual osg::ref_ptr<osg::UIntArray> getBedslopeIndexArray() {return _bedslopeindices;}
+    virtual osg::ref_ptr<osg::DrawElementsUShort> getBedslopeIndexArray() {return _bedslopeindices;}
     virtual osg::ref_ptr<osg::Vec3Array> getBedslopeCentroidArray() {return _bedslopecentroids;}
+    virtual osg::ref_ptr<osg::Vec2Array> getBedslopeTextureCoords() {return _bedslopetexcoords;}
 
     // stage
     virtual osg::ref_ptr<osg::Vec3Array> getStageVertexArray(unsigned int index);
-    virtual osg::ref_ptr<osg::UIntArray> getStageIndexArray() {return _stageindices;}
     virtual osg::ref_ptr<osg::Vec3Array> getStageVertexNormalArray() {return _stagevertexnormals;}
-    virtual osg::ref_ptr<osg::Vec3Array> getStagePrimitiveNormalArray() {return _stageprimitivenormals;}
     virtual osg::ref_ptr<osg::Vec3Array> getStageCentroidsArray() {return _stagecentroids;}
     virtual osg::ref_ptr<osg::Vec4Array> getStageColorArray() {return _stagecolors;}
@@ -81 +80 @@
     virtual size_t getNumberOfVertices() {return _npoints;}
     virtual unsigned int getNumberOfTimesteps() {return _ntimesteps;}
-    virtual int getNumberOfBedslopeIndices() {return _bedslopeindices->size();}
-    virtual int getNumberOfStageIndices() {return _stageindices->size();}
+    //virtual int getNumberOfBedslopeIndices() {return _bedslopeindices->size();}
+    //virtual int getNumberOfStageIndices() {return _stageindices->size();}
 
     // stage culling
@@ -122 +121 @@
     osg::ref_ptr<osg::Vec3Array> _bedslopevertices;
     osg::ref_ptr<osg::Vec3Array> _bedslopenormals;
-    osg::ref_ptr<osg::UIntArray> _bedslopeindices;
+    osg::ref_ptr<osg::DrawElementsUShort> _bedslopeindices;
     osg::ref_ptr<osg::Vec3Array> _bedslopecentroids;
+    osg::ref_ptr<osg::Vec2Array> _bedslopetexcoords;
 
     // geometry that changes per timestep
     osg::ref_ptr<osg::Vec3Array> _stagevertices;
     osg::ref_ptr<osg::Vec3Array> _stageprimitivenormals;
-    osg::ref_ptr<osg::UIntArray> _stageindices;
     osg::ref_ptr<osg::Vec3Array> _stagevertexnormals;
     osg::ref_ptr<osg::Vec3Array> _stagecentroids;
@@ -134 +133 @@
 
     // bedslope vertex scale and shift factors (for normalizing to unit cube)
-    float _xscale, _yscale, _zscale;
+    float _xscale, _yscale, _zscale, _scale;
     float _xoffset, _yoffset, _zoffset;
     float _xcenter, _ycenter, _zcenter;

Swollen/swollen/bedslope.cpp

@@ -16 +16 @@
 {
 
+    // persistent
+    _sww = sww;
+
     // bedslope geometry as triangles with shared vertices
     _geom = new osg::Geometry;
 
     // geometry from sww file
-    osg::Vec3Array* vertices = sww->getBedslopeVertexArray().get();
-    osg::UIntArray* indices = sww->getBedslopeIndexArray().get();
-    osg::Vec3Array* normals = sww->getBedslopeNormalArray().get();
-    unsigned int nindices = sww->getNumberOfBedslopeIndices();
+    osg::Vec3Array* vertices = _sww->getBedslopeVertexArray().get();
+    osg::Vec3Array* normals = _sww->getBedslopeNormalArray().get();
 
     _geom->setUseDisplayList(true);
     _geom->setVertexArray( vertices );
-    _geom->setVertexIndices( indices );
-    _geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES, 0, nindices ));
+    _geom->addPrimitiveSet( _sww->getBedslopeIndexArray().get() );
     _geom->setNormalArray( normals );
     _geom->setNormalBinding( osg::Geometry::BIND_PER_PRIMITIVE );
-
+    _geom->setTexCoordArray( 0, _sww->getBedslopeTextureCoords().get() );
 
     // geometry bounding box
     osg::BoundingBox bbox = _geom->getBound();
-
-    // bedslope texture coords scaled to range [0,1]
-    osg::Vec2Array* texcoords = new osg::Vec2Array;
-    osg::Vec3 v;
-    float xrange = bbox.xMax() - bbox.xMin();
-    float yrange = bbox.yMax() - bbox.yMin();
-    for( unsigned int i=0; i < vertices->size(); i++ )
-    {
-        v = vertices->at(i);
-        texcoords->push_back( osg::Vec2( (v.x()-bbox.xMin())/xrange, (v.y()-bbox.yMin())/yrange) );
-    }
-    _geom->setTexCoordArray( 0, texcoords );
-    _geom->setTexCoordIndices( 0, indices );
 
     // bedslope texture
@@ -55 +42 @@
     texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
     texture->setImage(osgDB::readImageFile("bedslope.jpg"));
-
-
-    // bedslope colour
-    //osg::UByte4Array* colors = new osg::UByte4Array;  
-    //colors->push_back(osg::UByte4(DEF_BEDSLOPE_COLOUR));
-    //_geom->setColorArray(colors);
-    //_geom->setColorBinding(osg::Geometry::BIND_OVERALL);
-
-    // material properties
-    _material = new osg::Material;
-    _material->setDiffuse(osg::Material::FRONT, osg::Vec4(DEF_BEDSLOPE_COLOUR));
-    _material->setSpecular(osg::Material::FRONT, osg::Vec4(1,0,0,1));
-    _material->setShininess(osg::Material::FRONT, 128);
-
     
     _stateset = new osg::StateSet;
@@ -74 +47 @@
     _stateset->setMode( GL_BLEND, osg::StateAttribute::ON );
     _stateset->setMode( GL_LIGHTING, osg::StateAttribute::ON );
-    _stateset->setAttribute(_material);
-
-
-
 
     _node = new osg::Geode;

Swollen/swollen/bedslope.h

@@ -16 +16 @@
 #include <SWWReader.h>
 #include <osg/Geode>
-#include <osg/Material>
 #include <osg/StateAttribute>
 
@@ -36 +35 @@
     osg::Geometry* _geom;
     osg::StateSet* _stateset;
-    osg::Material* _material;
     virtual ~BedSlope(){;}
 

Swollen/swollen/main.cpp

@@ -36 +36 @@
     // set up the usage document, in case we need to print out how to use this program.
     arguments.getApplicationUsage()->setDescription(arguments.getApplicationName());
-    arguments.getApplicationUsage()->setCommandLineUsage("swwviewer [options] swwfile ...");
+    arguments.getApplicationUsage()->setCommandLineUsage("swollen [options] swwfile ...");
     arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
     arguments.getApplicationUsage()->addCommandLineOption("-scale <s>","Vertical scale factor");
+    arguments.getApplicationUsage()->addCommandLineOption("-tps <rate>","timesteps per second");
 
     // construct the viewer.
@@ -46 +47 @@
     viewer.setUpViewer(osgProducer::Viewer::STANDARD_SETTINGS);
     viewer.setClearColor(osg::Vec4(DEF_BACKGROUND_COLOUR));
-    //viewer.getCamera(0)->getRenderSurface()->setWindowRectangle(550,100,640,480);
+    viewer.getCamera(0)->getRenderSurface()->setWindowRectangle(200,100,800,600);
 
 
@@ -73 +74 @@
     if (sww->isValid() == false)
     {
-        std::cout << "Could not load " << swwfile << " ... quitting" << std::endl;
+        std::cout << "Unable to load " << swwfile << " ... is this really an .sww file?" << std::endl;
         return 1;
     }
@@ -85 +86 @@
 
 
-
     // root node
     osg::Group* rootnode = new osg::Group;
@@ -105 +105 @@
     HeadsUpDisplay* hud = new HeadsUpDisplay();
     hud->setTitle("pyVolution SWW Viewer");
+
 
     // Lighting
@@ -110 +111 @@
     spotlight->setPosition( osg::Vec3(0,0,2) );  // overhead
     spotlight->setSpotAngle( 45.0 );
+
 
     // scenegraph hierarchy
@@ -143 +145 @@
     KeyboardEventHandler* event_handler = new KeyboardEventHandler(sww->getNumberOfTimesteps(), tps);
     viewer.getEventHandlerList().push_front(event_handler);
+
  
     // create the windows and run the threads.
@@ -148 +151 @@
 
 
-    // Initial camera position
+    // initial camera position
     viewer.getTrackball()->setNode( rootnode );
     viewer.getTrackball()->setAutoComputeHomePosition(false);
     viewer.getTrackball()->setHomePosition(
-        osg::Vec3d(0,-4,0),  // camera location
+        osg::Vec3d(0,-4,1),    // camera location
         osg::Vec3d(0,0,0),     // camera target
         osg::Vec3d(0,0,1) );   // camera up vector

Swollen/swollen/watersurface.cpp

@@ -34 +34 @@
     _geom = new osg::Geometry;
     _stateset = new osg::StateSet;
-    _material = new osg::Material;
     _zoffset = DEF_ZOFFSET;
 
@@ -41 +40 @@
     _node->addDrawable(_geom);
     _node->setStateSet(_stateset);
-    //_stateset->setAttribute(_material);
 
     _geom->setUseDisplayList(true);
@@ -47 +45 @@
     // initial geometry
     setTimeStep(0);
-
-    //_material->setDiffuse(osg::Material::FRONT, osg::Vec4(DEF_WATER_COLOUR));
-    //_material->setSpecular(osg::Material::FRONT, osg::Vec4(1,1,1,1));
-    //_material->setTransparency(osg::Material::FRONT_AND_BACK, DEF_WATER_TRANSPARENCY);
-    //_material->setShininess(osg::Material::FRONT, 128);
 
     // environment map
@@ -59 +52 @@
     texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
     texture->setImage(osgDB::readImageFile("envmap.jpg"));
-    //_stateset->setTextureAttributeAndModes( 1, texture, osg::StateAttribute::ON );
+    _stateset->setTextureAttributeAndModes( 1, texture, osg::StateAttribute::ON );
     _stateset->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
 
     // surface transparency
-    //osg::BlendFunc* osgBlendFunc = new osg::BlendFunc();
-    //osgBlendFunc->setFunction(osg::BlendFunc::SRC_ALPHA, osg::BlendFunc::ONE_MINUS_SRC_ALPHA);
-    //_stateset->setAttribute(osgBlendFunc);
-    //_stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+    osg::BlendFunc* osgBlendFunc = new osg::BlendFunc();
+    osgBlendFunc->setFunction(osg::BlendFunc::SRC_ALPHA, osg::BlendFunc::ONE_MINUS_SRC_ALPHA);
+    _stateset->setAttribute(osgBlendFunc);
+    _stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
 
     osg::AlphaFunc* alphaFunc = new osg::AlphaFunc;
@@ -83 +76 @@
     texenv->setMode( osg::TexEnv::DECAL );
     texenv->setColor( osg::Vec4(0.6f,0.6f,0.6f,0.2f) );
-    //_stateset->setTextureAttributeAndModes( 1, texgen, osg::StateAttribute::ON );
-    //_stateset->setTextureAttribute( 1, texenv );
+    _stateset->setTextureAttributeAndModes( 1, texgen, osg::StateAttribute::ON );
+    _stateset->setTextureAttribute( 1, texenv );
 }
 
@@ -103 +96 @@
     // local reference to raw height field data
     osg::ref_ptr<osg::Vec3Array> vertices = _sww->getStageVertexArray(ts);
-    osg::ref_ptr<osg::UIntArray> indices = _sww->getStageIndexArray();
-    osg::ref_ptr<osg::Vec3Array> normals = _sww->getStagePrimitiveNormalArray();
     osg::ref_ptr<osg::Vec3Array> vertexnormals = _sww->getStageVertexNormalArray();
     osg::ref_ptr<osg::Vec4Array> colors = _sww->getStageColorArray();
@@ -118 +109 @@
     // geometry
     _geom->setVertexArray( vertices.get() );
-    _geom->setVertexIndices( indices.get() );
-    _geom->addPrimitiveSet( new osg::DrawArrays(
-           osg::PrimitiveSet::TRIANGLES, 0, _sww->getNumberOfStageIndices() ) );
+    _geom->addPrimitiveSet( _sww->getBedslopeIndexArray().get() );
 
     // per vertex colors (using only alpha) 
     _geom->setColorArray( colors.get() );
-    _geom->setColorIndices( colorindices );
     _geom->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
 
     // normals
     _geom->setNormalArray( vertexnormals.get() );
-    _geom->setNormalIndices( indices.get() );
     _geom->setNormalBinding(osg::Geometry::BIND_PER_VERTEX);
 

Swollen/swollen/watersurface.h

@@ -15 +15 @@
 #include <SWWReader.h>
 #include <osg/Geode>
-#include <osg/Material>
 #include <osg/StateAttribute>
 
@@ -38 +37 @@
     osg::Geometry* _geom;
     osg::StateSet* _stateset;
-    osg::Material* _material;
     virtual ~WaterSurface();
     float _zoffset;

Swollen/swwreader/swwreader.cpp

@@ -121 +121 @@
     xrange = xmax - xmin;
     yrange = ymax - ymin;
+    zrange = zmax - zmin;
     aspect_ratio = xrange/yrange;
+    _xscale = 1.0 / xrange;
+    _yscale = 1.0 / yrange;
+    _zscale = (zmax == 0.0) ? 1.0 : 1.0 / zrange;
+    _xoffset = xmin;
+    _yoffset = ymin;
+    _zoffset = zmin;
+    _xcenter = 0.5;
+    _ycenter = 0.5;
+    _zcenter = 0.0;
+
     if( aspect_ratio > 1.0 )
     {
-            _xscale = 1.0 / xrange;
-            _xoffset = xmin;
-            _xcenter = 0.5;
-
-            _yscale = _xscale;
-            _yoffset = ymin;
-            _ycenter = 0.5 / aspect_ratio;
-
-            _zscale = _xscale;
-            _zoffset = zmin;
-            _zcenter = 0.0;
+      _scale = 1.0 / xrange;
+      _ycenter /= aspect_ratio;
     }
     else
     {
-            _yscale = 1.0 / yrange;
-            _yoffset = ymin;
-            _ycenter = 0.5;
-
-            _xscale = _yscale;
-            _xoffset = xmin;
-            _xcenter = 0.5 / aspect_ratio;
-
-            _zscale = _yscale;
-            _zoffset = zmin;
-            _zcenter = 0.0;
+      _scale = 1.0 / yrange;
+      _xcenter /= aspect_ratio;
     }
 
@@ -180 +173 @@
     }
 
-    // load bedslope vertex array, shifting and scaling vertices to unit cube
+    // bedslope vertex array, shifting and scaling vertices to unit cube
     // centred about the origin
     _bedslopevertices = new osg::Vec3Array;
     for (iv=0; iv < _npoints; iv++)
-      _bedslopevertices->push_back( osg::Vec3( (_px[iv]-_xoffset)*_xscale - _xcenter, 
-                                               (_py[iv]-_yoffset)*_yscale - _ycenter, 
-                                               (_pz[iv]-_zoffset)*_zscale - _zcenter) );
-
-    // load bedslope index array, pvolumes array indexes into x, y and z
-    _bedslopeindices = new osg::UIntArray;
+      _bedslopevertices->push_back( osg::Vec3( (_px[iv]-_xoffset)*_scale - _xcenter, 
+                                               (_py[iv]-_yoffset)*_scale - _ycenter, 
+                                               (_pz[iv]-_zoffset)*_scale - _zcenter) );
+
+    // bedslope index array, pvolumes array indexes into x, y and z
+    _bedslopeindices = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, _nvolumes*_nvertices);
     for (iv=0; iv < _nvolumes*_nvertices; iv++)
-        _bedslopeindices->push_back( _pvolumes[iv] );
+      (*_bedslopeindices)[iv] = _pvolumes[iv];
+
+
+    // bedslope texture coords based on (x,y) locations scaled by extents into range [0,1]
+    _bedslopetexcoords = new osg::Vec2Array;
+    for( iv=0; iv < _npoints; iv++ )
+      _bedslopetexcoords->push_back( osg::Vec2( (_px[iv]-_xoffset)*_xscale, (_py[iv]-_yoffset)*_yscale ) );
+
+
 
     // calculate bedslope primitive normal and centroid arrays
@@ -246 +247 @@
     _stagevertices = new osg::Vec3Array;
     for (iv=0; iv < _npoints; iv++)
-        _stagevertices->push_back( osg::Vec3(
-                                             (_px[iv]-_xoffset)*_xscale - _xcenter, 
-                                             (_py[iv]-_yoffset)*_yscale - _ycenter, 
-                                             (_pstage[iv]-_zoffset)*_zscale - _zcenter) );
-
-    // stage index and per primitive normal and centroid arrays
+        _stagevertices->push_back( osg::Vec3( (_px[iv]-_xoffset)*_scale - _xcenter, 
+                                              (_py[iv]-_yoffset)*_scale - _ycenter, 
+                                              (_pstage[iv]-_zoffset)*_scale - _zcenter) );
+
+
+    // stage index, per primitive normal and centroid arrays
     _stageprimitivenormals = new osg::Vec3Array;
     _stagecentroids = new osg::Vec3Array;
-    _stageindices = new osg::UIntArray;
-    _stagecolors = new osg::Vec4Array;
     osg::Vec3 v1b, v2b, v3b;
     osg::Vec3 v1s, v2s, v3s;
     osg::Vec3 side1, side2, nrm;
     unsigned int v1index, v2index, v3index;
-    osg::ref_ptr<osg::UIntArray> culledlist = new osg::UIntArray;
-    std::vector<triangle_list> stageconnectivity = std::vector<triangle_list>(_npoints);
 
     // over all stage triangles
-    unsigned int nonculled = 0;
-    float alphamin = 1.0;
-    float alphamax = 0.0;
     for (iv=0; iv < _nvolumes; iv++){
 
@@ -280 +274 @@
         v3b = _bedslopevertices->at(v3index);
 
-        // shallow water depth culling test
-        if( (_cullsetting == CULLALL || _cullsetting == CULLNEARZERO) && 
-            ((v1s.z()+v2s.z()+v3s.z())/3.0 - _bedslopecentroids->at(iv).z()) < _cullnearzero )
-        {
-            culledlist->push_back( iv );
-            continue;
-        }
-
-        // steep bedslope culling test
-        if( _cullsetting == CULLALL || _cullsetting == CULLSTEEPANGLE ) 
-        {
-            if( _bedslopenormals->at(iv) * osg::Vec3f(0,0,1) < _cullsteepangle )
-            {
-                culledlist->push_back( iv );
-                continue;
-            }
-        }
-
-        // pass through, current triangle is visible (not culled)
-        _stageindices->push_back( v1index );
-        _stageindices->push_back( v2index );
-        _stageindices->push_back( v3index );
-
-        // alpha value based on stage-bedslope height difference
-        float alpha1 = ( v1s.z()-v1b.z() )*10.0;
-        float alpha2 = ( v2s.z()-v2b.z() )*10.0;
-        float alpha3 = ( v3s.z()-v3b.z() )*10.0;
-        alphamax = MAX( alphamax, alpha1 );
-        alphamax = MAX( alphamax, alpha2 );
-        alphamax = MAX( alphamax, alpha3 );
-        alphamin = MIN( alphamin, alpha1 );
-        alphamin = MIN( alphamin, alpha2 );
-        alphamin = MIN( alphamin, alpha3 );
-
-        osg::Vec4 color1, color2, color3;
-        color1.set( alpha1,alpha1,alpha1, 1.0 );
-        color2.set( alpha2,alpha2,alpha2, 1.0 );
-        color3.set( alpha3,alpha3,alpha3, 1.0 );
-        //color1.set( alpha1,alpha1,alpha1, alpha1 );
-        //color2.set( alpha2,alpha2,alpha2, alpha2 );
-        //color3.set( alpha3,alpha3,alpha3, alpha3 );
-        _stagecolors->push_back( color1 );
-        _stagecolors->push_back( color2 );
-        _stagecolors->push_back( color3 );
-
         // current triangle primitive normal
         side1 = v2s - v1s;
@@ -331 +280 @@
         nrm.normalize();
 
-        // stage triangle connectivity, a list (indexed by vertex number) 
-        // of lists (indices of non-culled triangles sharing this vertex)
-        stageconnectivity.at(v1index).push_back(nonculled);
-        stageconnectivity.at(v2index).push_back(nonculled);
-        stageconnectivity.at(v3index).push_back(nonculled);
-
-        // store centroid and primitive normal (both needed to visualize vectors)
+        // store centroid and primitive normal
         _stagecentroids->push_back( (v1s+v2s+v3s)/3.0 );
         _stageprimitivenormals->push_back( nrm );
 
-        // non-culled triangle count
-        nonculled++;
-
-    }
-
-    std::cout << "index: " << index << "    AlphaMax: " << alphamax << std::endl;
-    std::cout << "index: " << index << "    AlphaMin: " << alphamin << std::endl;
-
-    // per-vertex normals
+    }
+
+
+    float alpha;
+    _stagecolors = new osg::Vec4Array;
+    for (iv=0; iv < _npoints; iv++)
+    {
+      // FIXME: needs to be scaled appropriately
+        alpha = ( _stagevertices->at(iv).z() - _bedslopevertices->at(iv).z() ) * 100.0;
+        _stagecolors->push_back( osg::Vec4( 1.0, 1.0, 1.0, alpha ) );
+    }
+
+
+    // per-vertex normals calculated as average of primitive normals
+    // from contributing triangles
     _stagevertexnormals = new osg::Vec3Array;
     int num_shared_triangles, triangle_index;
@@ -355 +304 @@
     {
         nrm.set(0,0,0);
-        num_shared_triangles = stageconnectivity.at(iv).size();
+        num_shared_triangles = _connectivity.at(iv).size();
         for (int i=0; i<num_shared_triangles; i++ )
         {
-            triangle_index = stageconnectivity.at(iv).at(i);
-
-            // summing of contributing primitive normals
+            triangle_index = _connectivity.at(iv).at(i);
             nrm += _stageprimitivenormals->at(triangle_index);
         }
 
-        // FIXME: Length of this list has to match vertex list length.
-        // We have vertices and normals that aren't being referenced.
-        if( 1 || num_shared_triangles )  // avoid vertices belonging only to culled triangles
-        {
-            nrm = nrm / num_shared_triangles;  // average
-            nrm.normalize();
-            _stagevertexnormals->push_back(nrm);
-        }
+        nrm = nrm / num_shared_triangles;  // average
+        nrm.normalize();
+        _stagevertexnormals->push_back(nrm);
     }