Changeset 103

Timestamp:

Jun 8, 2005, 1:29:23 PM (19 years ago)

Author:

darran

Message:

• xllcorner,yllcorner offset working

Location:

Swollen

Files:

• doc/contract2_hours.txt (modified) (1 diff)
• include/swwreader.h (modified) (1 diff)
• swollen/main.cpp (modified) (1 diff)
• swollen/version.cpp (modified) (1 diff)
• swwreader/swwreader.cpp (modified) (5 diffs)

Swollen/doc/contract2_hours.txt

@@ -2 +2 @@
 2nd Contract Hours
 ------------------
+
+
+8 June, Wednesday (3 hours)
+- use of xllcorner,yllcorner in sww file
+- bug that "texture" image is looking in rundir
+
+6 June, Monday (2 hours)
+- added command line specification of bedslope spotlight position (-lightpos option)
+- changed to "texture" global attribute usage
+
+
 
 total = 154 hours (4.1 weeks)

Swollen/include/swwreader.h

@@ -158 +158 @@
     float _xcenter, _ycenter, _zcenter;
 
+    // sww file can contain optional global offset attributes
+    float _xllcorner, _yllcorner;
+
     // stack of return values from netcdf function calls
     std::vector<int> _status;

Swollen/swollen/main.cpp

@@ -45 +45 @@
     arguments.getApplicationUsage()->addCommandLineOption("-alphamin <float 0-1>","Transparency value at hmin");
     arguments.getApplicationUsage()->addCommandLineOption("-alphamax <float 0-1>","Maximum transparency clamp value");
-    arguments.getApplicationUsage()->addCommandLineOption("-lightpos <float>,<float>,<float>","x,y,z of bedslope directional light (default is overhead)");
+    arguments.getApplicationUsage()->addCommandLineOption("-lightpos <float>,<float>,<float>","x,y,z of bedslope directional light (z is up, default is overhead)");
     arguments.getApplicationUsage()->addCommandLineOption("-nosky","Omit background sky");
     arguments.getApplicationUsage()->addCommandLineOption("-texture <file>","Image to use for bedslope topography");

Swollen/swollen/version.cpp

@@ -1 @@
-const char* version() { const char* s = "Revision: 98:99M"; return s; }
+const char* version() { const char* s = "Revision: 102M"; return s; }

Swollen/swwreader/swwreader.cpp

@@ -92 +92 @@
     }
 
+    // sww file can optionally contain georeference offset
+    int status1 = nc_get_att_float(_ncid, NC_GLOBAL, "xllcorner", &_xllcorner);
+    int status2 = nc_get_att_float(_ncid, NC_GLOBAL, "yllcorner", &_yllcorner);
+    if( status1 == NC_NOERR && status2 == NC_NOERR)
+    {
+       osg::notify(osg::INFO) << "[SWWReader] xllcorner: " << _xllcorner <<  std::endl;
+       osg::notify(osg::INFO) << "[SWWReader] yllcorner: " << _yllcorner <<  std::endl;
+    }
+    else
+    {
+       _xllcorner = 0.0;  // default value
+       _yllcorner = 0.0;
+    }
+
+
     // loop index
     size_t iv;
@@ -98 +113 @@
     unsigned int v1index, v2index, v3index;
 
-    // bedslope extents and resultant scale factors
+    // bedslope range and resultant scale factors (note, these don't take into
+    // account any xllcorner, yllcorner offsets - used during texture coord assignment)
     float xmin, xmax, xrange;
     float ymin, ymax, yrange;
     float zmin, zmax, zrange;
     float aspect_ratio;
-    xmin = _px[0]; xmax = _px[0];
-    ymin = _py[0]; ymax = _py[0];
-    zmin = _pz[0]; zmax = _pz[0];
+    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];
+       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];
     }
 
@@ -135 +154 @@
     if( aspect_ratio > 1.0 )
     {
-        _scale = 1.0 / xrange;
+        _scale = 1.0/xrange;
         _ycenter /= aspect_ratio;
     }
     else
     {
-        _scale = 1.0 / yrange;
+        _scale = 1.0/yrange;
         _xcenter /= aspect_ratio;
     }
+
+
+    osg::notify(osg::INFO) << "[SWWReader] xscale: " << _xscale <<  std::endl;
+    osg::notify(osg::INFO) << "[SWWReader] yscale: " << _yscale <<  std::endl;
+    osg::notify(osg::INFO) << "[SWWReader] zmin: " << zmin <<  std::endl;
+    osg::notify(osg::INFO) << "[SWWReader] zmax: " << zmax <<  std::endl;
+    osg::notify(osg::INFO) << "[SWWReader] zscale: " << _zscale <<  std::endl;
+
+
 
     // alpha-scaling defaults
@@ -149 +177 @@
     _heightmin = 0.0;
     _heightmax = 1.0;    
-
-    osg::notify(osg::INFO) << "[SWWReader] xmin: " << xmin <<  std::endl;
-    osg::notify(osg::INFO) << "[SWWReader] xmax: " << xmax <<  std::endl;
-    osg::notify(osg::INFO) << "[SWWReader] xscale: " << _xscale <<  std::endl;
-    osg::notify(osg::INFO) << "[SWWReader] ymin: " << ymin <<  std::endl;
-    osg::notify(osg::INFO) << "[SWWReader] ymax: " << ymax <<  std::endl;
-    osg::notify(osg::INFO) << "[SWWReader] yscale: " << _yscale <<  std::endl;
-    osg::notify(osg::INFO) << "[SWWReader] zmin: " << zmin <<  std::endl;
-    osg::notify(osg::INFO) << "[SWWReader] zmax: " << zmax <<  std::endl;
-    osg::notify(osg::INFO) << "[SWWReader] zscale: " << _zscale <<  std::endl;
 
 
@@ -292 +310 @@
         float yrange = _bedslopegeodata.ypixel * _bedslopegeodata.yresolution;
         for( unsigned int iv=0; iv < _npoints; iv++ )
-            _bedslopetexcoords->push_back( osg::Vec2( (_px[iv] - xorigin)/xrange, (_py[iv] - yorigin)/yrange ) );           }
+            _bedslopetexcoords->push_back( osg::Vec2( (_px[iv] + _xllcorner - xorigin)/xrange, 
+                                                      (_py[iv] + _yllcorner - yorigin)/yrange ) );
+    }
     else
     {