Changeset 4904 for nanovis/branches/1.1/Volume.h

Timestamp:

Dec 22, 2014, 4:18:59 AM (10 years ago)

Author:

ldelgass

Message:

Merge serveral changes from trunk. Does not include threading, world space
changes, etc.

File:

• nanovis/branches/1.1/Volume.h (modified) (11 diffs)

nanovis/branches/1.1/Volume.h

@@ -21 +21 @@
 namespace nv {
 
-struct CutPlane {
-    /// orientation - 1: xy slice, 2: yz slice, 3: xz slice
-    int orient;
-    float offset;       ///< normalized offset [0,1] in the volume
-    bool enabled;
-
-    CutPlane(int _orient, float _offset) :
+class CutPlane {
+public:
+    enum Axis {
+        X_AXIS = 1,
+        Y_AXIS = 2,
+        Z_AXIS = 3
+    };
+
+    CutPlane(Axis _orient, float _offset) :
         orient(_orient),
         offset(_offset),
@@ -33 +35 @@
     {
     }
+
+    Axis orient;
+    float offset;       ///< normalized offset [0,1] in the volume
+    bool enabled;
 };
 
@@ -98 +104 @@
     }
 
-    void location(const vrmath::Vector3f& loc)
-    { 
-        _location = loc; 
-    }
-
-    vrmath::Vector3f location() const
-    {
-        return _location;
-    }
-
     int isosurface() const
     {
@@ -155 +151 @@
     // methods related to cutplanes
     /// add a plane and returns its index
-    int addCutplane(int orientation, float location);
+    int addCutplane(CutPlane::Axis orientation, float location);
 
     void enableCutplane(int index);
@@ -171 +167 @@
     }
 
-    void moveCutplane(int index, float location);
+    void setCutplanePosition(int index, float location);
 
     CutPlane *getCutplane(int index);
@@ -292 +288 @@
 
     void getOutlineColor(float *rgb);
+
+    void setPosition(const vrmath::Vector3f& pos)
+    {
+        _position = pos;
+    }
+
+    const vrmath::Vector3f& getPosition() const
+    {
+        return _position;
+    }
 
     vrmath::Vector3f getPhysicalScaling() const
@@ -300 +306 @@
         scale.z = zAxis.length() / xAxis.length();
         return scale;
+    }
+
+    void setScale(const vrmath::Vector3f& scale)
+    {
+        _scale = scale;
+    }
+
+    const vrmath::Vector3f& getScale() const
+    {
+        return _scale;
     }
 
@@ -380 +396 @@
     /**
      * The scale multiplied to the opacity assigned by the 
-     * transfer function. Rule of thumb: higher opacity_scale
-     * the object is to appear like plastic
+     * transfer function.
      */
     float _opacityScale;
@@ -398 +413 @@
     Texture3D *_tex;            ///< OpenGL texture storing the volume
 
-    vrmath::Vector3f _location;
+    vrmath::Vector3f _position;
+    vrmath::Vector3f _scale;
 
     /**
@@ -414 +430 @@
 
 inline int
-Volume::addCutplane(int orientation, float location)
+Volume::addCutplane(CutPlane::Axis orientation, float location)
 {
     _plane.push_back(CutPlane(orientation, location));
@@ -435 +451 @@
 
 inline void 
-Volume::moveCutplane(int index, float location)
+Volume::setCutplanePosition(int index, float position)
 {
     //assert(index < plane.size());
-    _plane[index].offset = location;
+    _plane[index].offset = position;
 }