Ignore:
Timestamp:
Dec 20, 2014, 1:00:34 AM (5 years ago)
Author:
ldelgass
Message:

Merge r3611:3618 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/ParticleSystem.h

    r3502 r4889  
    44 *
    55 */
    6 #ifndef PARTICLESYSTEM_H
    7 #define PARTICLESYSTEM_H
     6#ifndef NV_PARTICLESYSTEM_H
     7#define NV_PARTICLESYSTEM_H
    88
    99#include <vector>
     
    2323
    2424#include "CircularQueue.h"
     25
     26namespace nv {
    2527
    2628struct NewParticle {
     
    4749};
    4850
    49 namespace std
    50 {
    51     template <>
    52     struct greater<ActiveParticle> {
    53         bool operator() (const ActiveParticle& left, const ActiveParticle& right)
    54         {
    55             return left.timeOfDeath > right.timeOfDeath;
    56         }
    57     };
    58 }
     51struct particle_greater {
     52    bool operator() (const ActiveParticle& left, const ActiveParticle& right)
     53    {
     54        return (left.timeOfDeath > right.timeOfDeath);
     55    }
     56};
    5957
    6058struct color4 {
     
    171169
    172170    priority_queue_vector<int, std::greater<int> > _availableIndices;
    173     priority_queue_vector<ActiveParticle, std::greater<ActiveParticle> > _activeParticles;
     171    priority_queue_vector<ActiveParticle, particle_greater > _activeParticles;
    174172    std::vector<NewParticle> _newParticles;
    175173
     
    409407}
    410408
     409}
     410
    411411#endif
Note: See TracChangeset for help on using the changeset viewer.