Changeset 104

Timestamp:

Jun 10, 2005, 5:24:31 PM (20 years ago)

Author:

darran

Message:

• towards steep culling based on alpha transparency.

Location:

Swollen

Files:

• doc/contract2_hours.txt (modified) (1 diff)
• swollen/bedslope.cpp (modified) (1 diff)
• swollen/bedslope.h (modified) (1 diff)
• swollen/keyboardeventhandler.cpp (modified) (3 diffs)
• swollen/keyboardeventhandler.h (modified) (2 diffs)
• swollen/main.cpp (modified) (2 diffs)
• swollen/watersurface.cpp (modified) (1 diff)
• swwreader/swwreader.cpp (modified) (9 diffs)

Swollen/doc/contract2_hours.txt

@@ -3 +3 @@
 ------------------
 
+total = 163 hours (4.3 weeks)
+subtotal = 9 hours
+
+10 June, Friday (4 hours)
+- sww file "texture" attribute image now found in same location as .sww
+- steep culling reintroduced
+- built and released distro20050610 for windows
 
 8 June, Wednesday (3 hours)

Swollen/swollen/bedslope.cpp

@@ -77 +77 @@
 
 }
-
-
-void BedSlope::toggleTexture()
-{
-
-        // FIXME: stateset no longer defined for non-textured bedslope
-    if ( _texture )
-    {
-        _stateset->setTextureMode( 0, GL_TEXTURE_2D, osg::StateAttribute::OFF );
-        _texture = false;
-    }
-    else
-    { 
-        _stateset->setTextureMode( 0, GL_TEXTURE_2D, osg::StateAttribute::ON );
-        _texture = true;
-    }
-
-}

Swollen/swollen/bedslope.h

@@ -29 +29 @@
     virtual osg::Geode* get(){ return _node; }
     virtual osg::BoundingBox getBound(){ return _geom->getBound(); }
-    virtual void toggleTexture();
 
 

Swollen/swollen/keyboardeventhandler.cpp

@@ -14 +14 @@
     _prevtime = 0;
     _togglewireframe = false;
+    _toggleculling = false;
 }
 
@@ -76 +77 @@
                 break;
 
+            case 'c':
+                _toggleculling = true;
+                handled = true;
+                break;
+
+
             }
 
@@ -120 +127 @@
 
 
+bool KeyboardEventHandler::toggleCulling()
+{
+    if( _toggleculling )
+    {
+        _toggleculling = false;
+        return true;
+    }
+    return false;
+}
+
+

Swollen/swollen/keyboardeventhandler.h

@@ -23 +23 @@
     virtual bool timestepChanged();
     virtual bool toggleWireframe();
+    virtual bool toggleCulling();
     virtual int getTimestep(){return (unsigned int) _timestep;}
     virtual void setTime(float time);
@@ -29 +30 @@
     int _direction, _timestep, _ntimesteps;
     float _tps, _prevtime, _tpsorig;
-    bool _paused, _timestepchanged, _togglewireframe;
+    bool _paused, _timestepchanged, _togglewireframe, _toggleculling;
 };
 

Swollen/swollen/main.cpp

@@ -131 +131 @@
     // Lighting
     DirectionalLight* light = new DirectionalLight(rootStateSet);
-    light->setPosition( osg::Vec3(0,0,2) );  // z is up
+    light->setPosition( osg::Vec3(1,1,1) );  // z is up
 
     std::string lightposstr;
@@ -218 +218 @@
             water->toggleWireframe();
 
+        if( event_handler->toggleCulling() )
+            std::cout << "toggle culling" << std::endl;
+
+
         // update the scene by traversing with the update visitor 
         viewer.update();

Swollen/swollen/watersurface.cpp

@@ -67 +67 @@
 
     osg::TexEnv* texenv = new osg::TexEnv;
-    texenv->setMode( osg::TexEnv::DECAL );
+    //texenv->setMode( osg::TexEnv::DECAL );
+    texenv->setMode( osg::TexEnv::BLEND );
     texenv->setColor( osg::Vec4(0.6f,0.6f,0.6f,0.2f) );
     _stateset->setTextureAttributeAndModes( 1, texgen, osg::StateAttribute::ON );

Swollen/swwreader/swwreader.cpp

@@ -8 +8 @@
 
 #include <SWWReader.h>
+#include <cstdlib>
 #include <string>
 #include <fstream>
@@ -15 +16 @@
 #include <osgDB/Registry>
 #include <osgDB/ReadFile>
+#include <osgDB/FileNameUtils>
 
 #include <stdlib.h>
@@ -78 +80 @@
     if( nc_inq_attlen(_ncid, NC_GLOBAL, "texture", &attlen) != NC_ENOTATT )
     {
-       char* filename;
-       if( (filename = (char*) malloc(attlen+1)) != NULL){
-          int status;
-          status = nc_get_att_text(_ncid, NC_GLOBAL, "texture", 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 );
-       }
+        char* texfilename;
+        if( (texfilename = (char*) malloc(attlen+1)) != NULL){
+                int status;
+                status = nc_get_att_text(_ncid, NC_GLOBAL, "texture", texfilename);
+                if( status == NC_NOERR )
+                {
+                    texfilename[attlen] = '\0';  // ensure string is terminated, not a requirement for netcdf attributes
+                    osg::notify(osg::INFO) << "[SWWReader] embedded image filename: " << texfilename <<  std::endl;
+                setBedslopeTexture( osgDB::getFilePath(filename) + std::string("/") + std::string(texfilename) );
+                }
+            free( texfilename );
+        }
     }
 
@@ -163 +165 @@
     }
 
-
     osg::notify(osg::INFO) << "[SWWReader] xscale: " << _xscale <<  std::endl;
     osg::notify(osg::INFO) << "[SWWReader] yscale: " << _yscale <<  std::endl;
@@ -169 +170 @@
     osg::notify(osg::INFO) << "[SWWReader] zmax: " << zmax <<  std::endl;
     osg::notify(osg::INFO) << "[SWWReader] zscale: " << _zscale <<  std::endl;
-
-
-
-    // alpha-scaling defaults
-    _alphamin = 0.8;        
-    _alphamax = 1.0;
-    _heightmin = 0.0;
-    _heightmax = 1.0;    
 
 
@@ -198 +191 @@
         _bedslopevertices->push_back( osg::Vec3( (_px[iv]-_xoffset)*_scale - _xcenter, 
                                                  (_py[iv]-_yoffset)*_scale - _ycenter, 
-                                                 (_pz[iv]-_zoffset)*_scale - _zcenter) );
+                                                 (_pz[iv]-_zoffset)*_scale - _zcenter - 0.00) );
 
     // bedslope index array, pvolumes array indexes into x, y and z
@@ -334 +327 @@
     count[1] = _npoints;
 
+    // empty array for storing list of steep triangles
+    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);
@@ -375 +377 @@
         _stagecentroids->push_back( (v1s+v2s+v3s)/3.0 );
         _stageprimitivenormals->push_back( nrm );
-    }
-
+
+        // identify steep triangles
+        if( fabs(nrm * osg::Vec3f(0,0,1)) < 0.4 )
+        {
+            steeptri->push_back( iv );
+        }
+    }
+
+
+    int seed = 5;
+    srand(seed);
+    float r, g, b;
 
     // stage height above bedslope mapped as alpha value
@@ -387 +399 @@
     for (iv=0; iv < _npoints; iv++)
     {
-        height = _stagevertices->at(iv).z() - _bedslopevertices->at(iv).z();
+        height = _stagevertices->at(iv).z() - _bedslopevertices->at(iv).z();
         
-        if (height < _heightmin)
-        {
-            alpha = 0.0;
-        } 
-        else 
-        {
-            alpha = alphascale * (height - _heightmin) + _alphamin;
-            if( alpha > _alphamax ) 
-                alpha = _alphamax;        
-        }
-        _stagecolors->push_back( osg::Vec4( 1.0, 1.0, 1.0, alpha ) );
-    }
+        if (height < _heightmin)
+        {
+            alpha = 0.0;
+        } 
+        else 
+        {
+                alpha = alphascale * (height - _heightmin) + _alphamin;
+                if( 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 ) );
+    }
+