Changeset 92 for Swollen/swwreader

Timestamp:

Jun 3, 2005, 8:27:21 AM (19 years ago)

Author:

darran

Message:

• bedslope texture only when asked
• code cleanup (comment-out PnP gone)
• bedslope material/stateset only used for texture
• 'l' keyboard toggle removed
• code for looking at global attributes of .sww file

File:

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

Swollen/swwreader/swwreader.cpp

@@ -72 +72 @@
     _status.push_back( nc_get_var_int (_ncid, _volumesid, (int *) _pvolumes) );  // triangle indices
     if (this->_statusHasError()) return;
+
+
+        // sww file can optionally contain bedslope texture image filename
+        size_t attlen;
+        if( nc_inq_attlen(_ncid, NC_GLOBAL, "institution", &attlen) != NC_ENOTATT )
+        {
+                std::string filename;
+                int nc_get_att_text(_ncid, NC_GLOBAL, "institution", char filename);
+                setBedslopeTexture( std::string filename );
+        }
 
     // loop index
@@ -105 +115 @@
     
     // handle case of a flat bed that doesn't necessarily pass through z=0
-    _zscale = (zrange == 0.0) ? 1.0 : 1.0 / zrange;
+    _zscale = (zrange == 0.0) ? 1.0 : 1.0/zrange;
 
     _xoffset = xmin;
@@ -130 +140 @@
     _heightmin = 0.0;
     _heightmax = 1.0;    
-
-
-    // default texture map without geodata
-    // FIXME: only use texture if specified on command line, otherwise colour
-    _bedslopetexture = new std::string("bedslope.jpg");
-    _bedslopegeodata.hasData = false;
-
 
     osg::notify(osg::INFO) << "[SWWReader] xmin: " << xmin <<  std::endl;