Changeset 3630 for trunk/packages/vizservers/nanovis/Volume.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/Volume.cpp (modified) (5 diffs)

trunk/packages/vizservers/nanovis/Volume.cpp

@@ -31 +31 @@
 double Volume::valueMax = 1.0;
 
-Volume::Volume(float x, float y, float z,
-               int w, int h, int d,
+Volume::Volume(int w, int h, int d,
                int n, float *data,
                double v0, double v1, double nonZeroMin) :
@@ -50 +49 @@
     _nonZeroMin(nonZeroMin),
     _tex(NULL),
-    _location(x, y, z),
+    _position(0,0,0),
+    _scale(1,1,1),
     _numSlices(512),
     _enabled(true),
@@ -65 +65 @@
     int fcount = _width * _height * _depth * _numComponents;
     _data = new float[fcount];
-    if (data != NULL) {
-        TRACE("data is copied");
-        memcpy(_data, data, fcount * sizeof(float));
-        _tex->initialize(_data);
-    } else {
-        TRACE("data is null");
-        memset(_data, 0, sizeof(_width * _height * _depth * _numComponents * 
-                                sizeof(float)));
-        _tex->initialize(_data);
-    }
+    memcpy(_data, data, fcount * sizeof(float));
+    _tex->initialize(_data);
 
     _id = _tex->id();
@@ -83 +75 @@
     //The default location of cut plane is in the middle of the data.
     _plane.clear();
-    addCutplane(1, 0.5f);
-    addCutplane(2, 0.5f);
-    addCutplane(3, 0.5f);
+    addCutplane(CutPlane::X_AXIS, 0.5f);
+    addCutplane(CutPlane::Y_AXIS, 0.5f);
+    addCutplane(CutPlane::Z_AXIS, 0.5f);
 
     TRACE("Leave");
@@ -98 +90 @@
 }
 
-void Volume::getWorldSpaceBounds(Vector3f& bboxMin, Vector3f& bboxMax) const
+void Volume::setData(float *data, double v0, double v1, double nonZeroMin)
 {
-    Vector3f scale = getPhysicalScaling();
+    int fcount = _width * _height * _depth * _numComponents;
+    memcpy(_data, data, fcount * sizeof(float));
+    _tex->update(_data);
+    wAxis.setRange(v0, v1);
+    _nonZeroMin = nonZeroMin;
+    updatePending = true;
+}
 
-    Matrix4x4d mat;
-    mat.makeTranslation(_location);
-    Matrix4x4d mat2;
-    mat2.makeScale(scale);
-
-    mat.multiply(mat2);
-
-    bboxMin.set(FLT_MAX, FLT_MAX, FLT_MAX);
-    bboxMax.set(-FLT_MAX, -FLT_MAX, -FLT_MAX);
-
-    Vector3f modelMin(0, 0, 0);
-    Vector3f modelMax(1, 1, 1);
-
-    Vector4f bvert[8];
-    bvert[0] = Vector4f(modelMin.x, modelMin.y, modelMin.z, 1);
-    bvert[1] = Vector4f(modelMax.x, modelMin.y, modelMin.z, 1);
-    bvert[2] = Vector4f(modelMin.x, modelMax.y, modelMin.z, 1);
-    bvert[3] = Vector4f(modelMin.x, modelMin.y, modelMax.z, 1);
-    bvert[4] = Vector4f(modelMax.x, modelMax.y, modelMin.z, 1);
-    bvert[5] = Vector4f(modelMax.x, modelMin.y, modelMax.z, 1);
-    bvert[6] = Vector4f(modelMin.x, modelMax.y, modelMax.z, 1);
-    bvert[7] = Vector4f(modelMax.x, modelMax.y, modelMax.z, 1);
-
-    for (int i = 0; i < 8; i++) {
-        Vector4f worldVert = mat.transform(bvert[i]);
-        if (worldVert.x < bboxMin.x) bboxMin.x = worldVert.x;
-        if (worldVert.x > bboxMax.x) bboxMax.x = worldVert.x;
-        if (worldVert.y < bboxMin.y) bboxMin.y = worldVert.y;
-        if (worldVert.y > bboxMax.y) bboxMax.y = worldVert.y;
-        if (worldVert.z < bboxMin.z) bboxMin.z = worldVert.z;
-        if (worldVert.z > bboxMax.z) bboxMax.z = worldVert.z;
-    }
+void Volume::getBounds(Vector3f& bboxMin, Vector3f& bboxMax) const
+{
+    bboxMin.set(xAxis.min(), yAxis.min(), zAxis.min());
+    bboxMax.set(xAxis.max(), yAxis.max(), zAxis.max());
 }