Changeset 2827 for trunk/packages/vizservers/nanovis/ZincBlendeVolume.cpp

Timestamp:

Mar 7, 2012, 2:01:55 PM (12 years ago)

Author:

ldelgass

Message:

Move Vector3/4Array typdefs to the Vector3/4.h headers and remove TypeDefs?.h.
Also misc. cleanups

File:

• trunk/packages/vizservers/nanovis/ZincBlendeVolume.cpp (modified) (3 diffs)

trunk/packages/vizservers/nanovis/ZincBlendeVolume.cpp

@@ -19 +19 @@
 #include "ZincBlendeVolume.h"
 
-
 ZincBlendeVolume::ZincBlendeVolume(float x, float y, float z,
-                                        int w, int h, int d, float s, int n, 
-                                        float* dataVolumeA, float* dataVolumeB,
-                                        double v0, double v1, double non_zeromin, const Vector3& cellSize)
-                : Volume(x, y, z, w, h, d, s, n, dataVolumeA, v0, v1, non_zeromin), cell_size(cellSize)
+                                   int w, int h, int d, float s, int n, 
+                                   float* dataVolumeA, float* dataVolumeB,
+                                   double v0, double v1, double non_zeromin,
+                                   const Vector3& cellSize) :
+    Volume(x, y, z, w, h, d, s, n, dataVolumeA, v0, v1, non_zeromin),
+    cell_size(cellSize)
 {
     //label it as zincblende
@@ -34 +35 @@
 
     //now add another tex as zincblende_tex[1]
-    Texture3D* secondTex = 0; 
-    secondTex = new Texture3D(w, h, d, GL_FLOAT, GL_LINEAR, n);
+    Texture3D* secondTex = new Texture3D(w, h, d, GL_FLOAT, GL_LINEAR, n);
     assert(secondTex);
     secondTex->initialize(dataVolumeB);
-    
+
     zincblende_tex[1] = secondTex;
 }
-
 
 ZincBlendeVolume::~ZincBlendeVolume()
@@ -51 +50 @@
         delete zincblende_tex[1];
 }
-
-