Changeset 3611 for trunk/packages/vizservers/nanovis/ReaderCommon.cpp

Timestamp:

Apr 2, 2013, 8:02:50 PM (12 years ago)

Author:

ldelgass

Message:

Use nv namespace for classes in nanovis rather than prefixing class names with
Nv (still need to convert shader classes).

File:

• trunk/packages/vizservers/nanovis/ReaderCommon.cpp (modified) (4 diffs)

trunk/packages/vizservers/nanovis/ReaderCommon.cpp

@@ -4 +4 @@
  *
  */
+
+#include <cstdlib>
+
+#include <vrmath/Vector3f.h>
+
 #include "ReaderCommon.h"
 #include "GradientFilter.h"
 
-#include <vrmath/Vector3f.h>
-
-#include "stdlib.h"
-
+using namespace nv;
 using namespace vrmath;
 
 float *
-merge(float *scalar, float *gradient, int size)
+nv::merge(float *scalar, float *gradient, int size)
 {
     float *data = (float *)malloc(sizeof(float) * 4 * size);
@@ -43 +45 @@
  */
 void
-normalizeScalar(float *data, int count, int stride, double vmin, double vmax)
+nv::normalizeScalar(float *data, int count, int stride, double vmin, double vmax)
 {
     double dv = vmax - vmin;
@@ -82 +84 @@
  */
 float *
-computeGradient(float *data,
-                int nx, int ny, int nz,
-                float dx, float dy, float dz,
-                float min, float max)
+nv::computeGradient(float *data,
+                    int nx, int ny, int nz,
+                    float dx, float dy, float dz,
+                    float min, float max)
 {
     int npts = nx * ny * nz;
@@ -123 +125 @@
  */
 void
-computeSimpleGradient(float *data,
-                      int nx, int ny, int nz,
-                      float dx, float dy, float dz)
+nv::computeSimpleGradient(float *data,
+                          int nx, int ny, int nz,
+                          float dx, float dy, float dz)
 {
     bool clampToEdge = true;