Changeset 95

Timestamp:

Jun 3, 2005, 1:08:42 PM (19 years ago)

Author:

darran

Message:

• correct texture coordinates for georeferenced bedslope images

Location:

Swollen

Files:

• doc/contract2_hours.txt (modified) (1 diff)
• swollen/bedslope.cpp (modified) (1 diff)
• swwreader/swwreader.cpp (modified) (5 diffs)

Swollen/doc/contract2_hours.txt

@@ -3 +3 @@
 ------------------
 
+2 June, Thursday (2 hours)
+- bedslope texture only used when specified
+- almost finished image query of .sww global attributes
 
 31 May, Tuesday (3 hours)

Swollen/swollen/bedslope.cpp

@@ -48 +48 @@
                 osg::Texture2D* texture = new osg::Texture2D;
                 texture->setDataVariance( osg::Object::DYNAMIC );
-                texture->setWrap( osg::Texture::WRAP_S, osg::Texture::REPEAT );
-                texture->setWrap( osg::Texture::WRAP_T, osg::Texture::REPEAT );
+                texture->setWrap( osg::Texture::WRAP_S, osg::Texture::CLAMP );
+                texture->setWrap( osg::Texture::WRAP_T, osg::Texture::CLAMP );
                 texture->setImage( _sww->getBedslopeTexture() );
 

Swollen/swwreader/swwreader.cpp

@@ -4 +4 @@
     Reader of SWW files from within OpenSceneGraph.
 
-    copyright (C) 2004 Geoscience Australia
+    copyright (C) 2004-2005 Geoscience Australia
 */
 
@@ -75 +75 @@
 
         // sww file can optionally contain bedslope texture image filename
-        size_t attlen;
-        if( nc_inq_attlen(_ncid, NC_GLOBAL, "institution", &attlen) != NC_ENOTATT )
+        size_t attlen; // length of text attribute (if it exists)
+        if( nc_inq_attlen(_ncid, NC_GLOBAL, "bedslope_image", &attlen) != NC_ENOTATT )
         {
-                std::string filename;
-                int nc_get_att_text(_ncid, NC_GLOBAL, "institution", char filename);
-                setBedslopeTexture( std::string filename );
+        char* filename;
+        if( (filename = (char*) malloc(attlen+1)) != NULL){
+            int status;
+                status = nc_get_att_text(_ncid, NC_GLOBAL, "bedslope_image", filename);
+            if( status == NC_NOERR )
+            {
+                filename[attlen] = '\0';  // ensure string is terminated, not a requirement for netcdf attributes
+                osg::notify(osg::INFO) << "[SWWReader] embedded image filename: " << filename <<  std::endl;
+                        setBedslopeTexture( std::string(filename) );
+            }
+        free( filename );
+        }
         }
 
@@ -99 +108 @@
     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];
     }
 
@@ -238 +247 @@
       _bedslopegeodata.xresolution = pGDAL->GetRasterXSize();
       _bedslopegeodata.yresolution = pGDAL->GetRasterYSize();
+          osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] xresolution: " << 
+          _bedslopegeodata.xresolution <<  std::endl;
+          osg::notify(osg::INFO) << "[SWWReader::setBedslopetexture] yresolution: " << 
+          _bedslopegeodata.yresolution <<  std::endl;
 
       // check if image contains geodata
@@ -271 +284 @@
 osg::ref_ptr<osg::Vec2Array> SWWReader::getBedslopeTextureCoords()
 {
-
-   // bedslope texture coords based on (x,y) locations scaled by extents into range [0,1]
    _bedslopetexcoords = new osg::Vec2Array;
-   for( unsigned int iv=0; iv < _npoints; iv++ )
-      _bedslopetexcoords->push_back( osg::Vec2( (_px[iv]-_xoffset)*_xscale, (_py[iv]-_yoffset)*_yscale ) );
+    if( _bedslopegeodata.hasData )  // georeferenced bedslope texture
+    {
+        float xorigin = _bedslopegeodata.xorigin;
+        float yorigin = _bedslopegeodata.yorigin;
+        float xrange = _bedslopegeodata.xpixel * _bedslopegeodata.xresolution;
+        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 ) );           }
+    else
+    {
+        // decal'd 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 ) );
+    }
 
    return _bedslopetexcoords;