Changeset 43

Timestamp:

Dec 10, 2004, 10:16:42 AM (20 years ago)

Author:

darran

Message:

• sky sphere remains at fixed distance from camera
• back to zero vertical water surface offset

Location:

Swollen

Files:

• bin/sky_small.jpg (modified) (previous)
• doc/contract1_hours.xls (modified) (previous)
• doc/contract2_hours.txt (modified) (1 diff)
• doc/contract2_priorities.txt (modified) (5 diffs)
• swollen/createSky.cpp (modified) (2 diffs)
• swollen/main.cpp (modified) (1 diff)
• swollen/watersurface.cpp (modified) (2 diffs)
• visualstudio/sww.suo (modified) (previous)

Swollen/doc/contract2_hours.txt

@@ -2 +2 @@
 2nd Contract Hours
 ------------------
+
+
+
+7 December, Wednesday (4 hours)
+- new distro released
+
+
+total = 105 hours (2.8 weeks)
+subtotal = 7 hours
+
 
 2 November, Tuesday (4 hours)

Swollen/doc/contract2_priorities.txt

@@ -11 +11 @@
 - Use per-vertex normals for reflection of light [4]
 - Correct scaling and origin for datasets not centered at (0,0)? [3]
-- Texture mapped topography [4]
-- Culling of triangles [5]         
+- Texture mapped topography (currently fixed as bedslope.jpg) [4]
+- Culling of triangles ('c' key to cycle through culling states) [5]
 
 
@@ -25 +25 @@
 COMPLETED:
 
-- Ability to remove light source (it's in the way sometimes) [2]
+- Ability to remove light source (it's in the way sometimes) (removed totally) [2]
+- Movement restricted to within bounding sphere (sky now stays at fixed distance 
+  from camera) [1]
+- z-scaling to emphasize vertical details (via -scale command line parameter) [1] 
+
 
 
@@ -43 +47 @@
 - 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. Swwiewer works fine.
+- Problems with Duncan's, Chris' and Stephen Roberts' machines at GA: Swollen won't render semi transparency. 
+  Swwviewer works fine.
 
 
@@ -67 +72 @@
 - Scene augmentation with OSG models [2]        
 - Optional contour lines of water surface [1]
-- z-scaling to emphasize vertical details [1] 
 - Optional height-dependent semi-transparent water surface [0]
         
@@ -78 +82 @@
 - Return to home view [2]
 - Start up with a view sight from above rather than from the side [2]
-- Movement restricted to within bounding sphere [1]
 - Command line parameters for culling, speed [1]
 - Optional colour coding for momentum [0] (Superseded)  

Swollen/swollen/createSky.cpp

@@ -4 +4 @@
 #include <osg/ShapeDrawable>
 #include <osg/Texture2D>
+#include <osg/Transform>
 #include <osg/PolygonOffset>
 #include <osgDB/Registry>
 #include <osgDB/ReadFile>
+#include <osgUtil/CullVisitor>
 
 
-osg::Geode* createSky(float radius, char* filename)
+class MoveHorizonWithEyePointTransform : public osg::Transform
+{
+
+public:
+
+    // Get the transformation matrix which moves from local coords to world coords
+    virtual bool computeLocalToWorldMatrix(osg::Matrix& matrix,osg::NodeVisitor* nv) const 
+    {
+        osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nv);
+        if (cv)
+        {
+            osg::Vec3 eyePointLocal = cv->getEyeLocal();
+            matrix.preMult(osg::Matrix::translate(eyePointLocal));
+        }
+        return true;
+    }
+
+    // Get transformation matrix which moves from world coords to local coords
+    virtual bool computeWorldToLocalMatrix(osg::Matrix& matrix,osg::NodeVisitor* nv) const
+    {
+        osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nv);
+        if (cv)
+        {
+            osg::Vec3 eyePointLocal = cv->getEyeLocal();
+            matrix.postMult(osg::Matrix::translate(-eyePointLocal));
+        }
+        return true;
+    }
+};
+
+
+
+osg::Transform* createSky(float radius, char* filename)
 {
     osg::Geode* geode = new osg::Geode;
@@ -24 +58 @@
     stateset->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
     geom->setStateSet( stateset );
- 
+
     geode->addDrawable(geom);
-    return geode;
+
+    osg::Transform* transform = new MoveHorizonWithEyePointTransform;
+    transform->setCullingActive(false);
+    transform->addChild(geode);
+
+    return transform;
 }

Swollen/swollen/main.cpp

@@ -24 +24 @@
 
 // prototypes
-osg::Geode* createSky(float radius, char* filename);
+osg::Transform* createSky(float radius, char* filename);
 
 

Swollen/swollen/watersurface.cpp

@@ -21 +21 @@
 #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.01
+#define DEF_ZOFFSET             0.00
 
 // constructor
@@ -100 +100 @@
 
     // 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 );
+    //for( unsigned int iv=0; iv < vertices.get()->size(); iv++ )
+    //  vertices.get()->at(iv) += osg::Vec3f( 0.0, 0.0, _zoffset );
 
     _geom->setVertexArray( vertices.get() );