Changeset 3627
- Timestamp:
- Apr 4, 2013, 10:17:26 PM (12 years ago)
- Location:
- trunk/packages/vizservers/nanovis
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/nanovis/FlowParticles.cpp
r3611 r3627 12 12 #include <assert.h> 13 13 14 #include <vrmath/ Vector4f.h>14 #include <vrmath/Color4f.h> 15 15 16 16 #include "nanovis.h" // For NMESH … … 61 61 { 62 62 _renderer->setPos(Flow::getRelativePosition(&_sv.position)); 63 _renderer->setColor( Vector4f(_sv.color.r,64 65 66 63 _renderer->setColor(Color4f(_sv.color.r, 64 _sv.color.g, 65 _sv.color.b, 66 _sv.color.a)); 67 67 _renderer->particleSize(_sv.particleSize); 68 68 _renderer->setAxis(_sv.position.axis); -
trunk/packages/vizservers/nanovis/Grid.cpp
r3611 r3627 9 9 #include <GL/glew.h> 10 10 #include <GL/gl.h> 11 12 #include <util/Fonts.h> 13 #include <vrmath/Color4f.h> 11 14 12 15 #include "Grid.h" … … 86 89 87 90 glLineWidth(2.0f); 88 glColor4f(_axisColor.r ed, _axisColor.green, _axisColor.blue,89 _axisColor.a lpha);91 glColor4f(_axisColor.r, _axisColor.g, _axisColor.b, 92 _axisColor.a); 90 93 91 94 glBegin(GL_LINES); … … 101 104 102 105 glLineWidth(1.0f); 103 glColor4f(_majorColor.r ed, _majorColor.green, _majorColor.blue,104 _majorColor.a lpha);106 glColor4f(_majorColor.r, _majorColor.g, _majorColor.b, 107 _majorColor.a); 105 108 106 109 glBegin(GL_LINES); … … 137 140 138 141 // Set minor line color 139 glColor4f(_minorColor.r ed, _minorColor.green, _minorColor.blue,140 _minorColor.a lpha);142 glColor4f(_minorColor.r, _minorColor.g, _minorColor.b, 143 _minorColor.a); 141 144 142 145 glBegin(GL_LINES); -
trunk/packages/vizservers/nanovis/Grid.h
r3613 r3627 7 7 #define NV_GRID_H 8 8 9 #include < util/Fonts.h>9 #include <vrmath/Color4f.h> 10 10 11 11 #include "Axis.h" … … 14 14 namespace nv { 15 15 16 class RGBA 17 { 18 public: 19 RGBA(float r, float g, float b, float a) : 20 red(r), 21 green(g), 22 blue(b), 23 alpha(a) 24 {} 25 26 void set(float r, float g, float b, float a) 27 { 28 red = r; 29 green = g; 30 blue = b; 31 alpha = a; 32 } 33 34 float red, green, blue, alpha; 35 }; 16 namespace util { 17 class Fonts; 18 } 36 19 37 20 class Grid … … 71 54 72 55 private: 73 RGBA_axisColor, _majorColor, _minorColor;56 vrmath::Color4f _axisColor, _majorColor, _minorColor; 74 57 nv::util::Fonts *_font; 75 58 bool _visible; -
trunk/packages/vizservers/nanovis/Makefile.in
r3618 r3627 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 293 293 GradientFilter.o: GradientFilter.cpp GradientFilter.h 294 Grid.o: Grid.cpp Grid.h Axis.h Chain.h 294 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 295 295 HeightMap.o: HeightMap.cpp HeightMap.h 296 296 LIC.o: LIC.cpp LIC.h … … 332 332 dxReader.o: dxReader.cpp ReaderCommon.h config.h nanovis.h Unirect.h ZincBlendeVolume.h ZincBlendeReconstructor.h 333 333 md5.o: md5.h 334 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 334 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 335 335 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
r3613 r3627 10 10 11 11 #include <vrmath/Vector3f.h> 12 #include <vrmath/ Vector4f.h>12 #include <vrmath/Color4f.h> 13 13 14 14 namespace PCA { … … 23 23 24 24 vrmath::Vector3f position; 25 vrmath:: Vector4f color;25 vrmath::Color4f color; 26 26 float size; 27 27 float value; … … 57 57 58 58 vrmath::Vector3f centroid; 59 vrmath:: Vector4f color;59 vrmath::Color4f color; 60 60 float scale; 61 61 -
trunk/packages/vizservers/nanovis/ParticleRenderer.cpp
r3612 r3627 12 12 13 13 #include <GL/glew.h> 14 15 #include <vrmath/Color4f.h> 14 16 15 17 #include "ParticleRenderer.h" -
trunk/packages/vizservers/nanovis/ParticleRenderer.h
r3612 r3627 12 12 13 13 #include <vrmath/Vector3f.h> 14 #include <vrmath/ Vector4f.h>14 #include <vrmath/Color4f.h> 15 15 16 16 #include "ParticleAdvectionShader.h" … … 63 63 } 64 64 65 void setColor(const vrmath:: Vector4f& color)65 void setColor(const vrmath::Color4f& color) 66 66 { 67 67 _color = color; … … 122 122 int _sliceAxis; 123 123 124 vrmath:: Vector4f _color;124 vrmath::Color4f _color; 125 125 126 126 //the storage of particles is implemented as a 2D array. -
trunk/packages/vizservers/nanovis/PointSet.cpp
r3612 r3627 9 9 #include <vrmath/Vector3f.h> 10 10 #include <vrmath/Vector4f.h> 11 #include <vrmath/Color4f.h> 11 12 12 13 #include "PointSet.h" … … 58 59 59 60 PCA::Point *points; 60 vrmath:: Vector4f *colors = (vrmath::Vector4f *)color;61 vrmath::Color4f *colors = (vrmath::Color4f *)color; 61 62 int numOfPoints; 62 63 int index; -
trunk/packages/vizservers/nanovis/PointSetRenderer.cpp
r3617 r3627 64 64 Point *p = points; 65 65 for (int i = 0; i < length; ++i, ++p) { 66 glColor4f(p->color. x, p->color.y, p->color.z, p->color.w);66 glColor4f(p->color.r, p->color.g, p->color.b, p->color.a); 67 67 glVertex3f(p->position.x, p->position.y, p->position.z); 68 68 } -
trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Vector2f.h
r3492 r3627 27 27 x(x1), y(y1) 28 28 {} 29 30 Vector2f& operator=(const Vector2f& other) 31 { 32 set(other.x, other.y); 33 return *this; 34 } 29 35 30 36 void set(float x1, float y1); -
trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Vector3f.h
r3618 r3627 27 27 x(x1), y(y1), z(z1) 28 28 {} 29 30 Vector3f& operator=(const Vector3f& other) 31 { 32 set(other.x, other.y, other.z); 33 return *this; 34 } 29 35 30 36 void set(float x1, float y1, float z1); -
trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Vector4f.h
r3567 r3627 37 37 38 38 void set(const Vector4f& v4); 39 40 Vector4f& operator=(const Vector4f& other) 41 { 42 set(other.x, other.y, other.z, other.w); 43 return *this; 44 } 39 45 40 46 bool operator==(const Vector4f& op2) const
Note: See TracChangeset
for help on using the changeset viewer.