Ignore:
Timestamp:
Feb 26, 2013, 4: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/NvVectorField.h

    r2909 r3362  
    5454    }
    5555
    56     /////////////////////////////
    57     // DEVICE
    5856    void addDeviceShape(const std::string& name, const NvDeviceShape& shape);
    5957
     
    6361
    6462    void deactivateDeviceShape(const std::string& name);
    65    
     63
    6664    void initialize();
    6765
     
    102100
    103101    Vector3 _origin;
    104     Vector3 _physicalMin;
    105     Vector3 _physicalSize;
    106102    float _scaleX;
    107103    float _scaleY;
Note: See TracChangeset for help on using the changeset viewer.