Changeset 3492 for trunk/packages/vizservers/nanovis/NvFlowVisRenderer.h

Timestamp:

Mar 13, 2013 9:57:03 AM (11 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/NvFlowVisRenderer.h (modified) (3 diffs)

trunk/packages/vizservers/nanovis/NvFlowVisRenderer.h

@@ -6 +6 @@
 #include <string>
 
-#include "Vector3.h"
+#include <vrmath/Vector3f.h>
+#include <vrmath/Vector4f.h>
+
 #include "NvVectorField.h"
 
@@ -28 +30 @@
     void render();
 
-    void addVectorField(Volume *volPtr, const Vector3& ori, float scaleX, 
+    void addVectorField(Volume *volPtr, const vrmath::Vector3f& ori, float scaleX, 
                         float scaleY, float scaleZ, float max);
 
-    void addVectorField(const std::string& vfName, Volume *volPtr, const Vector3& ori,
+    void addVectorField(const std::string& vfName, Volume *volPtr, const vrmath::Vector3f& ori,
                         float scaleX, float scaleY, float scaleZ, float max);
 
@@ -50 +52 @@
     void setPlanePos(const std::string& vfName, const std::string& name, float pos);
 
-    void setParticleColor(const std::string& vfName, const std::string& name, const Vector4& color);
+    void setParticleColor(const std::string& vfName, const std::string& name, const vrmath::Vector4f& color);
 
     void activatePlane(const std::string& vfName, const std::string& name);