Changeset 3492 for trunk/packages/vizservers/nanovis/NvParticleRenderer.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/NvParticleRenderer.h (modified) (5 diffs)

trunk/packages/vizservers/nanovis/NvParticleRenderer.h

@@ -19 +19 @@
 #include <GL/glew.h>
 
+#include <vrmath/Vector3f.h>
+#include <vrmath/Vector4f.h>
+
 #include "NvParticleAdvectionShader.h"
 #include "RenderVertexArray.h"
-#include "Vector3.h"
-#include "Vector4.h"
 
 struct Particle {
@@ -45 +46 @@
     ~NvParticleRenderer();
 
-    void setVectorField(unsigned int texID, const Vector3& origin,
+    void setVectorField(unsigned int texID, const vrmath::Vector3f& origin,
                         float scaleX, float scaleY, float scaleZ, float max);
 
@@ -68 +69 @@
     }
 
-    void setColor(const Vector4& color)
+    void setColor(const vrmath::Vector4f& color)
     {
         _color = color;
@@ -118 +119 @@
 
     /// scale of flow data
-    Vector3 _scale;
+    vrmath::Vector3f _scale;
 
-    Vector3 _origin;
+    vrmath::Vector3f _origin;
 
     bool _activate;
@@ -127 +128 @@
     int _sliceAxis;
 
-    Vector4 _color;
+    vrmath::Vector4f _color;
 
     //the storage of particles is implemented as a 2D array.