Changeset 5715 for nanovis


Ignore:
Timestamp:
Jun 17, 2015, 4:53:04 AM (4 years ago)
Author:
ldelgass
Message:

minor cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed
  • nanovis/trunk/HeightMap.cpp

    r5696 r5715  
    7676    glPushMatrix();
    7777
    78 #ifndef notdef
    7978    if (_scale.x != 0.0) {
    8079        glScalef(1 / _scale.x, 1 / _scale.y , 1 / _scale.z);
    8180    }
    82 #endif
    8381    glTranslatef(-_centerPoint.x, -_centerPoint.y, -_centerPoint.z);
    8482
     
    304302    _contour = lineFilter.create(0.0f, 1.0f, 10, heights, xCount, yCount);
    305303
    306     //if (heightMap)
    307     //{
    308     //  VertexBuffer* vertexBuffer = new VertexBuffer(VertexBuffer::POSITION3, xCount * yCount, sizeof(Vector3f) * xCount * yCount, heightMap, false);
     304    //if (heightMap) {
     305    //    VertexBuffer* vertexBuffer = new VertexBuffer(VertexBuffer::POSITION3, xCount * yCount,
     306    //        sizeof(Vector3f) * xCount * yCount, heightMap, false);
    309307    this->createIndexBuffer(xCount, yCount, 0);
    310     //}
    311     //else
    312     //{
    313     //ERROR("HeightMap::setHeight");
     308    //} else {
     309    //    ERROR("HeightMap::setHeight");
    314310    //}
    315311}
     
    334330        }
    335331    }
    336 #ifdef notdef
    337     if (retainScale_) {
    338         // Check the units of each axis.  If they are the same, we want to
    339         // retain the surface's aspect ratio when transforming coordinates to
    340         // the grid. Use the range of the longest axis when the units are the
    341         // same.
    342         if (xAxis.units() != NULL) && (xAxis.units() == yAxis.units()) {
    343         }
    344         if (yAxis.units() != NULL) && (yAxis.units() == zAxis.units()) {
    345         }
    346     }
    347 #endif
    348332
    349333    wAxis.setRange(min, max);
     
    362346    _centerPoint.set(0.5, 0.5, 0.5);
    363347
    364 #ifndef notdef
    365348    Vector3f* texcoord = new Vector3f[_vertexCount];
    366349    for (int i = 0; i < _vertexCount; ++i) {
     
    394377    this->createIndexBuffer(xNum, yNum, heights);
    395378    delete [] map;
    396 #endif
    397379}
    398380
Note: See TracChangeset for help on using the changeset viewer.