Changeset 2860 for trunk/packages/vizservers/nanovis

Timestamp:

Mar 16, 2012 12:15:59 AM (12 years ago)

Author:

ldelgass

Message:

Put class member declarations in standard order

Location:

trunk/packages/vizservers/nanovis

Files:

• ParticleEmitter.h (modified) (2 diffs)
• ParticleSystem.h (modified) (4 diffs)
• ParticleSystemFactory.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/ParticleEmitter.h

@@ -10 +10 @@
 {
 public:
+   ParticleEmitter();
+
+    void setName(const std::string& name);
+    void setPosition(float x, float y, float z);
+    void setMinMaxLifeTime(float minLifeTime, float maxLifeTime);
+    void setMaxPositionOffset(float offsetX, float offsetY, float offsetZ);
+    void setMinMaxNumOfNewParticles(int minNum, int maxNum);
+
+    void setVectorField();
+    void setEnabled(bool enabled);
+    bool isEnabled() const;
+
     std::string _name;
     vrVector3f _position;
@@ -25 +37 @@
 
     bool _enabled;
-
-    ParticleEmitter();
-
-    void setName(const std::string& name);
-    void setPosition(float x, float y, float z);
-    void setMinMaxLifeTime(float minLifeTime, float maxLifeTime);
-    void setMaxPositionOffset(float offsetX, float offsetY, float offsetZ);
-    void setMinMaxNumOfNewParticles(int minNum, int maxNum);
-
-    void setVectorField();
-    void setEnabled(bool enabled);
-    bool isEnabled() const;
 };
 

trunk/packages/vizservers/nanovis/ParticleSystem.h

@@ -76 +76 @@
     };
 
+    ParticleSystem(int width, int height, const std::string& fileName,
+                   int fieldWidth, int fieldHeight, int fieldDepth, 
+                   bool timeVaryingData, int flowFileStartIndex, int flowFileEndIndex);
+    ~ParticleSystem();
+    void createRenderTargets();
+    void createSortRenderTargets();
+    void createStreamlineRenderTargets();
+    void advectStreamlines();
+    void renderStreamlines();
+
+    bool advect(float deltaT, float camx, float camy, float camz);
+    void enable(EnableEnum enabled);
+    void disable(EnableEnum enabled);
+    bool isEnabled(EnableEnum enabled);
+
+    ////////////////////////////////////////////
+    void addEmitter(ParticleEmitter *emitter);
+    ParticleEmitter *getEmitter(int index);
+    unsigned int getNumEmitters() const;
+    void removeEmitter(int index);
+    void removeAllEmitters();
+
+    int getMaxSize() const;
+
+    void render();
+
+    void reset();
+
+    void setDefaultPointSize(float size);
+
+    unsigned int getNumOfActiveParticles() const;
+
+    void setScreenSize(int sreenWidth, int screenHeight);
+
+    void setFOV(float fov);
+
+    void setUserDefinedNumOfParticles(int numParticles);
+
+    float getScaleX() const;
+    float getScaleY() const;
+    float getScaleZ() const;
+    unsigned int getVectorFieldGraphicsID() const;
+
+    bool isTimeVaryingField() const;
+    void setTimeVaryingField(bool timeVarying);
+
+    void setDepthCueEnabled(bool enabled);
+    bool getDepthCueEnabled() const;
+
+    static void *dataLoadMain(void *data);
+    // TEMP
+    static void callbackForCgError();
+
     const int _width;
     const int _height;
@@ -133 +186 @@
     unsigned int velocity_tex[2];
 
-    // TEMP
     ///////////////////////////////////////////////////
     // TIME SERIES
@@ -170 +222 @@
     bool _streamlineEnabled;
     bool _depthCueEnabled;
-
-    // TEMP
-    static void callbackForCgError();
-    static CGcontext _context;
 
     CGprogram _distanceInitFP;
@@ -258 +306 @@
     std::vector<vrVector3f> *_criticalPoints;
 
-    static void *dataLoadMain(void *data);
-
-    ParticleSystem(int width, int height, const std::string& fileName,
-                   int fieldWidth, int fieldHeight, int fieldDepth, 
-                   bool timeVaryingData, int flowFileStartIndex, int flowFileEndIndex);
-    ~ParticleSystem();
-    void createRenderTargets();
-    void createSortRenderTargets();
-    void createStreamlineRenderTargets();
-    void advectStreamlines();
-    void renderStreamlines();
-
-    bool advect(float deltaT, float camx, float camy, float camz);
-    void enable(EnableEnum enabled);
-    void disable(EnableEnum enabled);
-    bool isEnabled(EnableEnum enabled);
-
-    ////////////////////////////////////////////
-    void addEmitter(ParticleEmitter *emitter);
-    ParticleEmitter *getEmitter(int index);
-    unsigned int getNumEmitters() const;
-    void removeEmitter(int index);
-    void removeAllEmitters();
-
-    int getMaxSize() const;
-
-    void render();
-
-    void reset();
-
-    void setDefaultPointSize(float size);
-
-    unsigned int getNumOfActiveParticles() const;
-
-    void setScreenSize(int sreenWidth, int screenHeight);
-
-    void setFOV(float fov);
-
-    void setUserDefinedNumOfParticles(int numParticles);
-
-    float getScaleX()const;
-    float getScaleY()const;
-    float getScaleZ()const;
-    unsigned int getVectorFieldGraphicsID() const;
-
-    bool isTimeVaryingField() const;
-    void setTimeVaryingField(bool timeVarying);
-
-    void setDepthCueEnabled(bool enabled);
-    bool getDepthCueEnabled() const;
+    // TEMP
+    static CGcontext _context;
 
 protected:

trunk/packages/vizservers/nanovis/ParticleSystemFactory.h

@@ -11 +11 @@
 class ParticleSystemFactory
 {
-    ParticleSystem *_newParticleSystem;
 public:
     ParticleSystemFactory();
@@ -25 +24 @@
     static void startElement(void *userData, const char *elementName, const char **attrs);
     static void text(void *data, const XML_Char *txt, int len);
+
+    ParticleSystem *_newParticleSystem;
 };