Changeset 3627 for trunk/packages/vizservers/nanovis

Timestamp:

Apr 4, 2013 10:17:26 PM (11 years ago)

Author:

ldelgass

Message:

Use vrmath::Color4f for color where appropriate

Location:

trunk/packages/vizservers/nanovis

Files:

• FlowParticles.cpp (modified) (2 diffs)
• Grid.cpp (modified) (4 diffs)
• Grid.h (modified) (3 diffs)
• Makefile.in (modified) (2 diffs)
• PCASplit.h (modified) (3 diffs)
• ParticleRenderer.cpp (modified) (1 diff)
• ParticleRenderer.h (modified) (3 diffs)
• PointSet.cpp (modified) (2 diffs)
• PointSetRenderer.cpp (modified) (1 diff)
• vrmath/include/vrmath/Vector2f.h (modified) (1 diff)
• vrmath/include/vrmath/Vector3f.h (modified) (1 diff)
• vrmath/include/vrmath/Vector4f.h (modified) (1 diff)

trunk/packages/vizservers/nanovis/FlowParticles.cpp

@@ -12 +12 @@
 #include <assert.h>
 
-#include <vrmath/Vector4f.h>
+#include <vrmath/Color4f.h>
 
 #include "nanovis.h"        // For NMESH
@@ -61 +61 @@
 {
     _renderer->setPos(Flow::getRelativePosition(&_sv.position));
-    _renderer->setColor(Vector4f(_sv.color.r,
-                                 _sv.color.g,
-                                 _sv.color.b, 
-                                 _sv.color.a));
+    _renderer->setColor(Color4f(_sv.color.r,
+                                _sv.color.g,
+                                _sv.color.b, 
+                                _sv.color.a));
     _renderer->particleSize(_sv.particleSize);
     _renderer->setAxis(_sv.position.axis);

trunk/packages/vizservers/nanovis/Grid.cpp

@@ -9 +9 @@
 #include <GL/glew.h>
 #include <GL/gl.h>
+
+#include <util/Fonts.h>
+#include <vrmath/Color4f.h>
 
 #include "Grid.h"
@@ -86 +89 @@
 
     glLineWidth(2.0f);
-    glColor4f(_axisColor.red, _axisColor.green, _axisColor.blue, 
-              _axisColor.alpha);
+    glColor4f(_axisColor.r, _axisColor.g, _axisColor.b, 
+              _axisColor.a);
 
     glBegin(GL_LINES);
@@ -101 +104 @@
 
     glLineWidth(1.0f);
-    glColor4f(_majorColor.red, _majorColor.green, _majorColor.blue, 
-              _majorColor.alpha);
+    glColor4f(_majorColor.r, _majorColor.g, _majorColor.b, 
+              _majorColor.a);
 
     glBegin(GL_LINES);
@@ -137 +140 @@
 
     // Set minor line color
-    glColor4f(_minorColor.red, _minorColor.green, _minorColor.blue,
-              _minorColor.alpha);
+    glColor4f(_minorColor.r, _minorColor.g, _minorColor.b,
+              _minorColor.a);
 
     glBegin(GL_LINES);

trunk/packages/vizservers/nanovis/Grid.h

@@ -7 +7 @@
 #define NV_GRID_H
 
-#include <util/Fonts.h>
+#include <vrmath/Color4f.h>
 
 #include "Axis.h"
@@ -14 +14 @@
 namespace nv {
 
-class RGBA
-{
-public:
-    RGBA(float r, float g, float b, float a) :
-        red(r),
-        green(g),
-        blue(b),
-        alpha(a)
-    {}
-
-    void set(float r, float g, float b, float a)
-    {
-        red   = r;
-        green = g;
-        blue  = b;
-        alpha = a;
-    }
-
-    float red, green, blue, alpha;
-};
+namespace util {
+class Fonts;
+}
 
 class Grid
@@ -71 +54 @@
 
 private:
-    RGBA _axisColor, _majorColor, _minorColor;
+    vrmath::Color4f _axisColor, _majorColor, _minorColor;
     nv::util::Fonts *_font;
     bool _visible;

trunk/packages/vizservers/nanovis/Makefile.in

@@ -292 +292 @@
 FlowParticles.o: FlowParticles.cpp FlowParticles.h FlowTypes.h FlowCmd.h Switch.h Trace.h ParticleRenderer.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h
 GradientFilter.o: GradientFilter.cpp GradientFilter.h
-Grid.o: Grid.cpp Grid.h Axis.h Chain.h
+Grid.o: Grid.cpp Grid.h Axis.h Chain.h $(UTIL_DIR)/Fonts.h $(VRMATH_DIR)/include/vrmath/Color4f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h
 HeightMap.o: HeightMap.cpp HeightMap.h
 LIC.o: LIC.cpp LIC.h
@@ -332 +332 @@
 dxReader.o: dxReader.cpp ReaderCommon.h config.h nanovis.h Unirect.h ZincBlendeVolume.h ZincBlendeReconstructor.h
 md5.o: md5.h
-nanovis.o: nanovis.cpp nanovis.h config.h define.h Command.h Flow.h Grid.h HeightMap.h Camera.h LIC.h ZincBlendeReconstructor.h OrientationIndicator.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h
+nanovis.o: nanovis.cpp nanovis.h config.h define.h Command.h Flow.h Grid.h HeightMap.h Camera.h LIC.h ZincBlendeReconstructor.h OrientationIndicator.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h $(UTIL_DIR)/Fonts.h
 nanovisServer.o: nanovisServer.cpp nanovisServer.h config.h nanovis.h define.h Command.h PPMWriter.h ReadBuffer.h Shader.h ResponseQueue.h Trace.h

trunk/packages/vizservers/nanovis/PCASplit.h

@@ -10 +10 @@
 
 #include <vrmath/Vector3f.h>
-#include <vrmath/Vector4f.h>
+#include <vrmath/Color4f.h>
 
 namespace PCA {
@@ -23 +23 @@
 
     vrmath::Vector3f position;
-    vrmath::Vector4f color;
+    vrmath::Color4f color;
     float size;
     float value;
@@ -57 +57 @@
 
     vrmath::Vector3f centroid;
-    vrmath::Vector4f color;
+    vrmath::Color4f color;
     float scale;
 

trunk/packages/vizservers/nanovis/ParticleRenderer.cpp

@@ -12 +12 @@
 
 #include <GL/glew.h>
+
+#include <vrmath/Color4f.h>
 
 #include "ParticleRenderer.h"

trunk/packages/vizservers/nanovis/ParticleRenderer.h

@@ -12 +12 @@
 
 #include <vrmath/Vector3f.h>
-#include <vrmath/Vector4f.h>
+#include <vrmath/Color4f.h>
 
 #include "ParticleAdvectionShader.h"
@@ -63 +63 @@
     }
 
-    void setColor(const vrmath::Vector4f& color)
+    void setColor(const vrmath::Color4f& color)
     {
         _color = color;
@@ -122 +122 @@
     int _sliceAxis;
 
-    vrmath::Vector4f _color;
+    vrmath::Color4f _color;
 
     //the storage of particles is implemented as a 2D array.

trunk/packages/vizservers/nanovis/PointSet.cpp

@@ -9 +9 @@
 #include <vrmath/Vector3f.h>
 #include <vrmath/Vector4f.h>
+#include <vrmath/Color4f.h>
 
 #include "PointSet.h"
@@ -58 +59 @@
 
     PCA::Point *points;
-    vrmath::Vector4f *colors = (vrmath::Vector4f *)color;
+    vrmath::Color4f *colors = (vrmath::Color4f *)color;
     int numOfPoints;
     int index;

trunk/packages/vizservers/nanovis/PointSetRenderer.cpp

@@ -64 +64 @@
     Point *p = points;
     for (int i = 0; i < length; ++i, ++p) {
-        glColor4f(p->color.x, p->color.y, p->color.z, p->color.w);
+        glColor4f(p->color.r, p->color.g, p->color.b, p->color.a);
         glVertex3f(p->position.x, p->position.y, p->position.z);
     }

trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Vector2f.h

@@ -27 +27 @@
         x(x1), y(y1)
     {}
+
+    Vector2f& operator=(const Vector2f& other)
+    {
+        set(other.x, other.y);
+        return *this;
+    }
 
     void set(float x1, float y1);

trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Vector3f.h

@@ -27 +27 @@
         x(x1), y(y1), z(z1)
     {}
+    
+    Vector3f& operator=(const Vector3f& other)
+    {
+        set(other.x, other.y, other.z);
+        return *this;
+    }
 
     void set(float x1, float y1, float z1);

trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Vector4f.h

@@ -37 +37 @@
 
     void set(const Vector4f& v4);
+
+    Vector4f& operator=(const Vector4f& other)
+    {
+        set(other.x, other.y, other.z, other.w);
+        return *this;
+    }
 
     bool operator==(const Vector4f& op2) const