Changeset 111 for Swollen/swwreader/swwreader.cpp

Timestamp:

Jun 21, 2005, 2:21:44 PM (19 years ago)

Author:

darran

Message:

• refactoring to facilitate storing state
• segfaulting at the moment ...

File:

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

Swollen/swwreader/swwreader.cpp

@@ -40 +40 @@
 
    // netcdf filename
-   _filename = new std::string(filename);
+   _state.swwfilename = new std::string(filename);
 
    // netcdf open
-   _status.push_back( nc_open(_filename->c_str(), NC_NOWRITE, &_ncid) );
+   _status.push_back( nc_open(filename.c_str(), NC_NOWRITE, &_ncid) );
    if (this->_statusHasError()) return;
 
@@ -131 +131 @@
 
    // alpha-scaling defaults, can be overridden after construction by command line parameters
-   _alphamin = DEFAULT_ALPHAMIN;
-   _alphamax = DEFAULT_ALPHAMAX;
-   _heightmin = DEFAULT_HEIGHTMIN;
-   _heightmax = DEFAULT_HEIGHTMAX;
+   _state.alphamin = DEFAULT_ALPHAMIN;
+   _state.alphamax = DEFAULT_ALPHAMAX;
+   _state.heightmin = DEFAULT_HEIGHTMIN;
+   _state.heightmax = DEFAULT_HEIGHTMAX;
 
    // steepness culling default, can be overridden after construction by command line parameter
-   _cullangle = DEFAULT_CULLANGLE;
-   _culling = DEFAULT_CULLONSTART;
+   _state.cullangle = DEFAULT_CULLANGLE;
+   _state.culling = DEFAULT_CULLONSTART;
 
    // loop index
@@ -270 +270 @@
    _valid = true;
 
+   std::cout << _state.alphamin << std::endl;
+   std::cout << _state.alphamax << std::endl;
+   std::cout << _state.heightmin << std::endl;
+   std::cout << _state.heightmax << std::endl;
+   std::cout << _state.cullangle << std::endl;
+   std::cout << _state.culling << std::endl;
+
+   std::cout << *_state.swwfilename << std::endl;
+   std::cout << *_state.bedslopetexturefilename << std::endl;
+
 }
 
@@ -285 +295 @@
 {
    osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] filename: " << filename <<  std::endl;
-   _bedslopetexture = new std::string(filename);
+   _state.bedslopetexturefilename = new std::string(filename);
    _bedslopegeodata.hasData = false;
 
@@ -311 +321 @@
       {
          _bedslopegeodata.xorigin = geodata[0];
-         _bedslopegeodata.yorigin = geodata[3];
-         _bedslopegeodata.rotation = geodata[2];
-         _bedslopegeodata.xpixel = geodata[1];
-         _bedslopegeodata.ypixel = geodata[5];
-         _bedslopegeodata.hasData = true;
-
-         osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] xorigin: " << _bedslopegeodata.xorigin <<  std::endl;
-         osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] yorigin: " << _bedslopegeodata.yorigin <<  std::endl;
-         osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] xpixel: " << _bedslopegeodata.xpixel <<  std::endl;
-         osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] ypixel: " << _bedslopegeodata.ypixel <<  std::endl;
-         osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] rotation: " << _bedslopegeodata.rotation <<  std::endl;
+         _bedslopegeodata.yorigin = geodata[3];
+         _bedslopegeodata.rotation = geodata[2];
+         _bedslopegeodata.xpixel = geodata[1];
+         _bedslopegeodata.ypixel = geodata[5];
+         _bedslopegeodata.hasData = true;
+
+         osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] xorigin: " << _bedslopegeodata.xorigin <<  std::endl;
+         osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] yorigin: " << _bedslopegeodata.yorigin <<  std::endl;
+         osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] xpixel: " << _bedslopegeodata.xpixel <<  std::endl;
+         osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] ypixel: " << _bedslopegeodata.ypixel <<  std::endl;
+         osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] rotation: " << _bedslopegeodata.rotation <<  std::endl;
       }
    }
@@ -330 +340 @@
 osg::Image* SWWReader::getBedslopeTexture()
 {
-   return osgDB::readImageFile( _bedslopetexture->c_str() );
+   return osgDB::readImageFile( _state.bedslopetexturefilename->c_str() );
 }
 
@@ -350 +360 @@
    else
    {
-      // decal'd using (x,y) locations scaled by extents into range [0,1]
+      // decaled using (x,y) locations scaled by extents into range [0,1]
       for( unsigned int iv=0; iv < _npoints; iv++ )
          _bedslopetexcoords->push_back( osg::Vec2( (_px[iv]-_xoffset)*_xscale, (_py[iv]-_yoffset)*_yscale ) );
@@ -391 +401 @@
 
    // cullangle given in degrees, test is against dot product
-   float cullthreshold = cos(osg::DegreesToRadians(_cullangle));
+   float cullthreshold = cos(osg::DegreesToRadians(_state.cullangle));
 
    // over all stage triangles
@@ -427 +437 @@
    // where a = (alphamax-alphamin)/(hmax-hmin)
    float alpha, height, alphascale;
-   alphascale = (_alphamax - _alphamin) / (_heightmax - _heightmin);
+   alphascale = (_state.alphamax - _state.alphamin) / (_state.heightmax - _state.heightmin);
    _stagecolors = new osg::Vec4Array;
    for (iv=0; iv < _npoints; iv++)
@@ -434 +444 @@
       height = _stagevertices->at(iv).z() - _bedslopevertices->at(iv).z();
         
-      if (height < _heightmin)
+      if (height < _state.heightmin)
          alpha = 0.0;
       else 
       {
-         alpha = alphascale * (height - _heightmin) + _alphamin;
-         if( alpha > _alphamax ) 
-            alpha = _alphamax;
+         alpha = alphascale * (height - _state.heightmin) + _state.alphamin;
+         if( alpha > _state.alphamax ) 
+            alpha = _state.alphamax;
       }
 
@@ -447 +457 @@
 
    // steep triangle vertices should have alpha=0, overwrite such vertex colours
-   if( _culling )
+   if( _state.culling )
    {
       for (iv=0; iv < steeptri->size() ; iv++)