Changeset 1298 for trunk

Timestamp:

Mar 7, 2009, 1:38:45 PM (16 years ago)

Author:

vrinside

Message:

fixed the location of particles

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (1 diff)
• NvParticleRenderer.cpp (modified) (3 diffs)
• NvParticleRenderer.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -1997 +1997 @@
     }
     if (NanoVis::particleRenderer != NULL) {
-        NanoVis::particleRenderer->setVectorField(volPtr->id, 1.0f,
+        NanoVis::particleRenderer->setVectorField(volPtr->id, 
+            *(volPtr->get_location()),
+            1.0f,
             volPtr->height / (float)volPtr->width,
             volPtr->depth  / (float)volPtr->width,

trunk/packages/vizservers/nanovis/NvParticleRenderer.cpp

@@ -28 +28 @@
 
 NvParticleRenderer::NvParticleRenderer(int w, int h, CGcontext context)
-    : scale(1, 1, 1), _activate(false)
+    : scale(1, 1, 1), _activate(false), origin(0, 0, 0)
 {
     psys_width = w;
@@ -261 +261 @@
     glPushMatrix();
 
+    glTranslatef(origin.x, origin.y, origin.z);
     glScaled(scale.x, scale.y, scale.z);
 
@@ -275 +276 @@
 }
 
-void NvParticleRenderer::setVectorField(unsigned int texID, float scaleX, float scaleY, float scaleZ, float max)
-{
+void NvParticleRenderer::setVectorField(unsigned int texID, const Vector3& ori, float scaleX, float scaleY, float scaleZ, float max)
+{
+    origin = ori;
     scale.set(scaleX, scaleY, scaleZ);
     _advectionShader->setScale(scale);

trunk/packages/vizservers/nanovis/NvParticleRenderer.h

@@ -93 +93 @@
     Vector3 scale;
 
+    Vector3 origin;
+
     bool _activate;
 public:
@@ -100 +102 @@
     NvParticleRenderer(int w, int h, CGcontext context);
     ~NvParticleRenderer();
-    void setVectorField(unsigned int texID, float scaleX, float scaleY, float scaleZ, float max);
+    void setVectorField(unsigned int texID, const Vector3& ori, float scaleX, float scaleY, float scaleZ, float max);
     void initialize(Particle* data);
     void advect();