Changeset 4889 for nanovis/branches/1.1/ParticleSystem.h

Timestamp:

Dec 19, 2014 10:00:34 PM (9 years ago)

Author:

ldelgass

Message:

Merge r3611:3618 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• ParticleSystem.h (modified) (5 diffs)

nanovis/branches/1.1/ParticleSystem.h

@@ -4 +4 @@
  *
  */
-#ifndef PARTICLESYSTEM_H
-#define PARTICLESYSTEM_H
+#ifndef NV_PARTICLESYSTEM_H
+#define NV_PARTICLESYSTEM_H
 
 #include <vector>
@@ -23 +23 @@
 
 #include "CircularQueue.h"
+
+namespace nv {
 
 struct NewParticle {
@@ -47 +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 {
@@ -171 +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;
 
@@ -409 +407 @@
 }
 
+}
+
 #endif