Changeset 827 for trunk/vizservers/nanovis/PointSet.cpp

Timestamp:

Dec 13, 2007 7:24:01 PM (16 years ago)

Author:

vrinside

Message:

Added color blending with point sprite texture

File:

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

trunk/vizservers/nanovis/PointSet.cpp

@@ -2 +2 @@
 #include "PCASplit.h"
 #include <stdlib.h>
+#include <stdio.h>
 
 PointSet::PointSet()
-: _visible(false), _cluster(0), _sortLevel(4)
+: _visible(false), _cluster(0), _sortLevel(4), _min(0.0f), _max(1.0f)
 {
 }
@@ -16 +17 @@
 }
 
-void PointSet::initialize(Vector4* values, const unsigned int count)
+void PointSet::initialize(Vector4* values, const unsigned int count, const Vector3& scale, const Vector3& origin, float min, float max)
 {
     PCA::PCASplit pcaSplit;
+
+    _scale = scale;
+    _origin = origin;
+    _min = min;
+    _max = max;
 
     PCA::Point* points = (PCA::Point*) malloc(sizeof(PCA::Point) * count);
@@ -24 +30 @@
     {
         points[i].position.set(values[i].x, values[i].y, values[i].z);
-
-        // TBD
         points[i].color.set(1.0f, 1.0f, 1.0f, 0.2f);
-
         points[i].value = values[i].w;
+        points[i].size = 0.001;
     }
 
@@ -35 +39 @@
         delete _cluster;
     }
-
     
+    pcaSplit.setMinDistance(scale.length() / 3.0f);
     _cluster = pcaSplit.doIt(points, count);
 }
 
-void PointSet::updateColor()
+void PointSet::updateColor(float* color,  int colorCount)
 {
-    
+        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::Point* points;
+    Vector4* colors = (Vector4*) color;
+        int numOfPoints;
+    int index;
+    float d = _max - _min;
+        for (; c <= end; c = (PCA::Cluster*) ((int) c + sizeof(PCA::Cluster)))
+        {
+        points = c->points;
+        numOfPoints = c->numOfPoints;
+
+        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);
+            points[i].color = colors[index];
+        }
+
+        }
 }