Changeset 44 for Swollen/swollen/watersurface.cpp

Timestamp:

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

Author:

darran

Message:

• terrible destruction of Swollen moving towards changes Robert suggests

File:

• Swollen/swollen/watersurface.cpp (modified) (7 diffs)

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 );
 
 }