Changeset 60

Timestamp:

Dec 14, 2004, 5:34:50 PM (20 years ago)

Author:

darran

Message:

• wireframe not working with displaylist(true), fix it
• should use alphafunc to cull alpha=0 triangles, this will hopefully stop z fighting

Location:

Swollen

Files:

• doc/contract2_priorities.txt (modified) (2 diffs)
• swollen/main.cpp (modified) (1 diff)
• swollen/watersurface.cpp (modified) (1 diff)
• swwreader/swwreader.cpp (modified) (2 diffs)

Swollen/doc/contract2_priorities.txt

@@ -50 +50 @@
 - 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?).
+- 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
 
 
@@ -90 +92 @@
 - Concept of 'buildings' and shaking them [0]
 - Interactive positioning of light(s) [0]
-
-
 - user feedback should differentiate between "sww file not found" and
   "sww file couldn't read" [1]

Swollen/swollen/main.cpp

@@ -167 +167 @@
     viewer.getTrackball()->setAutoComputeHomePosition( false );
     viewer.getTrackball()->setHomePosition(
-        osg::Vec3d(0,-3,2),    // camera location
+        osg::Vec3d(0,-3,0),    // camera location
         osg::Vec3d(0,0,0),     // camera target
         osg::Vec3d(0,0,1) );   // camera up vector

Swollen/swollen/watersurface.cpp

@@ -36 +36 @@
     _node->setStateSet(_stateset);
 
-    _geom->setUseDisplayList(true);
+    // FIXME: if set to true, wireframe doesn't work - need to dirty to force update?
+    _geom->setUseDisplayList( false );
 
     // initial geometry

Swollen/swwreader/swwreader.cpp

@@ -284 +284 @@
 
     // stage height above bedslope mapped as alpha value
-    //
-    // Transparancy alpha is calculated as
-    //
-    // alpha = min( a(h-hmin) + alphamin, alphamax),  h >= hmin
-    // alpha = 0,                                     h < hmin
-    //
+    //      alpha = min( a(h-hmin) + alphamin, alphamax),  h >= hmin
+    //      alpha = 0,                                     h < hmin
     // where a = (alphamax-alphamin)/(hmax-hmin)
-    
-    float alpha, height, _alphascale;
-    _alphascale = (_alphamax - _alphamin) / (_heightmax - _heightmin);
+    float alpha, height, alphascale;
+    alphascale = (_alphamax - _alphamin) / (_heightmax - _heightmin);
     _stagecolors = new osg::Vec4Array;
     for (iv=0; iv < _npoints; iv++)
@@ -302 +297 @@
           alpha = 0.0;
         } else {
-          alpha = _alphascale*(height - _heightmin) + _alphamin;
+          alpha = alphascale*(height - _heightmin) + _alphamin;
           if( alpha > _alphamax ) alpha = _alphamax;      
         }