Changeset 36

Timestamp:

Dec 2, 2004, 9:57:54 AM (20 years ago)

Author:

darran

Message:

• uniform scaling
• spotlight removed
• start-up on frame 1 bug fixed

Location:

Swollen

Files:

• doc/contract2_priorities.txt (modified) (6 diffs)
• include/swwreader.h (modified) (1 diff)
• swollen/main.cpp (modified) (1 diff)
• swollen/spotlight.cpp (modified) (1 diff)
• swollen/watersurface.cpp (modified) (1 diff)
• swwreader/swwreader.cpp (modified) (4 diffs)

Swollen/doc/contract2_priorities.txt

@@ -25 +25 @@
 COMPLETED:
 
-
-
+- Ability to remove light source (it's in the way sometimes) [2]
 
 
@@ -34 +33 @@
 - Optional colour coding of water surface based on arbitrary fields 
   (e.g. stage, speed, ..) [4]
-- Ability to remove light source (it's in the way sometimes) [2]  
 - Output coordinates defining camera position [?]
-- Interactive positioning of light(s) [1]
+- Interactive positioning of light(s) [?]
 
 
@@ -44 +42 @@
 - cairns dataset reveals popping triangles (zbuffer?)
 - steepcull dataset reveals steep angle cull problem
-- nonuniform scaling into unit cube should be uniform
-- dragging sww onto swollen (all in one directory) does not produce the same results as calling from command line (All jpg's gone and no reflection)
+- 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.
-- Swollen starts up showing first time step, not zeroth (even though clock shows zero). Stepping one forward and one back, bring things into sync.
+
 
 
@@ -53 +50 @@
 BUGS FIXED:
 
+- 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]
+- nonuniform scaling into unit cube should be uniform [2004-12-01]
 - onscreen text no longer obscured by zoomed model
 - removed lighting from onscreen text, now constant colour
@@ -69 +69 @@
 - z-scaling to emphasize vertical details [1] 
 - Optional height-dependent semi-transparent water surface [0]
-- Possibility of replacing graphics for bed-texture [2]
         
 
@@ -107 +106 @@
 - Revisit use of culling steep epsilon [3]      
 - SWW netcdf meta information [0]
+
+

Swollen/include/swwreader.h

@@ -133 +133 @@
     float _xscale, _yscale, _zscale;
     float _xoffset, _yoffset, _zoffset;
+    float _xcenter, _ycenter, _zcenter;
 
     // stack of return values from netcdf function calls

Swollen/swollen/main.cpp

@@ -114 +114 @@
 
 
-    // center model in x and y (now done in swwreader)
-    /*
-    osg::BoundingBox bbox = bedslope->getBound();
-    float scale = 1.0/bbox.radius();
-    model->setPosition( -bbox.center()*scale );
-    */
-
     // FIXME: should be reasonable default and adjustable
-    model->setScale( osg::Vec3(1.0, 1.0, 0.2) );
+    model->setScale( osg::Vec3(1.0, 1.0, 1.0) );
 
     // sky

Swollen/swollen/spotlight.cpp

@@ -41 +41 @@
     _shape->setCenter( osg::Vec3(0,0,0) );
     _marker->addDrawable( new osg::ShapeDrawable(_shape) );
-    _group->addChild(_marker);
+
+    // omit marker cone for now (FIX ME)
+    // _group->addChild(_marker);
 
     setPosition( osg::Vec3(0,0,1) );  // default overhead

Swollen/swollen/watersurface.cpp

@@ -44 +44 @@
 
     // initial geometry
-    setTimeStep(1);
+    setTimeStep(0);
 
     _material->setDiffuse(osg::Material::FRONT, osg::Vec4(DEF_WATER_COLOUR));

Swollen/swwreader/swwreader.cpp

@@ -102 +102 @@
     float ymin, ymax, yrange;
     float zmin, zmax, zrange;
-    xmin = _px[0];
-    xmax = _px[0];
-    ymin = _py[0];
-    ymax = _py[0];
-    zmin = _pz[0];
-    zmax = _pz[0];
+    float aspect_ratio;
+    xmin = _px[0]; xmax = _px[0];
+    ymin = _py[0]; ymax = _py[0];
+    zmin = _pz[0]; zmax = _pz[0];
     for( iv=1; iv < _npoints; iv++ )
     {
@@ -117 +115 @@
       if( _pz[iv] > zmax ) zmax = _pz[iv];
     }
-    _xscale = 1.0/(xmax - xmin);  _xoffset = xmin;
-    _yscale = 1.0/(ymax - ymin);  _yoffset = ymin;
-    _zscale = (zmax==zmin) ? 1.0 : 1.0/(zmax - zmin);  _zoffset = zmin;
-
-#ifdef DEBUG
-    std::cout << "xmin: " << xmin << std::endl;
-    std::cout << "xmax: " << xmax << std::endl;
-    std::cout << "ymin: " << ymin << std::endl;
-    std::cout << "ymax: " << ymax << std::endl;
-    std::cout << "zmin: " << zmin << std::endl;
-    std::cout << "zmax: " << zmax << std::endl;
-    std::cout << "xscale: " << _xscale << std::endl;
-    std::cout << "yscale: " << _yscale << std::endl;
-    std::cout << "zscale: " << _zscale << std::endl;
-#endif
+
+    xrange = xmax - xmin;
+    yrange = ymax - ymin;
+    aspect_ratio = xrange/yrange;
+    if( aspect_ratio > 1.0 )
+      {
+        _xscale = 1.0 / xrange;
+        _xoffset = xmin;
+        _xcenter = 0.5;
+
+        _yscale = _xscale;
+        _yoffset = ymin;
+        _ycenter = 0.5 / aspect_ratio;
+
+        _zscale = _xscale;
+        _zoffset = zmin;
+        _zcenter = 0.0;
+      }
+    else
+      {
+        _yscale = 1.0 / yrange;
+        _yoffset = ymin;
+        _ycenter = 0.5;
+
+        _xscale = _yscale;
+        _xoffset = xmin;
+        _xcenter = 0.5 / aspect_ratio;
+
+        _zscale = _yscale;
+        _zoffset = zmin;
+        _zcenter = 0.0;
+      }
+
+    osg::notify(osg::INFO) << "[SWWReader] xmin: " << xmin <<  std::endl;
+    osg::notify(osg::INFO) << "[SWWReader] xmax: " << xmax <<  std::endl;
+    osg::notify(osg::INFO) << "[SWWReader] xscale: " << _xscale <<  std::endl;
+    osg::notify(osg::INFO) << "[SWWReader] ymin: " << ymin <<  std::endl;
+    osg::notify(osg::INFO) << "[SWWReader] ymax: " << ymax <<  std::endl;
+    osg::notify(osg::INFO) << "[SWWReader] yscale: " << _yscale <<  std::endl;
+    osg::notify(osg::INFO) << "[SWWReader] zmin: " << zmin <<  std::endl;
+    osg::notify(osg::INFO) << "[SWWReader] zmax: " << zmax <<  std::endl;
+    osg::notify(osg::INFO) << "[SWWReader] zscale: " << _zscale <<  std::endl;
+
 
     // culling defaults
@@ -155 +181 @@
     _bedslopevertices = new osg::Vec3Array;
     for (iv=0; iv < _npoints; iv++)
-      _bedslopevertices->push_back( osg::Vec3( (_px[iv]-_xoffset)*_xscale - 0.5, 
-                                               (_py[iv]-_yoffset)*_yscale - 0.5, 
-                                               (_pz[iv]-_zoffset)*_zscale - 0.5) );
+      _bedslopevertices->push_back( osg::Vec3( (_px[iv]-_xoffset)*_xscale - _xcenter, 
+                                               (_py[iv]-_yoffset)*_yscale - _ycenter, 
+                                               (_pz[iv]-_zoffset)*_zscale - _zcenter) );
 
     // load bedslope index array, pvolumes array indexes into x, y and z
@@ -218 +244 @@
     for (iv=0; iv < _npoints; iv++)
         _stagevertices->push_back( osg::Vec3(
-                                             (_px[iv]-_xoffset)*_xscale - 0.5, 
-                                             (_py[iv]-_yoffset)*_yscale - 0.5, 
-                                             (_pstage[iv]-_zoffset)*_zscale - 0.5) );
+                                             (_px[iv]-_xoffset)*_xscale - _xcenter, 
+                                             (_py[iv]-_yoffset)*_yscale - _ycenter, 
+                                             (_pstage[iv]-_zoffset)*_zscale - _zcenter) );
 
     // stage index and per primitive normal and centroid arrays