Changeset 3492 for trunk/packages/vizservers/nanovis/NvVectorField.cpp

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/NvVectorField.cpp (modified) (5 diffs)

trunk/packages/vizservers/nanovis/NvVectorField.cpp

@@ -2 +2 @@
 #include "nanovis.h"
 
+#include <vrmath/Vector3f.h>
+#include <vrmath/Vector4f.h>
+
 #include "NvVectorField.h"
 #include "NvParticleRenderer.h"
+
+using namespace vrmath;
 
 NvVectorField::NvVectorField() :
@@ -28 +33 @@
 
 void 
-NvVectorField::setVectorField(Volume *volPtr, const Vector3& origin, 
+NvVectorField::setVectorField(Volume *volPtr, const Vector3f& origin, 
                               float scaleX, float scaleY, float scaleZ, 
                               float max)
@@ -135 +140 @@
 }
 
-void NvVectorField::setParticleColor(const std::string& name, const Vector4& color)
+void NvVectorField::setParticleColor(const std::string& name, const vrmath::Vector4f& color)
 {
     std::map<std::string, NvParticleRenderer *>::iterator iter = _particleRendererMap.find(name);
@@ -147 +152 @@
     std::map<std::string, NvParticleRenderer *>::iterator iter = _particleRendererMap.find(name);
     if (iter != _particleRendererMap.end()) {
-        if ((*iter).second) (*iter).second->setColor(Vector4(r,g,b,a));
+        if ((*iter).second) (*iter).second->setColor(vrmath::Vector4f(r,g,b,a));
     }
 }
@@ -187 +192 @@
     glPushMatrix();
 
-    Vector3 origin = _volPtr->location();
+    Vector3f origin = _volPtr->location();
     glTranslatef(origin.x, origin.y, origin.z);
 
-    Vector3 scale = _volPtr->getPhysicalScaling();
+    Vector3f scale = _volPtr->getPhysicalScaling();
     glScaled(scale.x, scale.y, scale.z);
 
-    Vector3 min, max;
+    Vector3f min, max;
     min.x = _volPtr->xAxis.min();
     min.y = _volPtr->yAxis.min();