Changeset 837 for trunk/vizservers/nanovis/HeightMap.cpp

Timestamp:

Jan 2, 2008 11:00:15 AM (17 years ago)

Author:

vrinside

Message:

Modified scaling grids and heightmaps in order to match the grid and the heightmap. It is still needed to rendering axis.

File:

• trunk/vizservers/nanovis/HeightMap.cpp (modified) (5 diffs)

trunk/vizservers/nanovis/HeightMap.cpp

@@ -15 +15 @@
 
 HeightMap::HeightMap()
-: _contour(0), _colorMap(0), _indexBuffer(0), _vertexBufferObjectID(0), _vertexCount(0), _textureBufferObjectID(0),
-  _contourVisible(true), _scale(1.0f, 1.0f, 1.0f), _contourColor(1.0f, 0.0f, 0.0f)
+: _contour(0), _colorMap(0), _indexBuffer(0), _indexCount(0), _vertexBufferObjectID(0), _vertexCount(0), 
+    _textureBufferObjectID(0), _contourVisible(true), _scale(1.0f, 1.0f, 1.0f), _contourColor(1.0f, 0.0f, 0.0f), _visible(false),
+    _vmin(0.0f), _vmax(0.0f), _centerPoint(0.0f, 0.0f, 0.0f)
 {
         _shader = new NvShader();
@@ -42 +43 @@
 {
     glPushMatrix();
-    glScalef(_scale.x, _scale.y, _scale.z);
-    glTranslatef(-0.5f, -0.5f, -0.5f);
+
+    if (_scale.x != 0)
+    {
+        glScalef(1 / _scale.x, 1 / _scale.x , 1 / _scale.x);
+    }
+
+    glTranslatef(-_centerPoint.x, - _centerPoint.y, - _centerPoint.z);
+
         if (_contour)
         {
@@ -208 +215 @@
             if (_vmin > heights[i].y) {
                 _vmin = heights[i].y;
-            } else if (_vmax < heights[i].y) {
+            } 
+        if (_vmax < heights[i].y) {
                 _vmax = heights[i].y;
             }
         }
+
+    _scale.x = 1.0f;
+    _scale.z = _vmax - _vmin;
+    _scale.y = 1.0f;
+
+    _centerPoint.set(_scale.x * 0.5, _scale.z * 0.5 + _vmin, _scale.y * 0.5);
 
         Vector3* texcoord = (Vector3*) malloc(count * sizeof(Vector3));
@@ -259 +273 @@
 {
         _vertexCount = xCount * yCount;
+
         reset();
 
@@ -266 +281 @@
             if (_vmin > heights[i]) {
                 _vmin = heights[i];
-            } else if (_vmax < heights[i]) {
+            } 
+
+        if (_vmax < heights[i]) {
                 _vmax = heights[i];
             }
         }
-    //_scale.x = endX - startX;
-    //_scale.y = (endY - startY) / _scale.x;
-    //_scale.z = max / _scale.z;
+
+    _scale.x = endX - startX;
+    _scale.y = _vmax - _vmin;
+    _scale.z = endY - startY;
+
+    _centerPoint.set(_scale.x * 0.5 + startX, _scale.y * 0.5 + _vmin, _scale.z * 0.5 + startY);
 
         Vector3* texcoord = (Vector3*) malloc(count * sizeof(Vector3));
-        for (int i = 0; i < count; ++i) {
+        for (int i = 0; i < count; ++i) 
+    {
             texcoord[i].set(0, 0, heights[i]);
         }