Changeset 105 for Swollen/swwreader/swwreader.cpp

Timestamp:

Jun 10, 2005, 8:28:56 PM (19 years ago)

Author:

darran

Message:

• reintroduction of 'c' steep culling
• distro20050610 release

File:

• Swollen/swwreader/swwreader.cpp (modified) (7 diffs)

Swollen/swwreader/swwreader.cpp

@@ -21 +21 @@
 #include <stdio.h>
 #include <gdal_priv.h>
+
+
+// compile time defaults
+#define DEFAULT_CULLANGLE 85.0
+#define DEFAULT_ALPHAMIN 0.8
+#define DEFAULT_ALPHAMAX 1.0
+#define DEFAULT_HEIGHTMIN 0.0
+#define DEFAULT_HEIGHTMAX 1.0
+#define DEFAULT_BEDSLOPEOFFSET 0.0
+#define DEFAULT_CULLONSTART false
 
 
@@ -108 +118 @@
     }
 
+
+    // alpha-scaling defaults, can be overridden after construction by command line parameters
+    _alphamin = DEFAULT_ALPHAMIN;
+    _alphamax = DEFAULT_ALPHAMAX;
+    _heightmin = DEFAULT_HEIGHTMIN;
+    _heightmax = DEFAULT_HEIGHTMAX;
+
+    // steepness culling default, can be overridden after construction by command line parameter
+    _cullangle = DEFAULT_CULLANGLE;
+    _culling = DEFAULT_CULLONSTART;
 
     // loop index
@@ -191 +211 @@
         _bedslopevertices->push_back( osg::Vec3( (_px[iv]-_xoffset)*_scale - _xcenter, 
                                                  (_py[iv]-_yoffset)*_scale - _ycenter, 
-                                                 (_pz[iv]-_zoffset)*_scale - _zcenter - 0.00) );
+                                                 (_pz[iv]-_zoffset)*_scale - _zcenter - DEFAULT_BEDSLOPEOFFSET) );
 
     // bedslope index array, pvolumes array indexes into x, y and z
@@ -330 +350 @@
     osg::ref_ptr<osg::IntArray> steeptri = new osg::IntArray;
 
-    // alpha-scaling defaults
-    _alphamin = 0.8;
-    _alphamax = 1.0;
-    _heightmin = 0.00;
-    _heightmax = 1.0;
-
     // stage heights from netcdf file (x and y are same as bedslope)
     int status = nc_get_vars_float (_ncid, _stageid, start, count, stride, _pstage);
@@ -354 +368 @@
     unsigned int v1index, v2index, v3index;
 
+    // cullangle given in degrees, test is against dot product
+    float cullthreshold = cos(osg::DegreesToRadians(_cullangle));
+
     // over all stage triangles
     for (iv=0; iv < _nvolumes; iv++)
@@ -378 +395 @@
         _stageprimitivenormals->push_back( nrm );
 
-        // identify steep triangles
-        if( fabs(nrm * osg::Vec3f(0,0,1)) < 0.4 )
-        {
+        // identify steep triangles, store index
+        if( fabs(nrm * osg::Vec3f(0,0,1)) < cullthreshold )
             steeptri->push_back( iv );
-        }
-    }
-
-
-    int seed = 5;
-    srand(seed);
-    float r, g, b;
+    }
 
     // stage height above bedslope mapped as alpha value
@@ -399 +409 @@
     for (iv=0; iv < _npoints; iv++)
     {
+        // water height above corresponding bedslope
         height = _stagevertices->at(iv).z() - _bedslopevertices->at(iv).z();
         
         if (height < _heightmin)
-        {
             alpha = 0.0;
-        } 
         else 
         {
-                alpha = alphascale * (height - _heightmin) + _alphamin;
+            alpha = alphascale * (height - _heightmin) + _alphamin;
                 if( alpha > _alphamax ) 
-                    alpha = _alphamax;    
+                alpha = _alphamax;
         }
 
-        r = ((float) rand())/RAND_MAX;
-        g = ((float) rand())/RAND_MAX;
-        b = ((float) rand())/RAND_MAX;
-        //alpha = ((float) rand())/RAND_MAX;
-        alpha = 0.9;
-        _stagecolors->push_back( osg::Vec4( r, g, b, alpha ) );
-    }
-
-    for (iv=0; iv < steeptri->size() ; iv++)
-    {
-        int tri = steeptri->at(iv);
-        v1index = _pvolumes[3*tri+0];
-        v2index = _pvolumes[3*tri+1];
-        v3index = _pvolumes[3*tri+2];
-
-        r = ((float) rand())/RAND_MAX;
-        g = ((float) rand())/RAND_MAX;
-        b = ((float) rand())/RAND_MAX;
-
-        std::cout << tri << std::endl;
-
-        // FIXME: needs to be an overwrite rather than a push
-        //_stagecolors->push_back( osg::Vec4( 1, 1, 1, alpha ) );
-    }
-
-
+        _stagecolors->push_back( osg::Vec4( 1.0, 1.0, 1.0, alpha ) );
+    }
+
+        // steep triangle vertices should have alpha=0, overwrite such vertex colours
+    if( _culling )
+    {
+        for (iv=0; iv < steeptri->size() ; iv++)
+        {
+            int tri = steeptri->at(iv);
+            v1index = _pvolumes[3*tri+0];
+            v2index = _pvolumes[3*tri+1];
+            v3index = _pvolumes[3*tri+2];
+
+            _stagecolors->at(v1index) = osg::Vec4( 1, 1, 1, 0 );
+            _stagecolors->at(v2index) = osg::Vec4( 1, 1, 1, 0 );
+            _stagecolors->at(v3index) = osg::Vec4( 1, 1, 1, 0 );
+        }
+    }
 
     // per-vertex normals calculated as average of primitive normals