Changeset 5723 for nanovis


Ignore:
Timestamp:
Jun 18, 2015, 5:32:37 PM (4 years ago)
Author:
ldelgass
Message:

Sync with nanovis trunk: merge r5722 and remove global bounds vars.

Location:
nanovis/branches/1.2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.2

  • nanovis/branches/1.2/Flow.cpp

    r5702 r5723  
    406406    volume->setPosition(pos);
    407407
    408     Volume::updatePending = true;
    409408    return volume;
    410409}
     
    427426    _volume->specularLevel(_sv.specular);
    428427    _volume->specularExponent(_sv.specularExp);
    429     _volume->visible(_sv.showVolume);
    430 
    431     Volume::updatePending = true;
    432 }
     428}
  • nanovis/branches/1.2/nanovis.cpp

    r5718 r5723  
    8484NanoVis::HeightMapHashmap NanoVis::heightMapTable;
    8585
    86 float NanoVis::xMin = FLT_MAX;
    87 float NanoVis::xMax = -FLT_MAX;
    88 float NanoVis::yMin = FLT_MAX;
    89 float NanoVis::yMax = -FLT_MAX;
    90 float NanoVis::zMin = FLT_MAX;
    91 float NanoVis::zMax = -FLT_MAX;
    9286BBox NanoVis::sceneBounds;
    9387
     
    811805    }
    812806    delete volume;
     807    Volume::updatePending = true;
    813808}
    814809
     
    849844        delete itr->second;
    850845        flowTable.erase(itr);
     846        Flow::updatePending = true;
    851847    }
    852848}
     
    876872    TRACE("Enter");
    877873
    878     /*
    879      * Step 1. Get the overall min and max magnitudes of all the
    880      *         flow vectors.
    881      */
     874    double xMin, xMax, yMin, yMax, zMin, zMax;
     875    xMin = yMin = zMin = DBL_MAX;
     876    xMax = yMax = zMax = -DBL_MAX;
    882877    Flow::magMin = DBL_MAX;
    883878    Flow::magMax = -DBL_MAX;
    884 
    885879    for (FlowHashmap::iterator itr = flowTable.begin();
    886880         itr != flowTable.end(); ++itr) {
     
    929923    TRACE("magMin=%g magMax=%g", Flow::magMin, Flow::magMax);
    930924
    931     /*
    932      * Step 2. Generate the vector field from each data set.
    933      */
    934925    for (FlowHashmap::iterator itr = flowTable.begin();
    935926         itr != flowTable.end(); ++itr) {
  • nanovis/branches/1.2/nanovis.h

    r5718 r5723  
    146146    static HeightMapHashmap heightMapTable;
    147147
    148     static float xMin, xMax, yMin, yMax, zMin, zMax;
    149148    static vrmath::BBox sceneBounds;
    150149
Note: See TracChangeset for help on using the changeset viewer.