Changeset 2831 for trunk/packages/vizservers/nanovis/PointSet.h

Timestamp:

Mar 9, 2012, 1:12:14 PM (8 years ago)

Author:

ldelgass

Message:

Refactor texture classes, misc. cleanups, cut down on header pollution -- still
need to fix header deps in Makefile.in

File:

• trunk/packages/vizservers/nanovis/PointSet.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/PointSet.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#ifndef __POINT_SET_H__
-#define __POINT_SET_H__
+#ifndef POINT_SET_H
+#define POINT_SET_H
 
-#include <PCASplit.h>
-#include <Vector4.h>
-#include <Vector3.h>
+#include "PCASplit.h"
+#include "Vector4.h"
+#include "Vector3.h"
 
-class PointSet {
+class PointSet
+{
+public :
+    PointSet() :
+        _sortLevel(4),
+        _cluster(0),
+        _max(1.0f),
+        _min(0.0f), 
+        _visible(false)
+    {
+    }
+
+    ~PointSet() {
+        if (_cluster) {
+            delete _cluster;
+        }
+    }
+
+    void initialize(Vector4 *values, const unsigned int count, 
+                    const Vector3& scale, const Vector3& origin, 
+                    float min, float max);
+
+    void updateColor(float *color, int  count);
+
+    bool isVisible() const
+    {
+        return _visible;
+    }
+
+    void setVisible(bool visible)
+    {
+        _visible = visible;
+    }
+
+    unsigned int getSortLevel() const
+    {
+        return _sortLevel;
+    }
+
+    PCA::ClusterAccel* getCluster()
+    {
+        return _cluster;
+    }
+
+    Vector3& getScale()
+    {
+        return _scale;
+    }
+
+    const Vector3& getScale() const
+    {
+        return _scale;
+    }
+
+    Vector3& getOrigin()
+    {
+        return _origin;
+    }
+
+    const Vector3& getOrigin() const
+    {
+        return _origin;
+    }
+
+private:
     unsigned int _sortLevel;
     PCA::ClusterAccel* _cluster;
@@ -16 +80 @@
     float _min;
     bool _visible;
-public :
-    void initialize(Vector4* values, const unsigned int count, 
-                    const Vector3& scale, const Vector3& origin, 
-                    float min, float max);
-    void updateColor(float* color, int  count);
-
-    PointSet() :
-        _sortLevel(4), 
-        _cluster(0), 
-        _max(1.0f),
-        _min(0.0f), 
-        _visible(false)
-    {
-        /*empty*/
-    }
-    ~PointSet() {
-        if (_cluster) {
-            delete _cluster;
-        }
-    }
-
-    bool isVisible() const {
-        return _visible;
-    }
-    void setVisible(bool visible) {
-        _visible = visible;
-    }
-    unsigned int getSortLevel(void) const {
-        return _sortLevel;
-    }
-    PCA::ClusterAccel* getCluster(void) {
-        return _cluster;
-    }
-    Vector3& getScale(void) {
-        return _scale;
-    }
-    const Vector3& getScale(void) const {
-        return _scale;
-    }
-    Vector3& getOrigin(void) {
-        return _origin;
-    }
-    const Vector3& getOrigin(void) const {
-        return _origin;
-    }
 };
 
-#endif /*__POINT_SET_H__*/
+#endif