Ignore:
Timestamp:
Feb 26, 2013 1:34:35 PM (7 years ago)
Author:
ldelgass
Message:

Merge nanovis2 branch to trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/packages/vizservers/nanovis/Texture3D.cpp

    r3177 r3362  
    5252    _wrapR(GL_CLAMP_TO_EDGE)
    5353{
    54     //int m = (_width > _height) ? _width : _height;
    55     //m = (m > _depth) ? m : _depth;
    56 
    57     //int m = max(max(_width, _height), _depth);
    58     _aspectRatioWidth = 1.;
    59     _aspectRatioHeight = (double)_height/(double)_width;
    60     _aspectRatioDepth = (double)_depth/(double)_width;
    61 
    62     //_aspectRatioWidth = (double)_width/(double)m;
    63     //_aspectRatioHeight = (double)_height/(double)m;
    64     //_aspectRatioDepth = (double)_depth/(double)m;
    65 
    6654    if (data != NULL)
    6755        initialize(data);
Note: See TracChangeset for help on using the changeset viewer.