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

trunk/packages/vizservers/nanovis/Grid.cpp

@@ -38 +38 @@
 }
 
+void Grid::getBounds(vrmath::Vector3f& bboxMin, vrmath::Vector3f& bboxMax) const
+{
+    bboxMin.set(xAxis.min(), yAxis.min(), zAxis.min());
+    bboxMax.set(xAxis.min() + xAxis.range(),
+                yAxis.min() + yAxis.range(),
+                zAxis.min() + zAxis.range());
+}
+
 void Grid::render()
 {
@@ -55 +63 @@
     glPushMatrix();
 
-    double xDataRange = xAxis.dataMax() - xAxis.dataMin();
-    double yDataRange = yAxis.dataMax() - yAxis.dataMin();
-    double zDataRange = zAxis.dataMax() - zAxis.dataMin();
-
-    double paspectX = 1.0f;
-    double paspectY = yDataRange / xDataRange;
-    double paspectZ = zDataRange / xDataRange;
- 
-    double xscale = xAxis.range() / xDataRange;
-    double yscale = yAxis.range() / xDataRange;
-    double zscale = zAxis.range() / xDataRange;
-
-    double xoffset = (xAxis.min() - xAxis.dataMin()) * xAxis.scale();
-    double yoffset = (yAxis.min() - yAxis.dataMin()) * yAxis.scale();
-    double zoffset = (zAxis.min() - zAxis.dataMin()) * zAxis.scale();
-
-    TRACE("Axis ranges: %g %g %g", xAxis.range(), yAxis.range(), zAxis.range());
-    TRACE("Axis scales: %g %g %g", xAxis.scale(), yAxis.scale(), zAxis.scale());
-    TRACE("Axis min/max: %g,%g %g,%g %g,%g",
-          xAxis.min(), xAxis.max(), 
-          yAxis.min(), yAxis.max(),
-          zAxis.min(), zAxis.max());
-    TRACE("Axis vmin/vmax: %g,%g %g,%g %g,%g",
-          xAxis.dataMin(), xAxis.dataMax(), 
-          yAxis.dataMin(), yAxis.dataMax(),
-          zAxis.dataMin(), zAxis.dataMax());
-    TRACE("paspect: %g %g %g", paspectX, paspectY, paspectZ);
-    TRACE("scale: %g %g %g", xscale, yscale, zscale);
-
-    glTranslatef(-0.5f * paspectX, -0.5f * paspectY, -0.5f * paspectZ);
-    glScalef(xscale, yscale, zscale);
-    glTranslatef(xoffset, yoffset, zoffset);
+    glTranslatef(xAxis.min(), yAxis.min(), zAxis.min());
+    glScalef(xAxis.range(), yAxis.range(), zAxis.range());
 
     glLineWidth(2.0f);