Changeset 846

Timestamp:

Jan 8, 2008, 7:02:21 AM (17 years ago)

Author:

vrinside

Message:

Removed compile warnings

Location:

trunk/vizservers/nanovis

Files:

• PCASplit.cpp (modified) (7 diffs)
• PCASplit.h (modified) (2 diffs)

trunk/vizservers/nanovis/PCASplit.cpp

@@ -16 +16 @@
 
 PCASplit::PCASplit()
-: _maxLevel(4), _minDistance(0.5f), _distanceScale(0.2f), _finalMaxLevel(0), _indexCount(0)
+: _maxLevel(4), _minDistance(0.5f), _distanceScale(0.2f), _indexCount(0), _finalMaxLevel(0)
 {
         _indices = new unsigned int[MAX_INDEX];
@@ -225 +225 @@
 
         SymmetricMatrix A(3);
-        for (int i = 1, index = 0; i <= 3; ++i) 
+        for (int i = 1; i <= 3; ++i) 
                 for (int j = 1; j <= i; ++j)
                 {
@@ -236 +236 @@
         Vector3 emax(U(1, 3), U(2, 3), U(3, 3));
         
-        int index1Count = 0, index2Count = 0;
-
         int left = 0, right = count - 1;
 
@@ -280 +278 @@
         _indexCount = 0;
 
-        int i = 0;
         while (clNode)
         {
@@ -297 +294 @@
         // the process values of split are in _curClusterNode and _curClusterCount
         ClusterListNode* curClusterNode = _curClusterNode;
-        int curClusterNodeCount = _curClusterCount;
+        unsigned int curClusterNodeCount = _curClusterCount;
 
         if (curClusterNodeCount)
@@ -318 +315 @@
                                 parent[0].setPoints(points, _indices[0]);
 
-                                for (int i = 0, in = 0; i < curClusterNodeCount; ++i)
+                                for (unsigned int i = 0, in = 0; i < curClusterNodeCount; ++i)
                                 {
                                         if (i >= _indices[in])
@@ -381 +378 @@
                                 
                                 // set points of sub-clusters
-                                for (int i = 0; i < curClusterNodeCount; ++i)
+                                for (unsigned int i = 0; i < curClusterNodeCount; ++i)
                                 {
                                         points[i].position = node->data->centroid_t;

trunk/vizservers/nanovis/PCASplit.h

@@ -36 +36 @@
 
 public :
+
+        Cluster() : color(1.0f, 1.0f, 1.0f, 1.0f), scale(0.0f), numOfChildren(0), numOfPoints(0),
+                        points(0), children(0), vbo(0)/*, minValue(0.0f), maxValue(0.0f)*/
+                        , level(0)
+        {
+        }
+
         void setChildren(Cluster* children, int count)
         {
@@ -47 +54 @@
         }
         
-        Cluster() : color(1.0f, 1.0f, 1.0f, 1.0f), numOfChildren(0), numOfPoints(0),
-                        points(0), children(0), scale(0.0f), vbo(0)/*, minValue(0.0f), maxValue(0.0f)*/
-                        , level(0)
-        {
-        }
 };