Changeset 65

Timestamp:

Dec 15, 2004, 11:51:37 PM (20 years ago)

Author:

darran

Message:

 

Location:

Swollen

Files:

• doc/contract2_hours.txt (modified) (1 diff)
• doc/contract2_priorities.txt (modified) (2 diffs)
• swollen/bedslope.cpp (modified) (1 diff)
• swollen/bedslope.h (modified) (2 diffs)
• swollen/createSky.cpp (modified) (2 diffs)
• swollen/customviewer.cpp (modified) (1 diff)
• swollen/main.cpp (modified) (1 diff)
• swollen/spotlight.cpp (modified) (2 diffs)

Swollen/doc/contract2_hours.txt

@@ -4 +4 @@
 
 
+15 December, Wednesday (4 hours)
+- changed Visual Studio solution to compile new GDAL code
+- work on understanding lack of bedslope lighting
 
-15 December, Tuesday (4 hours)
+14 December, Tuesday (4 hours)
 - added -texture <filename> option for bedslope image
 - other code cleanups related to handling georeferenced data
 - small amount of work on background thread for data read
 
-14 December, Monday (6 hours)
+15 December, Monday (6 hours)
 - visit to GA, swollen now compiling on-site under Windows/Visual Studio .NET
 - added command line params for tweaking transparency (see "swollen -help")

Swollen/doc/contract2_priorities.txt

@@ -49 +49 @@
 - cairns dataset reveals popping triangles (zbuffer?)
 - steepcull dataset reveals steep angle cull problem
-- dragging sww onto swollen (all in one directory) does not produce the same results as calling from command line
-- Problems with Duncan's, Chris' and Stephen Roberts' machines at GA: Swollen won't render semi transparency. 
-  Swwviewer works fine. (This appeared to work on Dunca's computer 13/12/4?).
+- dragging sww onto swollen (all in one directory) does not produce the same results as 
+  calling from command line
+- Problems with Duncan's, Chris' and Stephen Roberts' machines at GA: Swollen won't render semi 
+  transparency. Swwviewer works fine. (This appeared to work on Dunca's computer 13/12/4?).
 - toggle wireframe not working on Mac
 
@@ -57 +58 @@
 BUGS FIXED:
 
+- can no longer make model disappear by pushing back through sky [2004-12-15]
 - Swollen starts up showing first time step, not zeroth (even though clock shows zero). Stepping one 
   forward and one back, bring things into sync. [2004-12-01]

Swollen/swollen/bedslope.cpp

@@ -47 +47 @@
     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->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->setEmission( osg::Material::FRONT_AND_BACK, osg::Vec4(0.0, 0.0, 0.0, 1.0) );
+
+
     // state
     _stateset = new osg::StateSet;
-    //_stateset->setTextureAttributeAndModes( 0, texture, osg::StateAttribute::ON );
+    _stateset->setTextureAttributeAndModes( 0, texture, osg::StateAttribute::ON );
+    _stateset->setAttributeAndModes(_material, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE );
     _stateset->setMode( GL_BLEND, osg::StateAttribute::ON );
     _stateset->setMode( GL_LIGHTING, osg::StateAttribute::ON );

Swollen/swollen/bedslope.h

@@ -16 +16 @@
 #include <SWWReader.h>
 #include <osg/Geode>
+#include <osg/Material>
 #include <osg/StateAttribute>
 
@@ -35 +36 @@
     osg::Geometry* _geom;
     osg::StateSet* _stateset;
+    osg::Material* _material;
     virtual ~BedSlope(){;}
 

Swollen/swollen/createSky.cpp

@@ -1 +1 @@
 
+#include <osg/Depth>
 #include <osg/Geode>
 #include <osg/Geometry>
@@ -57 +58 @@
     stateset->setTextureAttributeAndModes( 0, texture, osg::StateAttribute::ON );
     stateset->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
+
+    // to prevent being able to push the model back through the sky, we
+    // do two things (i) ensure sky is drawn first, and (ii) skip writing
+    // to the depth buffer
+    stateset->setRenderBinDetails( -1, "RenderBin" );
+    osg::Depth* depth = new osg::Depth();
+    depth->setWriteMask( false );
+    stateset->setAttributeAndModes( depth, osg::StateAttribute::ON );
+
     geom->setStateSet( stateset );
-    geom->setUseDisplayList(true);
-
-
+    geom->setUseDisplayList( true );
     geode->addDrawable(geom);
 
     osg::Transform* transform = new MoveHorizonWithEyePointTransform;
-    transform->setCullingActive(false);
-    transform->addChild(geode);
+    transform->setCullingActive( false );
+    transform->addChild( geode );
 
     return transform;

Swollen/swollen/customviewer.cpp

@@ -57 +57 @@
     
     
-    if (!_updateVisitor) _updateVisitor = new osgUtil::UpdateVisitor;    
+    if (!_updateVisitor) _updateVisitor = new osgUtil::UpdateVisitor;
     _updateVisitor->setFrameStamp(_frameStamp.get());
 

Swollen/swollen/main.cpp

@@ -125 +125 @@
     // Lighting
     SpotLight* spotlight = new SpotLight(rootStateSet);
-    spotlight->setPosition( osg::Vec3(2,0,2) );  // z is up
+    spotlight->setPosition( osg::Vec3(1,0,1) );  // z is up
     spotlight->setSpotAngle( 45.0 );
 

Swollen/swollen/spotlight.cpp

@@ -7 +7 @@
 #define DEF_DEFAULT_ANGLE 45
 #define DEF_DEFAULT_EXPONENT 10
-#define DEF_DEFAULT_CONE_RADIUS 0.05
-#define DEF_DEFAULT_CONE_HEIGHT 0.1
+#define DEF_DEFAULT_CONE_RADIUS 0.125
+#define DEF_DEFAULT_CONE_HEIGHT 0.25
 
 
@@ -23 +23 @@
     _light->setAmbient(osg::Vec4(0.0,0.0,0.0,1));
     _light->setDiffuse(osg::Vec4(1,1,1,1));
-    _light->setSpecular(osg::Vec4(1,0,0,1));
+    _light->setSpecular(osg::Vec4(1,1,1,1));
     _light->setSpotCutoff(DEF_DEFAULT_ANGLE);
     _light->setSpotExponent(DEF_DEFAULT_EXPONENT);