Changeset 5481

Timestamp:

May 9, 2015, 1:37:21 PM (9 years ago)

Author:

ldelgass

Message:

Merge (manual) ParticleRenderer? changes from trunk

Location:

nanovis/branches/1.2

Files:

• ParticleRenderer.cpp (modified) (14 diffs)
• ParticleRenderer.h (modified) (3 diffs)

nanovis/branches/1.2/ParticleRenderer.cpp

@@ -13 +13 @@
 #include <GL/glew.h>
 
+#include <vrmath/Vector3f.h>
 #include <vrmath/Color4f.h>
 
 #include "ParticleRenderer.h"
+#include "Volume.h"
 #include "define.h"
 #include "Trace.h"
 
+using namespace vrmath;
 using namespace nv;
-
-ParticleAdvectionShader *ParticleRenderer::_advectionShader = NULL;
-ParticleAdvectionShaderInstance shaderInstance;
 
 ParticleRenderer::ParticleRenderer(int w, int h) :
     _initPosTex(0),
     _data(NULL),
-    _psysFrame(0U),
+    _psysFrame(0),
     _reborn(true),
     _flip(true),
-    _maxLife(500U),
+    _maxLife(500),
     _particleSize(1.2),
     _vertexArray(NULL),
@@ -43 +43 @@
 {
     _data = new Particle[w * h];
-    memset(_data, 0, sizeof(Particle) * w * h);
 
     _vertexArray = new RenderVertexArray(_psysWidth * _psysHeight, 3, GL_FLOAT);
@@ -104 +103 @@
 #endif
 
-    if (_advectionShader == NULL) {
-        _advectionShader = new ParticleAdvectionShader();
-    }
+    _advectionShader = new ParticleAdvectionShader();
 }
 
@@ -121 +118 @@
     glDeleteFramebuffersEXT(2, _psysFbo);
 
+    delete _advectionShader;
     delete _vertexArray;
     delete [] _data;
@@ -128 +126 @@
 ParticleRenderer::initializeDataArray()
 {
-    size_t n = _psysWidth * _psysHeight * 4;
-    memset(_data, 0, sizeof(float)* n);
-
-    int index;
-    bool particle;
-    float *p = (float *)_data;
+    TRACE("Enter axis: %d pos: %g", _sliceAxis, _slicePos);
+
+    memset(_data, 0, sizeof(Particle) * _psysWidth * _psysHeight);
+
+    bool hasParticle;
     for (int i = 0; i < _psysWidth; i++) {
         for (int j = 0; j < _psysHeight; j++) {
-            index = i + _psysHeight*j;
-            particle = (rand() % 256) > 150;
-            if (particle) {
+            Particle *p = &_data[i + _psysHeight*j];
+            hasParticle = (rand() % 256) > 150;
+            if (hasParticle) {
                 //assign any location (x,y,z) in range [0,1]
                 switch (_sliceAxis) {
                 case AXIS_X:
-                    p[4*index]   = _slicePos;
-                    p[4*index+1] = j/float(_psysHeight);
-                    p[4*index+2] = i/float(_psysWidth);
+                    p->x   = _slicePos;
+                    p->y = j/float(_psysHeight);
+                    p->z = i/float(_psysWidth);
                     break;
                 case AXIS_Y:
-                    p[4*index]   = j/float(_psysHeight);
-                    p[4*index+1] = _slicePos;
-                    p[4*index+2] = i/float(_psysWidth);
+                    p->x = j/float(_psysHeight);
+                    p->y = _slicePos;
+                    p->z = i/float(_psysWidth);
                     break;
                 case AXIS_Z:
-                    p[4*index]   = j/float(_psysHeight);
-                    p[4*index+1] = i/float(_psysWidth);
-                    p[4*index+2] = _slicePos;
+                    p->x = j/float(_psysHeight);
+                    p->y = i/float(_psysWidth);
+                    p->z = _slicePos;
                     break;
                 default:
-                    p[4*index]   = 0;
-                    p[4*index+1] = 0;
-                    p[4*index+2] = 0;
-                    p[4*index+3] = 0;
+                    ERROR("Unknown axis");
                 }
-
                 //shorter life span, quicker iterations
-                p[4*index+3] = rand() / ((float) RAND_MAX) * 0.5  + 0.5f; 
-            } else {
-                p[4*index]   = 0;
-                p[4*index+1] = 0;
-                p[4*index+2] = 0;
-                p[4*index+3] = 0;
+                p->life = rand() / ((float) RAND_MAX) * 0.5  + 0.5f;
             }
         }
@@ -178 +166 @@
 ParticleRenderer::initialize()
 {
+    TRACE("Enter");
+
     initializeDataArray();
 
@@ -192 +182 @@
     _flip = true;
     _reborn = false;
+    _psysFrame = 0;
 
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, _initPosTex);
@@ -220 +211 @@
     _flip = true;
     _reborn = false;
-    _psysFrame = 0U;
+    _psysFrame = 0;
 }
 
@@ -226 +217 @@
 ParticleRenderer::advect()
 {
+    TRACE("Enter");
+
     if (_reborn) 
         reset();
@@ -281 +274 @@
     _psysFrame++;
     if (_psysFrame == _maxLife) {
-        _psysFrame = 0U;
-        // _reborn = true;
+        //_psysFrame = 0;
+        //_reborn = true;
     }
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboOrig);
@@ -293 +286 @@
 {
     _vertexArray->read(_psysWidth, _psysHeight);
-
-    //_vertexArray->loadData(vert);     //does not work??
-    //assert(glGetError()==0);
 }
 
@@ -301 +291 @@
 ParticleRenderer::render()
 {
+    if (_psysFrame == 0) {
+        TRACE("Initializing vertex array");
+        advect();
+    }
+
     glPushAttrib(GL_ENABLE_BIT);
     glDisable(GL_TEXTURE_2D);
@@ -340 +335 @@
 ParticleRenderer::setSliceAxis(FlowSliceAxis axis)
 {
-    _sliceAxis = axis;
-    initializeDataArray();
+    if (axis != _sliceAxis) {
+        _sliceAxis = axis;
+        initialize();
+    }
 }
 
@@ -347 +344 @@
 ParticleRenderer::setSlicePosition(float pos)
 {
-    _slicePos = pos;
-    initializeDataArray();
-}
+    if (pos != _slicePos) {
+        _slicePos = pos;
+        initialize();
+    }
+}

nanovis/branches/1.2/ParticleRenderer.h

@@ -15 +15 @@
 
 #include "FlowTypes.h"
+#include "Volume.h"
 #include "ParticleAdvectionShader.h"
 #include "RenderVertexArray.h"
@@ -94 +95 @@
     }
 
-   static ParticleAdvectionShader *_advectionShader;
-
 private:
     void initializeDataArray();
 
     void updateVertexBuffer();
+
+    ParticleAdvectionShader *_advectionShader;
 
     /// frame buffer objects: two are defined, flip them as input output every step
@@ -143 +144 @@
 };
 
-class ParticleAdvectionShaderInstance
-{
-public :
-    ParticleAdvectionShaderInstance()
-    {}
-
-    ~ParticleAdvectionShaderInstance()
-    {
-        if (ParticleRenderer::_advectionShader) {
-            delete ParticleRenderer::_advectionShader;
-        }
-    }
-};
-
 }