Changeset 1028 for trunk/packages/vizservers/nanovis/PointSet.cpp

Timestamp:

Jun 9, 2008, 9:08:02 AM (16 years ago)

Author:

gah

Message:

various cleanups

File:

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

trunk/packages/vizservers/nanovis/PointSet.cpp

@@ -4 +4 @@
 #include <stdio.h>
 
-PointSet::PointSet() : 
-    _sortLevel(4), 
-    _cluster(0), 
-    _max(1.0f),
-    _min(0.0f), 
-    _visible(false)
-{
-    /*empty*/
-}
-
-PointSet::~PointSet()
-{
-    if (_cluster)
-    {
-        delete _cluster;
-    }
-}
-
-void PointSet::initialize(Vector4* values, const unsigned int count, const Vector3& scale, const Vector3& origin, float min, float max)
+void 
+PointSet::initialize(Vector4* values, const unsigned int count, 
+                     const Vector3& scale, const Vector3& origin, 
+                     float min, float max)
 {
     PCA::PCASplit pcaSplit;
@@ -32 +17 @@
 
     PCA::Point* points = (PCA::Point*) malloc(sizeof(PCA::Point) * count);
-    for (unsigned int i = 0; i < count; ++i)
-    {
+    for (unsigned int i = 0; i < count; ++i) {
         points[i].position.set(values[i].x, values[i].y, values[i].z);
         points[i].color.set(1.0f, 1.0f, 1.0f, 0.2f);
@@ -40 +24 @@
     }
 
-    if (_cluster != 0)
-    {
+    if (_cluster != 0) {
         delete _cluster;
     }
@@ -49 +32 @@
 }
 
-void PointSet::updateColor(float* color,  int colorCount)
+void 
+PointSet::updateColor(float* color,  int colorCount)
 {
-        if (_cluster == 0) return;
-
+    if (_cluster == 0) {
+        return;
+    }
     int level = 4;
 
-        PCA::Cluster* cluster = _cluster->startPointerCluster[level - 1];
-        PCA::Cluster* c = &(cluster[0]);
-        PCA::Cluster* end = &(cluster[_cluster->numOfClusters[level - 1] - 1]);
-
-        Vector3 pos;
-        
+    PCA::Cluster* cluster = _cluster->startPointerCluster[level - 1];
+    PCA::Cluster* c = &(cluster[0]);
+    PCA::Cluster* end = &(cluster[_cluster->numOfClusters[level - 1] - 1]);
+    
+    Vector3 pos;
+    
     PCA::Point* points;
     Vector4* colors = (Vector4*) color;
-        int numOfPoints;
+    int numOfPoints;
     int index;
     float d = _max - _min;
-        for (; c <= end; c = (PCA::Cluster*) ((int) c + sizeof(PCA::Cluster)))
-        {
+    for (/*empty*/; c <= end; c = (PCA::Cluster*)((int)c+sizeof(PCA::Cluster))){
         points = c->points;
         numOfPoints = c->numOfPoints;
-
-        for (int i = 0; i < numOfPoints; ++i)
-        {
+        
+        for (int i = 0; i < numOfPoints; ++i) {
             index = (points[i].value - _min) / d  * (colorCount - 1);
-            if (index >= colorCount) index = colorCount - 1;
-            //printf("TEST %f %d/%d -> %d (%f %f %f)\n", points[i].value, i, numOfPoints, index, 
-            //                                    colors[index].x, colors[index].y, colors[index].z);
-            //fflush(stdout);
+            if (index >= colorCount) {
+                index = colorCount - 1;
+            }
             points[i].color = colors[index];
         }
-
-        }
+    }
 }