Changeset 73

Timestamp:

Dec 23, 2004, 7:16:44 PM (20 years ago)

Author:

darran

Message:

• orientable light (toggle with 'l' key)
• bedslope lighting fixed

Location:

Swollen

Files:

• bin/light.jpg (added)
• bin/light.osg (added)
• doc/contract2_hours.txt (modified) (1 diff)
• doc/contract2_priorities.txt (modified) (5 diffs)
• images/gastacked.jpg (modified) (previous)
• swollen/directionallight.cpp (modified) (3 diffs)
• swollen/directionallight.h (modified) (1 diff)
• swollen/main.cpp (modified) (6 diffs)
• swollen/version.cpp (modified) (1 diff)
• swollen/watersurface.cpp (modified) (1 diff)

Swollen/doc/contract2_hours.txt

@@ -3 +3 @@
 ------------------
 
+23 December, Thursday (4 hours)
+- bedslope lighting
 
 22 December, Wednesday (4 hours)

Swollen/doc/contract2_priorities.txt

@@ -28 +28 @@
 
 
+
 COMPLETED:
 
@@ -34 +35 @@
 - added -nosky command-line option to appease those who want a plain background [?]
 - add -version command line flag synced with Subversion revision number (useful for debugging) [?]
-
+- Interactive positioning of light(s) [0]
+- Ability to have shading on bed-surface. This was the case with 
+  distro31052004 and is very useful with large scale topographies. 
+  Please have a look at the file Hobart_first_order_size77670.sww using 
+  both swwviewer and swollen and let Ole know what you think.
+  Perhaps default to that standard background in the absence of bedslope.jpg
+  or perhaps tie in with the geotiff item by having such a default behaviour.
 
 
@@ -44 +51 @@
 - Output coordinates defining camera position [?]
 - Ability to handle scenes with a resolution of 500,000+ triangles [3]
-- Interactive positioning of light(s) [0]
-- Ability to have shading on bed-surface. This was the case with 
-  distro31052004 and is very useful with large scale topographies. 
-  Please have a look at the file Hobart_first_order_size77670.sww using 
-  both swwviewer and swollen and let Ole know what you think.
-  Perhaps default to that standard background in the absence of bedslope.jpg
-  or perhaps tie in with the geotiff item by having such a default behaviour.
 
 
@@ -62 +62 @@
 - 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
+
 
 
 BUGS FIXED:
 
+- toggle wireframe not working on Mac
 - 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 
@@ -75 +76 @@
 - memory leak occurring when loading subsequent stages fixed by use 
   of ref_ptrs in SWWReader
+
 
 

Swollen/swollen/directionallight.cpp

@@ -22 +22 @@
     _light = new osg::Light;
     _light->setLightNum(num);
-    _light->setPosition( osg::Vec4(0,0,1,0) );
-    _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) );
+
+    // homogeneous coordinates (x,y,z,w), w=0 indicates position at infinity
+    _light->setPosition( osg::Vec4( 0, 0, 1, 0 ) );
+
+    _light->setAmbient( osg::Vec4( 0.7, 0.7, 0.7, 1.0 ) );
+    _light->setDiffuse( osg::Vec4( 1.0, 1.0, 1.0, 1.0 ) );
+    _light->setSpecular( osg::Vec4( 1.0, 1.0, 1.0, 1.0) );
 
     // Scenegraph node
@@ -35 +38 @@
     _transform->addChild( _source );
 
-    // create marker cylinder and rotate towards origin
-    _marker = new osg::Geode;
-    _marker->setName("directionallight");
-    _shape = new osg::Cylinder;
-    _shape->setRadius( DEF_DEFAULT_CYLINDER_RADIUS );
-    _shape->setHeight( DEF_DEFAULT_CYLINDER_HEIGHT );
-    _shape->setCenter( osg::Vec3(0,0,0) );
-    _marker->addDrawable( new osg::ShapeDrawable(_shape) );
+
+    // marker geometry, texture and state
+    _marker = osgDB::readNodeFile( "light.osg" );
     _transform->addChild( _marker );
-
-    // marker geometry texture
-    osg::Texture2D* texture = new osg::Texture2D;
-    texture->setDataVariance( osg::Object::STATIC );
-    texture->setBorderColor( osg::Vec4(1.0f,1.0f,1.0f,0.5f) );
-    texture->setWrap( osg::Texture::WRAP_S, osg::Texture::REPEAT );
-    texture->setImage( osgDB::readImageFile("../images/gastacked.jpg") );
-
-    // state
-    _stateset = new osg::StateSet;
-    _stateset->setTextureAttributeAndModes( 0, texture, osg::StateAttribute::ON );
-    _marker->setStateSet( _stateset );
 
 
@@ -65 +51 @@
 void DirectionalLight::setPosition(osg::Vec3 v)
 {
+
+    //std::cout << "[DirectionalLight::setPosition] vector = " << v << std::endl;
     osg::Vec3 origindir;
     osg::Quat quat;

Swollen/swollen/directionallight.h

@@ -51 +51 @@
     osg::LightSource* _source;
 
-    osg::Geode* _marker;
+    osg::Node* _marker;
     osg::Cylinder* _shape;
     osg::Geometry* _geom;

Swollen/swollen/main.cpp

@@ -57 +57 @@
     viewer.setUpViewer( osgProducer::Viewer::STANDARD_SETTINGS );
     viewer.setClearColor( osg::Vec4(DEF_BACKGROUND_COLOUR) );
-    viewer.getCamera(0)->getRenderSurface()->setWindowRectangle(200,100,800,600);
+    viewer.getCamera(0)->getRenderSurface()->setWindowRectangle(200,300,800,600);
     viewer.getCullSettings().setComputeNearFarMode( osg::CullSettings::COMPUTE_NEAR_FAR_USING_PRIMITIVES );
 
@@ -137 +137 @@
     // Lighting
     DirectionalLight* light = new DirectionalLight(rootStateSet);
-    light->setPosition( osg::Vec3(0,1,0) );  // z is up
-    // spotlight->setSpotAngle( 45.0 );
+    light->setPosition( osg::Vec3(0,0,2) );  // z is up
 
 
@@ -181 +180 @@
 
     // initial light position
-    CustomTrackballManipulator* trackball = viewer.getTrackball();
-    trackball->setNode( model );
-    trackball->setAutoComputeHomePosition( false );
-    trackball->setHomePosition(
-        osg::Vec3d(0,1,0),    // location
-        osg::Vec3d(0,0,0),     // target
-        osg::Vec3d(0,0,1) );   // up vector
-    trackball->moveToHome();
-    trackball->disable();
+    CustomTrackballManipulator* lightmanipulator = viewer.getTrackball();
+    lightmanipulator->setNode( model );
+    lightmanipulator->setAutoComputeHomePosition( false );
+    lightmanipulator->setByInverseMatrix( osg::Matrixd( -0.707107, -0.408248,  0.57735,  0.0,
+                                                         0.0,       0.816497,  0.57735,  0.0,
+                                                        -0.707107,  0.408248, -0.57735,  0.0,
+                                                         0.0,       0.0,       2.0,      1.0 ) );
+    lightmanipulator->disable();
 
 
@@ -227 +225 @@
 
         // light position manipulator
-        if( trackball->isEnabled() )
+        if( lightmanipulator->isEnabled() )
         {
-            //osg::Matrixd matrix = trackball->getInverseMatrix();
-            osg::Matrixd matrix = trackball->getMatrix();
+            osg::Matrixd matrix = lightmanipulator->getInverseMatrix();
+            //std::cout << matrix << std::endl;
             osg::Vec3d position = matrix.getTrans();
-            //std::cout << "trackball position x: " << position. << std::endl;
-            light->setPosition( -position );
+            light->setPosition( position );
         }
 
@@ -244 +241 @@
         if( event_handler->toggleManipulatorMode() )
         {
-            if( trackball->isEnabled() )
+            if( lightmanipulator->isEnabled() )
             {
-                trackball->disable();
+                lightmanipulator->disable();
                 terrainmanipulator->enable();
                 light->hide();
@@ -252 +249 @@
             else
             {
-                trackball->enable();
+                lightmanipulator->enable();
                 terrainmanipulator->disable();
                 light->show();

Swollen/swollen/version.cpp

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

Swollen/swollen/watersurface.cpp

@@ -19 +19 @@
 #include <osgUtil/TriStripVisitor>
 
-#define DEF_ALPHA_THRESHOLD 0.01
+#define DEF_ALPHA_THRESHOLD 0.05