Changeset 3617

Timestamp:

Apr 3, 2013, 2:02:16 AM (11 years ago)

Author:

ldelgass

Message:

Compile fixes for USE_POINTSET_RENDERER (not tested).

Location:

trunk/packages/vizservers/nanovis

Files:

• BucketSort.cpp (modified) (3 diffs)
• PCASplit.cpp (modified) (1 diff)
• PointSetRenderer.cpp (modified) (7 diffs)
• PointShader.h (modified) (1 diff)

trunk/packages/vizservers/nanovis/BucketSort.cpp

@@ -5 +5 @@
  */
 
+#include <vrmath/Vector3f.h>
+#include <vrmath/Matrix4x4d.h>
+
 #include "BucketSort.h"
 
 using namespace PCA;
-
-#include <vrmath/Vector3f.h>
-#include <vrmath/Matrix4x4d.h>
+using namespace vrmath;
 
 void 
@@ -23 +24 @@
 {
     if (clusterAccel == 0) {
-        return;
+        return;
     }
     Cluster* cluster = clusterAccel->startPointerCluster[level - 1];
@@ -29 +30 @@
     Cluster* end = &(cluster[clusterAccel->numOfClusters[level - 1] - 1]);
 
-    Vector3f pos;
     for (; c <= end; c = (Cluster*) ((char *)c + sizeof(Cluster))) {
-        pos = cameraMat.transform(c->centroid);
-        addBucket(c, pos.length()*_invMaxLength);
+        Vector4f pt = cameraMat.transform(Vector4f(c->centroid, 1));
+        Vector3f pos(pt.x, pt.y, pt.z);
+        addBucket(c, pos.length()*_invMaxLength);
     }
 }       

trunk/packages/vizservers/nanovis/PCASplit.cpp

@@ -12 +12 @@
 #include <newmatio.h>                // need matrix output routines
 #include <newmatrc.h>
-
-#include "PCASplit.h"
-
-using namespace vrmath;
-
 #ifdef use_namespace
 using namespace NEWMAT;              // access NEWMAT namespace
 #endif
 
+#include "PCASplit.h"
+#include "Trace.h"
+
+using namespace vrmath;
 using namespace PCA;
 

trunk/packages/vizservers/nanovis/PointSetRenderer.cpp

@@ -16 +16 @@
 using namespace nv;
 using namespace nv::util;
+using namespace vrmath;
+using namespace PCA;
 
 #define USE_TEXTURE 
@@ -51 +53 @@
     delete loader;
     delete image;
-    _bucketSort = new PCA::BucketSort(1024);
+    _bucketSort = new BucketSort(1024);
 }
 
@@ -58 +60 @@
 }
 
-void PointSetRenderer::renderPoints(PCA::Point *points, int length)
+void PointSetRenderer::renderPoints(Point *points, int length)
 {
-    PCA::Point *p = points;
+    Point *p = points;
     for (int i = 0; i < length; ++i, ++p) {
         glColor4f(p->color.x, p->color.y, p->color.z, p->color.w);
@@ -67 +69 @@
 }
 
-void PointSetRenderer::renderCluster(PCA::ClusterList** bucket, int size, int level)
+void PointSetRenderer::renderCluster(ClusterList** bucket, int size, int level)
 {
     float quadratic[] = { 1.0f, 0.0f, 0.01f };
@@ -83 +85 @@
     glBegin(GL_POINTS);
 
-    PCA::ClusterList *p;
+    ClusterList *p;
     for (int i = size - 1; i >= 0; --i) {
         p = bucket[i];
@@ -108 +110 @@
 }
 
-void PointSetRenderer::render(PCA::ClusterAccel *cluster, const Matrix4x4d& mat,
+void PointSetRenderer::render(ClusterAccel *cluster, const Matrix4x4d& mat,
                               int sortLevel, const Vector3f& scale, const Vector3f& origin)
 {
@@ -131 +133 @@
     glPushMatrix();
     float s = 1.0f / scale.x;
-    Vector3 shift(origin.x + scale.x * 0.5, origin.x + scale.x * 0.5, origin.x + scale.x * 0.5);
+    Vector3f shift(origin.x + scale.x * 0.5, origin.x + scale.x * 0.5, origin.x + scale.x * 0.5);
     glScalef(s, scale.y / scale.x * s, scale.z / scale.x * s);
 

trunk/packages/vizservers/nanovis/PointShader.h

@@ -35 +35 @@
 private:
     float _scale;
-    float _scale;
     Texture3D *_normal;
 };