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

Timestamp:

Mar 9, 2012, 2:24:05 PM (13 years ago)

Author:

ldelgass

Message:

Exclude unused file from build, misc. cleanups

File:

• trunk/packages/vizservers/nanovis/NvVectorField.cpp (modified) (17 diffs)

trunk/packages/vizservers/nanovis/NvVectorField.cpp

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+#include "nanovis.h"
+
 #include "NvVectorField.h"
 #include "NvParticleRenderer.h"
-#include "nanovis.h"
 
 NvVectorField::NvVectorField() :
-    _vectorFieldId(0), 
-    _activated(true), 
-    _scaleX(1), 
-    _scaleY(1), 
-    _scaleZ(1), 
+    _vectorFieldId(0),
+    _activated(true),
+    _scaleX(1),
+    _scaleY(1),
+    _scaleZ(1),
     _max(1)
 {
@@ -19 +20 @@
 NvVectorField::~NvVectorField()
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter;
+    std::map<std::string, NvParticleRenderer *>::iterator iter;
     for (iter = _particleRendererMap.begin(); 
          iter != _particleRendererMap.end(); iter++) {
@@ -27 +28 @@
 
 void 
-NvVectorField::setVectorField(Volume* volPtr, const Vector3& ori, 
+NvVectorField::setVectorField(Volume *volPtr, const Vector3& ori, 
                               float scaleX, float scaleY, float scaleZ, 
                               float max)
@@ -60 +61 @@
 void NvVectorField::initialize()
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter;
+    std::map<std::string, NvParticleRenderer *>::iterator iter;
     for (iter = _particleRendererMap.begin(); 
          iter != _particleRendererMap.end(); iter++) {
@@ -69 +70 @@
 void NvVectorField::reset()
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter;
+    std::map<std::string, NvParticleRenderer *>::iterator iter;
     for (iter = _particleRendererMap.begin(); 
          iter != _particleRendererMap.end(); iter++) {
@@ -78 +79 @@
 void NvVectorField::setPlaneAxis(const std::string& name, int axis)
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter = _particleRendererMap.find(name);
+    std::map<std::string, NvParticleRenderer *>::iterator iter = _particleRendererMap.find(name);
     if (iter != _particleRendererMap.end()) {
         (*iter).second->setAxis(axis);
@@ -87 +88 @@
 void NvVectorField::setPlanePos(const std::string& name, float pos)
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter = _particleRendererMap.find(name);
+    std::map<std::string, NvParticleRenderer *>::iterator iter = _particleRendererMap.find(name);
     if (iter != _particleRendererMap.end()) {
         (*iter).second->setPos(pos);
@@ -95 +96 @@
 void NvVectorField::addPlane(const std::string& name)
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter = _particleRendererMap.find(name);
-    NvParticleRenderer* renderer = 0;
+    std::map<std::string, NvParticleRenderer *>::iterator iter = _particleRendererMap.find(name);
+    NvParticleRenderer *renderer = NULL;
     if (iter != _particleRendererMap.end()) {
         if ((*iter).second != 0) {
@@ -107 +108 @@
         _particleRendererMap[name] = renderer;
     }
-        
+
     renderer->setVectorField(_vectorFieldId, _origin, _scaleX, _scaleY, _scaleZ, _max);
     if (renderer) {
@@ -116 +117 @@
 void NvVectorField::removePlane(const std::string& name)
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter = _particleRendererMap.find(name);
+    std::map<std::string, NvParticleRenderer* >::iterator iter = _particleRendererMap.find(name);
     if (iter != _particleRendererMap.end()) {
         delete (*iter).second;
@@ -125 +126 @@
 void NvVectorField::activatePlane(const std::string& name)
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter = _particleRendererMap.find(name);
+    std::map<std::string, NvParticleRenderer *>::iterator iter = _particleRendererMap.find(name);
     if (iter != _particleRendererMap.end()) {
         (*iter).second->active(true);
@@ -133 +134 @@
 void NvVectorField::deactivatePlane(const std::string& name)
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter = _particleRendererMap.find(name);
+    std::map<std::string, NvParticleRenderer *>::iterator iter = _particleRendererMap.find(name);
     if (iter != _particleRendererMap.end()) {
         (*iter).second->active(false);
@@ -141 +142 @@
 void NvVectorField::setParticleColor(const std::string& name, const Vector4& color)
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter = _particleRendererMap.find(name);
+    std::map<std::string, NvParticleRenderer *>::iterator iter = _particleRendererMap.find(name);
     if (iter != _particleRendererMap.end()) {
         (*iter).second->setColor(color);
@@ -149 +150 @@
 void NvVectorField::setParticleColor(const std::string& name, float r, float g, float b, float a)
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter = _particleRendererMap.find(name);
+    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));
@@ -157 +158 @@
 void NvVectorField::advect()
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter;
+    std::map<std::string, NvParticleRenderer *>::iterator iter;
     for (iter = _particleRendererMap.begin(); 
          iter != _particleRendererMap.end(); ++iter) {
@@ -167 +168 @@
 void NvVectorField::render()
 {
-    std::map<std::string, NvParticleRenderer*>::iterator iter;
+    std::map<std::string, NvParticleRenderer *>::iterator iter;
     for (iter = _particleRendererMap.begin(); 
          iter != _particleRendererMap.end(); ++iter) {
@@ -277 +278 @@
     }
 }
-
-