Changeset 44

Timestamp:

Dec 10, 2004, 8:13:41 PM (20 years ago)

Author:

darran

Message:

• terrible destruction of Swollen moving towards changes Robert suggests

Location:

Swollen

Files:

• include/swwreader.h (modified) (2 diffs)
• swollen/bedslope.cpp (modified) (1 diff)
• swollen/watersurface.cpp (modified) (7 diffs)
• swwreader/swwreader.cpp (modified) (6 diffs)
• swwreadertest/swwreadertest.vcproj (modified) (1 diff)
• visualstudio/sww.suo (modified) (previous)

Swollen/include/swwreader.h

@@ -75 +75 @@
     virtual osg::ref_ptr<osg::Vec3Array> getStagePrimitiveNormalArray() {return _stageprimitivenormals;}
     virtual osg::ref_ptr<osg::Vec3Array> getStageCentroidsArray() {return _stagecentroids;}
+    virtual osg::ref_ptr<osg::Vec4Array> getStageColorArray() {return _stagecolors;}
+
 
     virtual float getTime(unsigned int index) {return *(_ptime+index);}
@@ -129 +131 @@
     osg::ref_ptr<osg::Vec3Array> _stagevertexnormals;
     osg::ref_ptr<osg::Vec3Array> _stagecentroids;
+    osg::ref_ptr<osg::Vec4Array> _stagecolors;
 
     // bedslope vertex scale and shift factors (for normalizing to unit cube)

Swollen/swollen/bedslope.cpp

@@ -25 +25 @@
     unsigned int nindices = sww->getNumberOfBedslopeIndices();
 
-    _geom->setUseDisplayList(false);
+    _geom->setUseDisplayList(true);
     _geom->setVertexArray( vertices );
     _geom->setVertexIndices( indices );

Swollen/swollen/watersurface.cpp

@@ -8 +8 @@
 
 #include <watersurface.h>
+#include <osg/AlphaFunc>
 #include <osg/BlendFunc>
 #include <osg/PolygonMode>
@@ -18 +19 @@
 #include <osgDB/ReadFile>
 
+#include <osgUtil/TriStripVisitor>
+
 
 #define DEF_WATER_COLOUR        0, 0, 0.5, 1        // R, G, B, Alpha (blue)
 #define DEF_WATER_TRANSPARENCY  0.1                 // 0=opaque, 1=transparent
-#define DEF_ZOFFSET             0.00
+#define DEF_ZOFFSET             0.01
 
 // constructor
@@ -38 +41 @@
     _node->addDrawable(_geom);
     _node->setStateSet(_stateset);
-    _stateset->setAttribute(_material);
+    //_stateset->setAttribute(_material);
 
-    // why???
-    _geom->setUseDisplayList(false);
+    _geom->setUseDisplayList(true);
 
     // initial geometry
     setTimeStep(0);
 
-    _material->setDiffuse(osg::Material::FRONT, osg::Vec4(DEF_WATER_COLOUR));
-    _material->setSpecular(osg::Material::FRONT, osg::Vec4(1,1,1,1));
-    _material->setTransparency(osg::Material::FRONT_AND_BACK, DEF_WATER_TRANSPARENCY);
-    _material->setShininess(osg::Material::FRONT, 128);
+    //_material->setDiffuse(osg::Material::FRONT, osg::Vec4(DEF_WATER_COLOUR));
+    //_material->setSpecular(osg::Material::FRONT, osg::Vec4(1,1,1,1));
+    //_material->setTransparency(osg::Material::FRONT_AND_BACK, DEF_WATER_TRANSPARENCY);
+    //_material->setShininess(osg::Material::FRONT, 128);
 
     // environment map
@@ -57 +59 @@
     texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
     texture->setImage(osgDB::readImageFile("envmap.jpg"));
-    _stateset->setTextureAttributeAndModes( 1, texture, osg::StateAttribute::ON );
+    //_stateset->setTextureAttributeAndModes( 1, texture, osg::StateAttribute::ON );
     _stateset->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
 
     // surface transparency
-    osg::BlendFunc* osgBlendFunc = new osg::BlendFunc();
-    osgBlendFunc->setFunction(osg::BlendFunc::SRC_ALPHA, osg::BlendFunc::ONE_MINUS_SRC_ALPHA);
-    _stateset->setAttribute(osgBlendFunc);
-    _stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+    //osg::BlendFunc* osgBlendFunc = new osg::BlendFunc();
+    //osgBlendFunc->setFunction(osg::BlendFunc::SRC_ALPHA, osg::BlendFunc::ONE_MINUS_SRC_ALPHA);
+    //_stateset->setAttribute(osgBlendFunc);
+    //_stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+
+    osg::AlphaFunc* alphaFunc = new osg::AlphaFunc;
+    //alphaFunc->setFunction(osg::AlphaFunc::GEQUAL,0.1f);
+    alphaFunc->setFunction(osg::AlphaFunc::ALWAYS);
+    _stateset->setAttributeAndModes( alphaFunc, osg::StateAttribute::ON );
+
     _stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+
 
     // automatically generate texture coords
@@ -74 +83 @@
     texenv->setMode( osg::TexEnv::DECAL );
     texenv->setColor( osg::Vec4(0.6f,0.6f,0.6f,0.2f) );
-    _stateset->setTextureAttributeAndModes( 1, texgen, osg::StateAttribute::ON );
-    _stateset->setTextureAttribute( 1, texenv );
+    //_stateset->setTextureAttributeAndModes( 1, texgen, osg::StateAttribute::ON );
+    //_stateset->setTextureAttribute( 1, texenv );
 }
 
@@ -97 +106 @@
     osg::ref_ptr<osg::Vec3Array> normals = _sww->getStagePrimitiveNormalArray();
     osg::ref_ptr<osg::Vec3Array> vertexnormals = _sww->getStageVertexNormalArray();
-
+    osg::ref_ptr<osg::Vec4Array> colors = _sww->getStageColorArray();
 
     // vertical (z) offset to eliminate potential zbuffer problems with bedslope
-    //for( unsigned int iv=0; iv < vertices.get()->size(); iv++ )
-    //  vertices.get()->at(iv) += osg::Vec3f( 0.0, 0.0, _zoffset );
+    osg::UIntArray* colorindices = new osg::UIntArray(vertices.get()->size());
+    for( unsigned int iv=0; iv < vertices.get()->size(); iv++ )
+    {
+        vertices.get()->at(iv) += osg::Vec3f( 0.0, 0.0, _zoffset );
+        colorindices->at(iv) = iv;
+    }
 
+    // geometry
     _geom->setVertexArray( vertices.get() );
     _geom->setVertexIndices( indices.get() );
@@ -108 +122 @@
            osg::PrimitiveSet::TRIANGLES, 0, _sww->getNumberOfStageIndices() ) );
 
-    //_geom->setNormalArray( normals.get() );
-    //_geom->setNormalBinding( osg::Geometry::BIND_PER_PRIMITIVE );
+    // per vertex colors (using only alpha) 
+    _geom->setColorArray( colors.get() );
+    _geom->setColorIndices( colorindices );
+    _geom->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
 
+    // normals
     _geom->setNormalArray( vertexnormals.get() );
     _geom->setNormalIndices( indices.get() );
     _geom->setNormalBinding(osg::Geometry::BIND_PER_VERTEX);
+
+    // osgUtil::TriStripVisitor* optimize = new osgUtil::TriStripVisitor();
+    // optimize->stripify( *_geom );
 
 }

Swollen/swwreader/swwreader.cpp

@@ -39 +39 @@
 #define DEF_CULLSTART       CULLNONE
 
+#define MIN(a, b) (a < b ? a : b)
+#define MAX(a, b) (a > b ? a : b)
+
 
 // only constructor, requires netcdf file
@@ -120 +123 @@
     aspect_ratio = xrange/yrange;
     if( aspect_ratio > 1.0 )
-      {
-        _xscale = 1.0 / xrange;
-        _xoffset = xmin;
-        _xcenter = 0.5;
-
-        _yscale = _xscale;
-        _yoffset = ymin;
-        _ycenter = 0.5 / aspect_ratio;
-
-        _zscale = _xscale;
-        _zoffset = zmin;
-        _zcenter = 0.0;
-      }
+    {
+            _xscale = 1.0 / xrange;
+            _xoffset = xmin;
+            _xcenter = 0.5;
+
+            _yscale = _xscale;
+            _yoffset = ymin;
+            _ycenter = 0.5 / aspect_ratio;
+
+            _zscale = _xscale;
+            _zoffset = zmin;
+            _zcenter = 0.0;
+    }
     else
-      {
-        _yscale = 1.0 / yrange;
-        _yoffset = ymin;
-        _ycenter = 0.5;
-
-        _xscale = _yscale;
-        _xoffset = xmin;
-        _xcenter = 0.5 / aspect_ratio;
-
-        _zscale = _yscale;
-        _zoffset = zmin;
-        _zcenter = 0.0;
-      }
+    {
+            _yscale = 1.0 / yrange;
+            _yoffset = ymin;
+            _ycenter = 0.5;
+
+            _xscale = _yscale;
+            _xoffset = xmin;
+            _xcenter = 0.5 / aspect_ratio;
+
+            _zscale = _yscale;
+            _zoffset = zmin;
+            _zcenter = 0.0;
+    }
 
     osg::notify(osg::INFO) << "[SWWReader] xmin: " << xmin <<  std::endl;
@@ -252 +255 @@
     _stagecentroids = new osg::Vec3Array;
     _stageindices = new osg::UIntArray;
+    _stagecolors = new osg::Vec4Array;
     osg::Vec3 v1b, v2b, v3b;
     osg::Vec3 v1s, v2s, v3s;
@@ -261 +265 @@
     // over all stage triangles
     unsigned int nonculled = 0;
+    float alphamin = 1.0;
+    float alphamax = 0.0;
     for (iv=0; iv < _nvolumes; iv++){
 
@@ -297 +303 @@
         _stageindices->push_back( v3index );
 
+        // alpha value based on stage-bedslope height difference
+        float alpha1 = ( v1s.z()-v1b.z() )*10.0;
+        float alpha2 = ( v2s.z()-v2b.z() )*10.0;
+        float alpha3 = ( v3s.z()-v3b.z() )*10.0;
+        alphamax = MAX( alphamax, alpha1 );
+        alphamax = MAX( alphamax, alpha2 );
+        alphamax = MAX( alphamax, alpha3 );
+        alphamin = MIN( alphamin, alpha1 );
+        alphamin = MIN( alphamin, alpha2 );
+        alphamin = MIN( alphamin, alpha3 );
+
+        osg::Vec4 color1, color2, color3;
+        color1.set( alpha1,alpha1,alpha1, 1.0 );
+        color2.set( alpha2,alpha2,alpha2, 1.0 );
+        color3.set( alpha3,alpha3,alpha3, 1.0 );
+        //color1.set( alpha1,alpha1,alpha1, alpha1 );
+        //color2.set( alpha2,alpha2,alpha2, alpha2 );
+        //color3.set( alpha3,alpha3,alpha3, alpha3 );
+        _stagecolors->push_back( color1 );
+        _stagecolors->push_back( color2 );
+        _stagecolors->push_back( color3 );
+
         // current triangle primitive normal
         side1 = v2s - v1s;
@@ -317 +345 @@
 
     }
+
+    std::cout << "index: " << index << "    AlphaMax: " << alphamax << std::endl;
+    std::cout << "index: " << index << "    AlphaMin: " << alphamin << std::endl;
 
     // per-vertex normals

Swollen/swwreadertest/swwreadertest.vcproj

@@ -103 +103 @@
                                 CommandLine="$(TARGETPATH)"/>
                         <Tool
-                                Name="VCPreBuildEventTool"/>
+                                Name="VCPreBuildEventTool"
+                                ExcludedFromBuild="TRUE"/>
                         <Tool
                                 Name="VCPreLinkEventTool"/>