Merged changed to osgParticle from Marco Jez, the changes are (quoted from

email from Marco)

"Most relevant news:
1) particle systems now have the "freezeOnCull" property set to false by
default. Since it is an optimization, and using it may cause some unwanted
behaviors if not handled properly, it makes more sense to turn it off by
default.
2) new "LINE" shape mode which uses GL_LINES to draw line segments that
point to the direction of motion.
3) particles can now have a rotation angle and angular velocity.
4) new AngularAccelOperator applies angular acceleration to particles.
5) particle processors such as emitters and programs can have a "start",
"end" and "reset" time coordinate. For example, an emitter may be instructed
to start emitting particles only after a certain time, stop after another
amount of time and then start again.

Update (2) is from Gideon May.
Updates (3) to (5) are from Douglas A. Pouk."

include/osgParticle/ParticleProcessor

@@ -72,6 +72,36 @@ namespace osgParticle
         /// Set the destination particle system.
         inline void setParticleSystem(ParticleSystem *ps);
         
+        /// Set the endless flag of this processor.
+        inline void setEndless(bool type);
+        
+        /// Check whether this processor is endless.
+        inline bool isEndless() const;
+        
+        /// Set the lifetime of this processor.
+        inline void setLifeTime(double t);
+        
+        /// Get the lifetime of this processor.
+        inline double getLifeTime() const;
+        
+        /// Set the start time of this processor.
+        inline void setStartTime(double t);
+        
+        /// Get the start time of this processor.
+        inline double getStartTime() const;
+
+        /// Set the current time of this processor.
+        inline void setCurrentTime(double t);
+        
+        /// Get the current time of this processor.
+        inline double getCurrentTime() const;
+        
+        /// Set the reset time of this processor. A value of 0 disables reset.
+        inline void setResetTime(double t);
+        
+        /// Get the reset time of this processor.
+        inline double getResetTime() const;
+        
         void traverse(osg::NodeVisitor &nv);
 
         /// Get the current local-to-world transformation matrix (valid only during cull traversal).
@@ -110,6 +140,13 @@ namespace osgParticle
         osg::Matrix ltw_matrix_;
         osg::Matrix wtl_matrix_;
         osg::NodeVisitor *current_nodevisitor_;
+        
+        bool endless_;
+        
+        double lifeTime_;
+        double startTime_;
+        double currentTime_;
+        double resetTime_;
     };
     
     // INLINE FUNCTIONS
@@ -132,7 +169,10 @@ namespace osgParticle
     inline void ParticleProcessor::setEnabled(bool v)
     {
         enabled_ = v;
-        if (enabled_) t0_ = -1;
+        if (enabled_) {
+			t0_ = -1;
+			currentTime_ = 0;
+		}
     }
     
     inline ParticleSystem *ParticleProcessor::getParticleSystem()
@@ -149,6 +189,56 @@ namespace osgParticle
     {
         ps_ = ps;
     }
+   
+    inline void ParticleProcessor::setEndless(bool type)
+    {
+		endless_ = type;
+    }
+        
+    inline bool ParticleProcessor::isEndless() const
+    {
+		return endless_;
+    }
+
+    inline void ParticleProcessor::setLifeTime(double t)
+    {
+		lifeTime_ = t;
+		endless_ = false;
+	}
+        
+    inline double ParticleProcessor::getLifeTime() const
+    {
+		return lifeTime_;
+	}
+	   
+    inline void ParticleProcessor::setStartTime(double t)
+    {
+		startTime_ = t;
+	}
+        
+    inline double ParticleProcessor::getStartTime() const
+    {
+		return startTime_;
+	}
+    inline void ParticleProcessor::setCurrentTime(double t)
+    {
+		currentTime_ = t;
+	}
+        
+    inline double ParticleProcessor::getCurrentTime() const
+    {
+		return currentTime_;
+	}
+	
+	inline void ParticleProcessor::setResetTime(double t)
+	{
+		resetTime_ = t;
+	}
+	
+	inline double ParticleProcessor::getResetTime() const
+	{
+		return resetTime_;
+	}
 
     inline bool ParticleProcessor::computeBound() const
     {