Changeset 3618 for trunk/packages/vizservers

Timestamp:

Apr 3, 2013 2:31:10 AM (11 years ago)

Author:

ldelgass

Message:

Some fixes for particle system compile (still doesn't work).

Location:

trunk/packages/vizservers/nanovis

Files:

• Makefile.in (modified) (3 diffs)
• ParticleEmitter.cpp (modified) (1 diff)
• ParticleEmitter.h (modified) (1 diff)
• ParticleSystem.cpp (modified) (10 diffs)
• ParticleSystem.h (modified) (2 diffs)
• ParticleSystemFactory.cpp (modified) (1 diff)
• vrmath/include/vrmath/Vector3f.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/Makefile.in

@@ -2 +2 @@
 USE_THREADS             = yes
 USE_POINTSET_RENDERER   = #yes
+USE_PARTICLE_SYSTEM     = #yes
 
 SHELL = /bin/sh
@@ -180 +181 @@
                 $(srcdir)/shaders/zincblende_volume.cg
 
-ifdef NOTDEF
+ifdef USE_PARTICLE_SYSTEM
 OBJS +=         ParticleEmitter.o \
                 ParticleSystem.o \
@@ -298 +299 @@
 ParticleEmitter.o: ParticleEmitter.cpp ParticleEmitter.h
 ParticleRenderer.o: ParticleRenderer.cpp ParticleRenderer.h
-ParticleSystem.o: ParticleSystem.cpp ParticleSystem.h DataLoader.h
+ParticleSystem.o: ParticleSystem.cpp ParticleSystem.h
 ParticleSystemFactory.o: ParticleSystemFactory.cpp ParticleSystemFactory.h
 PCASplit.o: PCASplit.cpp PCASplit.h

trunk/packages/vizservers/nanovis/ParticleEmitter.cpp

@@ -5 +5 @@
  */
 #include "ParticleEmitter.h"
+
+using namespace nv;
 
 ParticleEmitter::ParticleEmitter() :

trunk/packages/vizservers/nanovis/ParticleEmitter.h

@@ -16 +16 @@
 {
 public:
-   ParticleEmitter();
+    ParticleEmitter();
 
     void setName(const std::string& name);

trunk/packages/vizservers/nanovis/ParticleSystem.cpp

@@ -27 +27 @@
 #include "ParticleSystem.h"
 #include "ParticleEmitter.h"
-#include "DataLoader.h"
 #include "Texture2D.h"
 #include "Texture3D.h"
@@ -33 +32 @@
 #include "Trace.h"
 
+using namespace nv;
 using namespace nv::util;
 
@@ -987 +987 @@
 
         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, _atlas_fbo);
-        _streamVertices->Read(_atlasWidth, _atlasHeight);
+        _streamVertices->read(_atlasWidth, _atlasHeight);
         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
         _currentStreamlineIndex++;
@@ -1096 +1096 @@
 
             glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, psys_fbo[_destPosIndex]);
-            _vertices->Read(_width, _height);
+            _vertices->read(_width, _height);
             glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
         } else {
             glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, psys_fbo[_currentPosIndex]);
-            _vertices->Read(_width, _height);
+            _vertices->read(_width, _height);
             glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
         }
@@ -1110 +1110 @@
             for (unsigned int k = 0; k < numOfNewParticles; ++k) {
                 vrmath::Vector3f position = _emitters[i]->_position;
-                position += _emitters[i]->_maxPositionOffset * 
-                    vrmath::Vector3f(randomRange(-1.0f, 1.0f), randomRange(-1.0f, 1.0f), randomRange(-1.0f, 1.0f));
-
+                position +=
+                    _emitters[i]->_maxPositionOffset.scale(vrmath::Vector3f(randomRange(-1.0f, 1.0f),
+                                                                            randomRange(-1.0f, 1.0f),
+                                                                            randomRange(-1.0f, 1.0f)));
                 float lifetime = randomRange(_emitters[i]->_minLifeTime, _emitters[i]->_maxLifeTime);
 
@@ -1581 +1582 @@
         //glEnableClientState(GL_COLOR_ARRAY);
 
-        _streamVertices->SetPointer(0);
+        _streamVertices->setPointer(0);
         //glColorPointer(4, GL_FLOAT, 0, 0);
 
@@ -1653 +1654 @@
             glEnableClientState(GL_VERTEX_ARRAY);
             //glEnableClientState(GL_COLOR_ARRAY);
-            _vertices->SetPointer(0);
+            _vertices->setPointer(0);
             //glBindBufferARB(GL_ARRAY_BUFFER, _colorBufferID);
             //glColorPointer(4, GL_FLOAT, 0, 0);
@@ -1691 +1692 @@
             glEnableClientState(GL_VERTEX_ARRAY);
             //glEnableClientState(GL_COLOR_ARRAY);
-            _vertices->SetPointer(0);
+            _vertices->setPointer(0);
             //glBindBufferARB(GL_ARRAY_BUFFER, _colorBufferID);
             //glColorPointer(4, GL_FLOAT, 0, 0);
@@ -1718 +1719 @@
             //glEnableClientState(GL_COLOR_ARRAY);
             glPointSize(10);
-            _vertices->SetPointer(0);
+            _vertices->setPointer(0);
             //glBindBufferARB(GL_ARRAY_BUFFER, _colorBufferID);
             //glColorPointer(4, GL_FLOAT, 0, 0);
@@ -1725 +1726 @@
 
             glPointSize(1);
-            _vertices->SetPointer(0);
+            _vertices->setPointer(0);
             //glBindBufferARB(GL_ARRAY_BUFFER, _colorBufferID);
             //glColorPointer(4, GL_FLOAT, 0, 0);

trunk/packages/vizservers/nanovis/ParticleSystem.h

@@ -49 +49 @@
 };
 
-namespace std
-{
-    template <>
-    struct greater<ActiveParticle> {
-        bool operator() (const ActiveParticle& left, const ActiveParticle& right)
-        {
-            return left.timeOfDeath > right.timeOfDeath;
-        }
-    };
-}
+struct particle_greater {
+    bool operator() (const ActiveParticle& left, const ActiveParticle& right)
+    {
+        return (left.timeOfDeath > right.timeOfDeath);
+    }
+};
 
 struct color4 {
@@ -173 +169 @@
 
     priority_queue_vector<int, std::greater<int> > _availableIndices;
-    priority_queue_vector<ActiveParticle, std::greater<ActiveParticle> > _activeParticles;
+    priority_queue_vector<ActiveParticle, particle_greater > _activeParticles;
     std::vector<NewParticle> _newParticles;
 

trunk/packages/vizservers/nanovis/ParticleSystemFactory.cpp

@@ -15 +15 @@
 #include "Trace.h"
 
+using namespace nv;
 using namespace nv::util;
 

trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Vector3f.h

@@ -48 +48 @@
     Vector3f normalize() const;
 
-    Vector3f scale(Vector3f& sc) const;
+    Vector3f scale(const Vector3f& sc) const;
 
     Vector3f scale(float scale) const;
@@ -236 +236 @@
 }
 
-inline Vector3f Vector3f::scale(Vector3f& sc) const
+inline Vector3f Vector3f::scale(const Vector3f& sc) const
 {
     return Vector3f(x * sc.x, y * sc.y, z * sc.z);