Changeset 72

Timestamp:

Dec 22, 2004, 6:48:22 PM (19 years ago)

Author:

darran

Message:

• work in progress

Location:

Swollen

Files:

• doc/contract2_hours.txt (modified) (1 diff)
• images/gainline.jpg (added)
• images/gastacked.jpg (added)
• swollen/Makefile (modified) (1 diff)
• swollen/bedslope.cpp (modified) (5 diffs)
• swollen/bedslope.h (modified) (2 diffs)
• swollen/directionallight.cpp (added)
• swollen/directionallight.h (added)
• swollen/keyboardeventhandler.cpp (modified) (1 diff)
• swollen/main.cpp (modified) (10 diffs)
• swollen/spotlight.cpp (modified) (5 diffs)
• swollen/spotlight.h (modified) (1 diff)
• swollen/version.cpp (modified) (1 diff)
• swollen/watersurface.cpp (modified) (1 diff)

Swollen/doc/contract2_hours.txt

@@ -4 +4 @@
 
 
-16 Decomber, Thursday (10am-6pm)
+22 December, Wednesday (4 hours)
+- orientable directional light
+
+
+
+total = 135 hours (3.6 weeks)
+subtotal = 22 hours
+
+
+16 December, Thursday (8 hours)
 - terrain manipulator added
 - -version flag

Swollen/swollen/Makefile

@@ -27 +27 @@
 COMPILER         =  g++
 OBJ              =  customviewer.o hud.o keyboardeventhandler.o watersurface.o main.o version.o \
-                    bedslope.o createSky.o customtrackball.o customterrainmanipulator.o spotlight.o
+                    bedslope.o createSky.o customtrackball.o customterrainmanipulator.o spotlight.o \
+                    directionallight.o
 CPPFLAGS         =  -F/System/Library/Frameworks -Wall -DDARWIN_QUICKTIME \
                     $(OPTIMIZATION)

Swollen/swollen/bedslope.cpp

@@ -3 +3 @@
 #include <bedslope.h>
 
+#include <osg/Texture>
 #include <osg/Texture2D>
-#include <osg/TexEnv>
+
 #include <osgUtil/SmoothingVisitor>
 
@@ -22 +23 @@
     // geometry from sww file
     osg::Vec3Array* vertices = _sww->getBedslopeVertexArray().get();
-    //osg::Vec3Array* normals = _sww->getBedslopeNormalArray().get();
 
-    _geom->setUseDisplayList(true);
+    _geom->setUseDisplayList( true );
     _geom->setVertexArray( vertices );
     _geom->addPrimitiveSet( _sww->getBedslopeIndexArray().get() );
-    //_geom->setNormalArray( normals );
-    //_geom->setNormalBinding( osg::Geometry::BIND_PER_PRIMITIVE );
     _geom->setTexCoordArray( 0, _sww->getBedslopeTextureCoords().get() );
 
     osg::UByte4Array* color = new osg::UByte4Array(1);
-    (*color)[0] = osg::UByte4( 255,255,255,255 );
+    (*color)[0] = osg::UByte4( DEF_BEDSLOPE_COLOUR );
     _geom->setColorArray( color );
     _geom->setColorBinding( osg::Geometry::BIND_OVERALL );
@@ -41 +39 @@
 
     // bedslope texture
+    _texture = true;
     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->setDataVariance( osg::Object::DYNAMIC );
+    texture->setWrap( osg::Texture::WRAP_S, osg::Texture::REPEAT );
+    texture->setWrap( osg::Texture::WRAP_T, osg::Texture::REPEAT );
     texture->setImage( _sww->getBedslopeTexture() );
 
     // material
     _material = new osg::Material();
-    _material->setAmbient( osg::Material::FRONT_AND_BACK, osg::Vec4(0.2, 0.2, 0.2, 1.0) );
+    _material->setAmbient( osg::Material::FRONT_AND_BACK, osg::Vec4(0.2, 0.15, 0.06, 1.0) );
+    _material->setDiffuse( osg::Material::FRONT_AND_BACK, osg::Vec4(0.6, 0.5, 0.2, 1.0) );
+    _material->setSpecular( osg::Material::FRONT_AND_BACK, osg::Vec4(0.0, 0.0, 0.0, 1.0) );
+    _material->setEmission( osg::Material::FRONT_AND_BACK, osg::Vec4(0.0, 0.0, 0.0, 1.0) );
+
+    _material->setAmbient( osg::Material::FRONT_AND_BACK, osg::Vec4(0.0, 0.0, 0.0, 1.0) );
     _material->setDiffuse( osg::Material::FRONT_AND_BACK, osg::Vec4(1.0, 1.0, 1.0, 1.0) );
-    _material->setSpecular( osg::Material::FRONT_AND_BACK, osg::Vec4(0.8, 0.8, 0.8, 1.0) );
+    _material->setSpecular( osg::Material::FRONT_AND_BACK, osg::Vec4(0.0, 0.0, 0.0, 1.0) );
     _material->setEmission( osg::Material::FRONT_AND_BACK, osg::Vec4(0.0, 0.0, 0.0, 1.0) );
 
@@ -58 +62 @@
     _stateset = new osg::StateSet;
     _stateset->setTextureAttributeAndModes( 0, texture, osg::StateAttribute::ON );
-    _stateset->setAttributeAndModes(_material, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE );
+    _stateset->setAttributeAndModes( _material, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE );
     _stateset->setMode( GL_BLEND, osg::StateAttribute::ON );
     _stateset->setMode( GL_LIGHTING, osg::StateAttribute::ON );
@@ -69 +73 @@
 }
 
+
+void BedSlope::toggleTexture()
+{
+
+    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();
+
 
 protected:
@@ -38 +40 @@
     osg::Material* _material;
     virtual ~BedSlope(){;}
+    bool _texture;
 
 };

Swollen/swollen/keyboardeventhandler.cpp

@@ -77 +77 @@
                 break;
 
-            case 'm':
+            case 'l':
                 _togglemanipulatormode = true;
                 handled = true;

Swollen/swollen/main.cpp

@@ -20 +20 @@
 #include <hud.h>
 #include <keyboardeventhandler.h>
-#include <spotlight.h>
+//#include <spotlight.h>
+#include <directionallight.h>
 #include <watersurface.h>
 
@@ -44 +45 @@
     arguments.getApplicationUsage()->addCommandLineOption("-hmin <float>","Height below which transparency is set to zero");    
     arguments.getApplicationUsage()->addCommandLineOption("-hmax <float>","Height above which transparency is set to alphamax");       
-    arguments.getApplicationUsage()->addCommandLineOption("-alphamin <float>","Transparency value at hmin");    
-    arguments.getApplicationUsage()->addCommandLineOption("-alphamax <float>","Maximum transparency clamp value");
+    arguments.getApplicationUsage()->addCommandLineOption("-alphamin <float 0-1>","Transparency value at hmin");    
+    arguments.getApplicationUsage()->addCommandLineOption("-alphamax <float 0-1>","Maximum transparency clamp value");
     arguments.getApplicationUsage()->addCommandLineOption("-nosky","Omit background sky");
     arguments.getApplicationUsage()->addCommandLineOption("-texture <file>","Image to use for bedslope topography");
@@ -135 +136 @@
 
     // Lighting
-    SpotLight* spotlight = new SpotLight(rootStateSet);
-    spotlight->setPosition( osg::Vec3(0,1,0) );  // z is up
-    spotlight->setSpotAngle( 45.0 );
+    DirectionalLight* light = new DirectionalLight(rootStateSet);
+    light->setPosition( osg::Vec3(0,1,0) );  // z is up
+    // spotlight->setSpotAngle( 45.0 );
 
 
@@ -143 +144 @@
     rootnode->setStateSet(rootStateSet);
     rootnode->addChild( hud->get() );
-    rootnode->addChild( spotlight->get() );
+    rootnode->addChild( light->get() );
     rootnode->addChild(model);
     model->addChild( bedslope->get() );
@@ -179 +180 @@
 
 
-    // initial camera position
+    // initial light position
     CustomTrackballManipulator* trackball = viewer.getTrackball();
     trackball->setNode( model );
@@ -191 +192 @@
 
 
+    // initial camera position
     CustomTerrainManipulator* terrainmanipulator = viewer.getTerrainManipulator();
-    terrainmanipulator->setNode( rootnode );
+    terrainmanipulator->setNode( model );
     terrainmanipulator->setAutoComputeHomePosition( false );
     terrainmanipulator->setHomePosition(
@@ -219 +221 @@
             water->setTimeStep(timestep);
             hud->setTime( sww->getTime(timestep) );
+
+            // bedslope->toggleTexture();
+
         }
 
@@ -225 +230 @@
         {
             //osg::Matrixd matrix = trackball->getInverseMatrix();
-           osg::Matrixd matrix = trackball->getMatrix();
-           osg::Vec3d position = matrix.getTrans();
-           //std::cout << "trackball position x: " << position. << std::endl;
-           spotlight->setPosition( position );
+            osg::Matrixd matrix = trackball->getMatrix();
+            osg::Vec3d position = matrix.getTrans();
+            //std::cout << "trackball position x: " << position. << std::endl;
+            light->setPosition( -position );
         }
 
@@ -243 +248 @@
                 trackball->disable();
                 terrainmanipulator->enable();
+                light->hide();
             }
             else
@@ -248 +254 @@
                 trackball->enable();
                 terrainmanipulator->disable();
+                light->show();
             }
         }

Swollen/swollen/spotlight.cpp

@@ -14 +14 @@
 {
     // positioning container
-    _group = new osg::MatrixTransform;
-    _group->setCullingActive(false);
+    _transform = new osg::MatrixTransform;
+    _transform->setCullingActive(false);
 
     // OpenGL light
@@ -21 +21 @@
     _light->setLightNum(num);
     _light->setPosition(osg::Vec4(0,0,0,1));
-    _light->setAmbient(osg::Vec4(0.0,0.0,0.0,1));
+    _light->setAmbient(osg::Vec4(0.7,0.7,0.7,1));
     _light->setDiffuse(osg::Vec4(1,1,1,1));
     _light->setSpecular(osg::Vec4(1,1,1,1));
@@ -33 +33 @@
     _source->setLocalStateSetModes( osg::StateAttribute::ON ); 
     _source->setStateSetModes( *rootStateSet, osg::StateAttribute::ON );
-    _group->addChild( _source );
+    _transform->addChild( _source );
 
     // create cone marker for spotlight and rotate towards origin
@@ -44 +44 @@
 
     // omit marker cone for now (FIX ME)
-    _group->addChild(_marker);
+    _transform->addChild(_marker);
 
     setPosition( osg::Vec3(0,0,1) );  // default overhead
@@ -67 +67 @@
     quat.makeRotate( osg::Vec3(0,0,-1), origindir );
 
-    _group->setMatrix( osg::Matrix::rotate( quat ) * osg::Matrix::translate(v) );
+    _transform->setMatrix( osg::Matrix::rotate( quat ) * osg::Matrix::translate(v) );
 }
 

Swollen/swollen/spotlight.h

@@ -32 +32 @@
 
     SpotLight(osg::StateSet* rootStateSet, int num=0);
-    virtual osg::Group* get(){ return _group; }
+    virtual osg::Group* get(){ return _transform; }
     virtual void setPosition(osg::Vec3 v);
     virtual osg::Vec3f* getPosition(){ return _position; }
     void setSpotAngle( float degrees );
-    void setMatrix( osg::Matrixf matrix ){ _group->setMatrix( matrix ); }
+    void setMatrix( osg::Matrixf matrix ){ _transform->setMatrix( matrix ); }
     void setAmbient( osg::Vec3f v ){ _light->setAmbient(osg::Vec4(v,1)); }
     void setDiffuse( osg::Vec3f v ){ _light->setDiffuse(osg::Vec4(v,1)); }
-    const osg::Matrix getMatrix(){ return _group->getMatrix(); }
+    const osg::Matrix getMatrix(){ return _transform->getMatrix(); }
 
 
 protected:
 
-    //osg::Group* _group;
-    osg::MatrixTransform* _group;
+    osg::MatrixTransform* _transform;
     osg::Vec3* _position;
     osg::Vec3* _target;

Swollen/swollen/version.cpp

@@ -1 @@
-const char* version() { const char* s = "Revision: 70M"; return s; }
+const char* version() { const char* s = "Revision: 70:71M"; return s; }

Swollen/swollen/watersurface.cpp

@@ -16 +16 @@
 #include <osg/TexGen>
 
-#include <osgDB/Registry>
 #include <osgDB/ReadFile>
-
 #include <osgUtil/TriStripVisitor>