Changeset 3492 for trunk/packages/vizservers/nanovis/BucketSort.h

Timestamp:

Mar 13, 2013, 9:57:03 AM (12 years ago)

Author:

ldelgass

Message:

Fix camera reset for nanovis. Includes refactoring of vector/matrix classes
in nanovis to consolidate into vrmath library. Also add preliminary canonical
view control to clients for testing.

File:

• trunk/packages/vizservers/nanovis/BucketSort.h (modified) (4 diffs)

trunk/packages/vizservers/nanovis/BucketSort.h

@@ -5 +5 @@
 #include <vector>
 #include <list>
-#include "Vector3.h"
-#include "Mat4x4.h"
+
+#include <vrmath/Matrix4x4d.h>
+
 #include "PCASplit.h"
 
 namespace PCA {
 
-class ClusterList {
-public :
-    Cluster* data;
-    ClusterList* next;
+class ClusterList
+{
 public :
     ClusterList(Cluster *d, ClusterList *n) :
@@ -28 +27 @@
         //if (next) delete next;
     }
+
+    Cluster *data;
+    ClusterList *next;
 };
 
-class BucketSort {
-    ClusterList **_buffer;
-    int _size;
-    int _count;
-
-    int _memChuckSize;
-    bool _memChunckUsedFlag;
-    ClusterList *_memChunck;
-
-    float _invMaxLength;
-private:
-    void _sort(Cluster *cluster, const Mat4x4& cameraMat, int level);
+class BucketSort
+{
 public:
     BucketSort(int maxSize)
@@ -69 +61 @@
     void init();
 
-    void sort(ClusterAccel* cluster, const Mat4x4& cameraMat, int level);
+    void sort(ClusterAccel* cluster, const vrmath::Matrix4x4d& cameraMat, int level);
 
     void addBucket(Cluster* cluster, float ratio);
@@ -75 +67 @@
     ClusterList **getBucket()
     { return _buffer; }
+
+private:
+    void _sort(Cluster *cluster, const vrmath::Matrix4x4d& cameraMat, int level);
+
+    ClusterList **_buffer;
+    int _size;
+    int _count;
+
+    int _memChuckSize;
+    bool _memChunckUsedFlag;
+    ClusterList *_memChunck;
+
+    float _invMaxLength;
 };