Changeset 777 for trunk

Timestamp:

Jul 9, 2007 5:14:09 PM (17 years ago)

Author:

vrinside

Message:

modified creation of zincblende volume

File:

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

trunk/vizservers/nanovis/NvZincBlendeReconstructor.cpp

@@ -96 +96 @@
         // The reasone why index is multiplied by 4 is that one unit cell has half of eight atoms
         // ,i.e. four atoms are mapped into RGBA component of one texel
-        return ((int) (indexZ - 1)+ (int) (indexX - 1) * width + (int) (indexY - 1) * width * height) * 4;
+        //return ((int) (indexZ - 1)+ (int) (indexX - 1) * width + (int) (indexY - 1) * width * height) * 4;
+        return ((int) (indexX - 1)+ (int) (indexY - 1) * width + (int) (indexZ - 1) * width * height) * 4;
     }
 };
@@ -137 +138 @@
     _NvAtomInfo* srcPtr = (_NvAtomInfo*) data;
 
-    float vmin, vmax;
+    float vmin, vmax, nzero_min;
     float* component4A, *component4B;
     int index;
@@ -162 +163 @@
         vmax = _NvMax3(_NvMax4(component4A), _NvMax4(component4B), vmax);
         vmin = _NvMin3(_NvMin4(component4A), _NvMin4(component4B), vmin);
+
+        if (vmin != 0.0 && vmin < nzero_min)
+        {
+            nzero_min = vmin;    
+        }
     }
 
@@ -182 +188 @@
                                             width, height, depth, 1, 4,
                                             fourAnionVolume, fourCationVolume,
-                                            vmin, vmax, cellSize);
+                                            vmin, vmax, nzero_min, cellSize);
 
     return zincBlendeVolume;