Changeset 3630 for trunk/packages/vizservers/nanovis/LIC.cpp

Timestamp:

Apr 16, 2013, 12:52:20 AM (11 years ago)

Author:

ldelgass

Message:

Nanovis refactoring to fix problems with scaling and multiple results.
Do rendering in world space to properly place and scale multiple data sets.
Also fix flows to reduce resets of animations. More work toward removing
Cg dependency. Fix panning to convert viewport coords to world coords.

File:

• trunk/packages/vizservers/nanovis/LIC.cpp (modified) (16 diffs)

trunk/packages/vizservers/nanovis/LIC.cpp

@@ -24 +24 @@
 using namespace vrmath;
 
-LIC::LIC(int size, int width, int height, int axis, 
+LIC::LIC(FlowSliceAxis axis, 
          float offset) :
-    _width(width),
-    _height(height),
-    _size(size),
+    _width(NPIX),
+    _height(NPIX),
+    _size(NMESH),
     _scale(1.0f, 1.0f, 1.0f),
     _origin(0, 0, 0),
@@ -41 +41 @@
     _disListID(0),
     _vectorFieldId(0),
-    _activate(false)
-{
-    _sliceVector = new float[_size*_size*4];
+    _visible(false)
+{
+    _sliceVector = new float[_size * _size * 4];
     memset(_sliceVector, 0, sizeof(float) * _size * _size * 4);
 
@@ -104 +104 @@
 
     _renderVelShader = new Shader();
-    _renderVelShader->loadFragmentProgram("render_vel.cg", "main");
+    _renderVelShader->loadFragmentProgram("render_vel.cg");
 
     makePatterns();
@@ -178 +178 @@
 }
 
-void LIC::makeMagnitudes()
+void
+LIC::makeMagnitudes()
 {
     GLubyte mag[NMESH][NMESH][4];
@@ -246 +247 @@
 
     switch (_axis) {
-    case 0:
+    case AXIS_X:
         _renderVelShader->setFPParameter3f("projection_vector", 0., 1., 1.);
         break;
-    case 1:
+    case AXIS_Y:
         _renderVelShader->setFPParameter3f("projection_vector", 1., 0., 1.);
         break;
     default:
-    case 2:
+    case AXIS_Z:
         _renderVelShader->setFPParameter3f("projection_vector", 1., 1., 0.);
         break;
@@ -261 +262 @@
     {
         switch (_axis) {
-        case 0:
+        case AXIS_X:
             glTexCoord3f(_offset, 0., 0.); glVertex2f(0.,    0.);
             glTexCoord3f(_offset, 1., 0.); glVertex2f(_size, 0.);
@@ -267 +268 @@
             glTexCoord3f(_offset, 0., 1.); glVertex2f(0.,    _size);
             break;
-        case 1:
+        case AXIS_Y:
             glTexCoord3f(0., _offset, 0.); glVertex2f(0.,    0.);
             glTexCoord3f(1., _offset, 0.); glVertex2f(_size, 0.);
@@ -273 +274 @@
             glTexCoord3f(0., _offset, 1.); glVertex2f(0.,    _size);
             break;
-        case 2:
+        case AXIS_Z:
             glTexCoord3f(0., 0., _offset); glVertex2f(0.,    0.);
             glTexCoord3f(1., 0., _offset); glVertex2f(_size, 0.);
@@ -428 +429 @@
 LIC::render()
 {
-    if (_vectorFieldId == 0) {
+    if (_vectorFieldId == 0 || !_visible) {
         return;
     }
@@ -451 +452 @@
     glBegin(GL_QUADS);
     switch (_axis) {
-    case 0:
+    case AXIS_X:
         glNormal3f(1, 0, 0);
         glTexCoord2f(0, 0); glVertex3f(_offset, 0, 0);
@@ -458 +459 @@
         glTexCoord2f(0, 1); glVertex3f(_offset, 0, 1);
         break;
-    case 1:
+    case AXIS_Y:
         glNormal3f(0, 1, 0);
         glTexCoord2f(0, 0); glVertex3f(0, _offset, 0);
@@ -465 +466 @@
         glTexCoord2f(0, 1); glVertex3f(0, _offset, 1);
         break;
-    case 2:
+    case AXIS_Z:
         glNormal3f(0, 0, 1);
         glTexCoord2f(0, 0); glVertex3f(0, 0, _offset);
@@ -483 +484 @@
 
 void 
-LIC::setVectorField(unsigned int texID, const Vector3f& origin, 
-                      float scaleX, float scaleY, float scaleZ, float max)
-{
-    TRACE("LIC: vector field is assigned [%d]", texID);
-    _vectorFieldId = texID;
-    _origin = origin;
-    _scale = Vector3f(scaleX, scaleY, scaleZ);
-    _max = max;
+LIC::setVectorField(Volume *volume)
+{
+    TRACE("LIC: vector field is assigned [%d]", volume->textureID());
+
+    _vectorFieldId = volume->textureID();
+    Vector3f bmin, bmax;
+    volume->getBounds(bmin, bmax);
+    _origin = bmin;
+    _scale.set(bmax.x-bmin.x, bmax.y-bmin.y, bmax.z-bmin.z);
+    _max = volume->wAxis.max();
 
     makePatterns();
@@ -507 +510 @@
     //TRACE("(xi yi) = (%d %d), ", xi, yi);
    switch (_axis) {
-   case 0:
+   case AXIS_X:
        vx = _sliceVector[4 * (xi+yi*_size)+2];
        vy = _sliceVector[4 * (xi+yi*_size)+1];
        break;
-   case 1:
+   case AXIS_Y:
        vx = _sliceVector[4 * (xi+yi*_size)];
        vy = _sliceVector[4 * (xi+yi*_size)+2];
        break;
-   case 2:
+   case AXIS_Z:
    default:
        vx = _sliceVector[4 * (xi+yi*_size)];
@@ -537 +540 @@
 
 void 
-LIC::setOffset(float offset)
+LIC::setSlicePosition(float offset)
 {
     _offset = offset;
@@ -543 +546 @@
 }
 
-void LIC::setAxis(int axis)
+void LIC::setSliceAxis(FlowSliceAxis axis)
 {
     _axis = axis;