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

trunk/packages/vizservers/nanovis/ParticleSystem.h

@@ -22 +22 @@
 struct NewParticle {
     int index;
-    vrVector3f position;
-    vrVector3f velocity;
+    vrmath::Vector3f position;
+    vrmath::Vector3f velocity;
     float timeOfDeath;
     float initTimeStep;
@@ -204 +204 @@
 
     Particle *_particles;
-    vrVector3f *_positionBuffer;
+    vrmath::Vector3f *_positionBuffer;
     color4 *_colorBuffer;
     unsigned _colorBufferID;
@@ -304 +304 @@
     // INSOO
     // TEST
-    std::vector<vrVector3f> *_criticalPoints;
+    std::vector<vrmath::Vector3f> *_criticalPoints;
 
     // TEMP
@@ -322 +322 @@
     void initInitPosTex();
 
-    void allocateParticle(const vrVector3f&, const vrVector3f&, float, float);
+    void allocateParticle(const vrmath::Vector3f&, const vrmath::Vector3f&, float, float);
     void initNewParticles();
     void cleanUpParticles();