Changeset 13

Timestamp:

Nov 2, 2004, 11:20:45 PM (19 years ago)

Author:

darran

Message:

• culling 'c' now loops through CULLNONE, CULLNEARZERO, CULLSTEEPANGLE, CULLALL
• scaling of datasets now done in swwreader by scaling vertices on load
• method in watersurface for adjustable zoffset from bedslope

• need state machine for current mode and adjustment bindings

Location:

Swollen

Files:

• data/flat.sww (added)
• include/swwreader.h (modified) (3 diffs)
• swollen/keyboardeventhandler.cpp (modified) (3 diffs)
• swollen/keyboardeventhandler.h (modified) (2 diffs)
• swollen/main.cpp (modified) (4 diffs)
• swollen/watersurface.cpp (modified) (3 diffs)
• swollen/watersurface.h (modified) (2 diffs)
• swwreader/swwreader.cpp (modified) (8 diffs)

Swollen/include/swwreader.h

@@ -83 +83 @@
 
     // stage culling
-    virtual void toggleCullNearZero() {_cullnearzero = _cullnearzero ? false : true;}
-    virtual bool getCullNearZero() {return _cullnearzero;}
-    virtual float getCullNearZeroValue() {return _cullnearzerovalue;}
-    virtual void toggleCullSteepAngle() {_cullsteepangle = _cullsteepangle ? false : true;}
-    virtual bool getCullSteepAngle() {return _cullsteepangle;}
-    virtual float getCullSteepAngleValue() {return _cullsteepanglevalue;}
+    virtual void toggleCullSetting();
+    virtual float getCullNearZero() {return _cullnearzero;}
+    virtual float getCullSteepAngle() {return _cullsteepangle;}
+    virtual void setCullNearZero( float value ) {_cullnearzero = value; }
+    virtual void setCullSteepAngle( float value ) {_cullsteepangle = value; }
 
     virtual triangle_list getConnectivity(unsigned int index) {return _connectivity.at(index);}
@@ -131 +130 @@
     osg::ref_ptr<osg::Vec3Array> _stagecentroids;
 
+    // bedslope vertex scale and shift factors (for normalizing to unit cube)
+    float _xscale, _yscale, _zscale;
+    float _xoffset, _yoffset, _zoffset;
 
     // stack of return values from netcdf function calls
@@ -143 +145 @@
 
     // stage culling
-    bool _cullnearzero;
-    float _cullnearzerovalue;
-    bool _cullsteepangle;
-    float _cullsteepanglevalue;
+    float _cullnearzero;
+    float _cullsteepangle;
+    enum cullstate { CULLALL, CULLNEARZERO, CULLSTEEPANGLE, CULLNONE };
+    cullstate _cullsetting;
 
 };

Swollen/swollen/keyboardeventhandler.cpp

@@ -14 +14 @@
   _prevtime = 0;
   _togglewireframe = false;
-  _togglecullnearzero = false;
+  _togglecullsetting = false;
 }
 
@@ -73 +73 @@
 
                         case 'w':
-                _togglewireframe = true;
-                                handled = true;
-                                break;
+                          _togglewireframe = true;
+                          handled = true;
+                          break;
 
-            case 'c':
-                _togglecullnearzero = true;
-                                handled = true;
-                                break;
+                case 'c':
+                  _togglecullsetting = true;
+                  handled = true;
+                  break;
                 }
 
@@ -125 +125 @@
 
 
-bool KeyboardEventHandler::toggleCullNearZero()
+bool KeyboardEventHandler::toggleCullSetting()
 {
-        if( _togglecullnearzero )
+        if( _togglecullsetting )
         {
-                _togglecullnearzero = false;
+                _togglecullsetting = false;
                 return true;
         }

Swollen/swollen/keyboardeventhandler.h

@@ -23 +23 @@
         virtual bool timestepChanged();
         virtual bool toggleWireframe();
-        virtual bool toggleCullNearZero();
+        virtual bool toggleCullSetting();
         virtual int getTimestep(){return (unsigned int) _timestep;}
         virtual void setTime(float time);
@@ -30 +30 @@
         int _direction, _timestep, _ntimesteps;
         float _tps, _prevtime, _tpsorig;
-        bool _paused, _timestepchanged, _togglewireframe, _togglecullnearzero;
+        bool _paused, _timestepchanged, _togglewireframe, _togglecullsetting;
 };
 

Swollen/swollen/main.cpp

@@ -114 +114 @@
 
 
-    // center model in x and y
+    // center model in x and y (now done in swwreader)
+    /*
     osg::BoundingBox bbox = bedslope->getBound();
     float scale = 1.0/bbox.radius();
-    model->setScale( osg::Vec3(scale,scale,scale) );
     model->setPosition( -bbox.center()*scale );
-
+    */
+
+    // FIXME: should be reasonable default and adjustable
+    model->setScale( osg::Vec3(1.0, 1.0, 0.2) );
 
     // sky
@@ -156 +159 @@
 
 
+    unsigned int timestep = 0;
     while( !viewer.done() )
     {
@@ -163 +167 @@
         // current time
         double time = viewer.getFrameStamp()->getReferenceTime();
-
-        // events
-        if( event_handler->toggleWireframe() )
-            water->toggleWireframe();
-        if( event_handler->toggleCullNearZero() )
-            sww->toggleCullNearZero();
 
         // advance sww frame?
@@ -174 +172 @@
         if( event_handler->timestepChanged() )
         {
-            unsigned int timestep = event_handler->getTimestep();
+            timestep = event_handler->getTimestep();
             water->setTimeStep(timestep);
             hud->setTime( sww->getTime(timestep) );
         }
+
+        // events
+        if( event_handler->toggleWireframe() )
+            water->toggleWireframe();
+        if( event_handler->toggleCullSetting() )
+          {
+            sww->toggleCullSetting();
+            water->setTimeStep(timestep);  // forced reload
+          }
+
 
         // update the scene by traversing with the update visitor 

Swollen/swollen/watersurface.cpp

@@ -19 +19 @@
 
 
-#define DEF_WATER_COLOUR        0, 0, 0.5, 1            // R, G, B, Alpha (blue)
-#define DEF_WATER_TRANSPARENCY  0.1                   // 0=opaque, 1=transparent
-
+#define DEF_WATER_COLOUR        0, 0, 0.5, 1        // R, G, B, Alpha (blue)
+#define DEF_WATER_TRANSPARENCY  0.1                 // 0=opaque, 1=transparent
+#define DEF_ZOFFSET             0.01
 
 // constructor
@@ -32 +32 @@
     _stateset = new osg::StateSet;
     _material = new osg::Material;
+    _zoffset = DEF_ZOFFSET;
 
     // construct local scenegraph hierarchy
@@ -98 +99 @@
 
 
-    // vertical (z) offset to eliminate zbuffer problems
+    // vertical (z) offset to eliminate potential zbuffer problems with bedslope
     for( unsigned int iv=0; iv < vertices.get()->size(); iv++ )
-      vertices.get()->at(iv) += osg::Vec3f( 0.0, 0.0, 0.0 );
+      vertices.get()->at(iv) += osg::Vec3f( 0.0, 0.0, _zoffset );
 
     _geom->setVertexArray( vertices.get() );

Swollen/swollen/watersurface.h

@@ -29 +29 @@
     virtual void setTimeStep( unsigned int ts );
     virtual void toggleWireframe();
+    virtual void setOffset( float amount ){ _zoffset = amount; }
+    virtual float getOffset(){ return _zoffset; }
 
 protected:
@@ -38 +40 @@
     osg::Material* _material;
     virtual ~WaterSurface();
+    float _zoffset;
 
 };

Swollen/swwreader/swwreader.cpp

@@ -35 +35 @@
 #include <stdio.h>
 
+#define DEF_CULLNEARZERO    0.001
+#define DEF_CULLSTEEPANGLE  0.9
+#define DEF_CULLSTART       CULLNONE
+
+
 // only constructor, requires netcdf file
 SWWReader::SWWReader(const std::string& filename)
@@ -61 +66 @@
     _status.push_back( nc_inq_dimlen(_ncid, _ntimestepsid, &_ntimesteps) );
     if (this->_statusHasError()) return;
-
-    // debug info
-    osg::notify(osg::INFO) << "[SWWReader]" <<  std::endl;
-    osg::notify(osg::INFO) << "    nvolumes: " << _nvolumes <<  std::endl;
-    osg::notify(osg::INFO) << "    nvertices: " << _nvertices << std::endl;
-    osg::notify(osg::INFO) << "    npoints: " << _npoints << std::endl;
-    osg::notify(osg::INFO) << "    ntimesteps: " << _ntimesteps << std::endl;
-
 
     // variable ids
@@ -101 +98 @@
     unsigned int v1index, v2index, v3index;
 
+    // bedslope extents and resultant scale factors
+    float xmin, xmax, xrange;
+    float ymin, ymax, yrange;
+    float zmin, zmax, zrange;
+    xmin = _px[0];
+    xmax = _px[0];
+    ymin = _py[0];
+    ymax = _py[0];
+    zmin = _pz[0];
+    zmax = _pz[0];
+    for( iv=1; iv < _npoints; iv++ )
+    {
+      if( _px[iv] < xmin ) xmin = _px[iv];
+      if( _px[iv] > xmax ) xmax = _px[iv];
+      if( _py[iv] < ymin ) ymin = _py[iv];
+      if( _py[iv] > ymax ) ymax = _py[iv];
+      if( _pz[iv] < zmin ) zmin = _pz[iv];
+      if( _pz[iv] > zmax ) zmax = _pz[iv];
+    }
+    _xscale = 1.0/(xmax - xmin);  _xoffset = xmin;
+    _yscale = 1.0/(ymax - ymin);  _yoffset = ymin;
+    _zscale = (zmax==zmin) ? 1.0 : 1.0/(zmax - zmin);  _zoffset = zmin;
+    std::cout << "xmin: " << xmin << std::endl;
+    std::cout << "xmax: " << xmax << std::endl;
+    std::cout << "ymin: " << ymin << std::endl;
+    std::cout << "ymax: " << ymax << std::endl;
+    std::cout << "zmin: " << zmin << std::endl;
+    std::cout << "zmax: " << zmax << std::endl;
+    std::cout << "xscale: " << _xscale << std::endl;
+    std::cout << "yscale: " << _yscale << std::endl;
+    std::cout << "zscale: " << _zscale << std::endl;
+
+
     // culling defaults
-    _cullnearzero = true;
-    _cullnearzerovalue = 0.001;
-    _cullsteepangle = true;
-    _cullsteepanglevalue = 0.9;
+    _cullsetting = DEF_CULLSTART;
+    _cullnearzero = DEF_CULLNEARZERO;
+    _cullsteepangle = DEF_CULLSTEEPANGLE;
 
     // compute triangle connectivity, a list (indexed by vertex number) 
@@ -120 +149 @@
     }
 
-    // load bedslope vertex array
+    // load 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], _py[iv], _pz[iv]) );
+      _bedslopevertices->push_back( osg::Vec3( (_px[iv]-_xoffset)*_xscale - 0.5, 
+                                               (_py[iv]-_yoffset)*_yscale - 0.5, 
+                                               (_pz[iv]-_zoffset)*_zscale - 0.5) );
 
     // load bedslope index array, pvolumes array indexes into x, y and z
@@ -180 +212 @@
     int status = nc_get_vars_float (_ncid, _stageid, start, count, stride, _pstage);
 
-    // load stage vertex array
+    // load stage vertex array, scaling and shifting vertices to lie in the unit cube
     _stagevertices = new osg::Vec3Array;
     for (iv=0; iv < _npoints; iv++)
-        _stagevertices->push_back( osg::Vec3(_px[iv], _py[iv], _pstage[iv]) );
+        _stagevertices->push_back( osg::Vec3(
+                                             (_px[iv]-_xoffset)*_xscale - 0.5, 
+                                             (_py[iv]-_yoffset)*_yscale - 0.5, 
+                                             (_pstage[iv]-_zoffset)*_zscale - 0.5) );
 
     // stage index and per primitive normal and centroid arrays
@@ -212 +247 @@
 
         // shallow water depth culling test
-        if( _cullnearzero && ((v1s.z()+v2s.z()+v3s.z())/3.0 - _bedslopecentroids->at(iv).z()) < _cullnearzerovalue )
+        if( (_cullsetting == CULLALL || _cullsetting == CULLNEARZERO) && 
+            ((v1s.z()+v2s.z()+v3s.z())/3.0 - _bedslopecentroids->at(iv).z()) < _cullnearzero )
         {
             culledlist->push_back( iv );
@@ -219 +255 @@
 
         // steep bedslope culling test
-        if( _cullsteepangle )
-        {
-            if( _bedslopenormals->at(iv) * osg::Vec3f(0,0,1) < _cullsteepanglevalue )
+        if( _cullsetting == CULLALL || _cullsetting == CULLSTEEPANGLE ) 
+        {
+            if( _bedslopenormals->at(iv) * osg::Vec3f(0,0,1) < _cullsteepangle )
             {
                 culledlist->push_back( iv );
@@ -283 +319 @@
 
 
+
+void SWWReader::toggleCullSetting()
+{
+
+  switch( _cullsetting )
+    {
+
+    case CULLALL:
+      _cullsetting = CULLNEARZERO;
+      osg::notify(osg::INFO) << "[SWWReader::toggleCullSetting] CULLNEARZERO" <<  std::endl;
+      break;
+
+    case CULLNEARZERO:
+      _cullsetting = CULLSTEEPANGLE;
+      osg::notify(osg::INFO) << "[SWWReader::toggleCullSetting] CULLSTEEPANGLE" <<  std::endl;
+      break;
+
+    case CULLSTEEPANGLE:
+      _cullsetting = CULLNONE;
+      osg::notify(osg::INFO) << "[SWWReader::toggleCullSetting] CULLNONE" <<  std::endl;
+      break;
+
+    case CULLNONE:
+      _cullsetting = CULLALL;
+      osg::notify(osg::INFO) << "[SWWReader::toggleCullSetting] CULLALL" <<  std::endl;
+      break;
+
+    }
+}
+
+
+
 bool SWWReader::_statusHasError()
 {