Changeset 5701 for nanovis/branches/1.2

Timestamp:

Jun 16, 2015 12:37:36 PM (9 years ago)

Author:

ldelgass

Message:

Merge some refactoring changes from trunk

Location:

nanovis/branches/1.2

Files:

• Flow.cpp (modified) (2 diffs)
• FlowBox.cpp (modified) (1 diff)
• FlowBox.h (modified) (1 diff)
• HeightMap.cpp (modified) (1 diff)
• HeightMap.h (modified) (1 diff)
• Volume.cpp (modified) (1 diff)
• Volume.h (modified) (1 diff)
• VolumeRenderer.h (modified) (1 diff)
• nanovis.cpp (modified) (3 diffs)

nanovis/branches/1.2/Flow.cpp

@@ -87 +87 @@
     if (isDataLoaded()) {
         BBox bbox;
-        _volume->getWorldSpaceBounds(bbox.min, bbox.max);
+        _volume->getBounds(bbox.min, bbox.max);
         allBounds.extend(bbox);
     }
@@ -95 +95 @@
         if ((!onlyVisible || box->visible()) && getVolume() != NULL) {
             BBox bbox;
-            box->getWorldSpaceBounds(bbox.min, bbox.max,
-                                     getVolume());
+            box->getBounds(bbox.min, bbox.max, getVolume());
             allBounds.extend(bbox);
         }

nanovis/branches/1.2/FlowBox.cpp

@@ -45 +45 @@
 
 void
-FlowBox::getWorldSpaceBounds(Vector3f& bboxMin,
-                             Vector3f& bboxMax,
-                             const Volume *vol) const
+FlowBox::getBounds(Vector3f& bboxMin,
+                   Vector3f& bboxMax,
+                   const Volume *vol) const
 {
     bboxMin.set(FLT_MAX, FLT_MAX, FLT_MAX);

nanovis/branches/1.2/FlowBox.h

@@ -63 +63 @@
     }
 
-    void getWorldSpaceBounds(vrmath::Vector3f& min,
-                             vrmath::Vector3f& max,
-                             const Volume *volume) const;
+    void getBounds(vrmath::Vector3f& min,
+                   vrmath::Vector3f& max,
+                   const Volume *volume) const;
 
 private:

nanovis/branches/1.2/HeightMap.cpp

@@ -493 +493 @@
 
 void
-HeightMap::getWorldSpaceBounds(Vector3f& bboxMin,
-                               Vector3f& bboxMax) const
+HeightMap::getBounds(Vector3f& bboxMin,
+                     Vector3f& bboxMax) const
 {
     bboxMin.set(xAxis.min(), yAxis.min(), zAxis.min());

nanovis/branches/1.2/HeightMap.h

@@ -113 +113 @@
     }
 
-    void getWorldSpaceBounds(vrmath::Vector3f& bboxMin, vrmath::Vector3f& bboxMax) const;
+    void getBounds(vrmath::Vector3f& bboxMin, vrmath::Vector3f& bboxMax) const;
 
     AxisRange xAxis, yAxis, zAxis, wAxis;

nanovis/branches/1.2/Volume.cpp

@@ -101 +101 @@
 }
 
-void Volume::getWorldSpaceBounds(Vector3f& bboxMin, Vector3f& bboxMax) const
+void Volume::getBounds(Vector3f& bboxMin, Vector3f& bboxMax) const
 {
     Vector3f scale = getPhysicalScaling();

nanovis/branches/1.2/Volume.h

@@ -316 +316 @@
     }
 
-    void getWorldSpaceBounds(vrmath::Vector3f& bboxMin,
-                             vrmath::Vector3f& bboxMax) const;
+    void getBounds(vrmath::Vector3f& bboxMin,
+                   vrmath::Vector3f& bboxMax) const;
  
     double sampleDistanceX() const

nanovis/branches/1.2/VolumeRenderer.h

@@ -65 +65 @@
     void deactivateVolumeShader();
 
-    void drawBoundingBox(float x0, float y0, float z0,
-                         float x1, float y1, float z1,
-                         float r, float g, float b, float line_width);
+    static void drawBoundingBox(float x0, float y0, float z0,
+                                float x1, float y1, float z1,
+                                float r, float g, float b, float line_width);
 
-    void getEyeSpaceBounds(const vrmath::Matrix4x4d& mv,
-                           double& xMin, double& xMax,
-                           double& yMin, double& yMax,
-                           double& zNear, double& zFar);
+    static void getEyeSpaceBounds(const vrmath::Matrix4x4d& mv,
+                                  double& xMin, double& xMax,
+                                  double& yMin, double& yMax,
+                                  double& zNear, double& zFar);
 
     VolumeInterpolator *_volumeInterpolator;

nanovis/branches/1.2/nanovis.cpp

@@ -749 +749 @@
 
         BBox bbox;
-        volume->getWorldSpaceBounds(bbox.min, bbox.max);
+        volume->getBounds(bbox.min, bbox.max);
         sceneBounds.extend(bbox);
     }
@@ -761 +761 @@
 
         BBox bbox;
-        heightMap->getWorldSpaceBounds(bbox.min, bbox.max);
+        heightMap->getBounds(bbox.min, bbox.max);
         sceneBounds.extend(bbox);
     }
@@ -1013 +1013 @@
 
     // Now render things in the scene
+
     orientationIndicator->setPosition(sceneBounds.getCenter());
     orientationIndicator->setScale(sceneBounds.getSize());