Changeset 13041 for OpenSceneGraph/trunk/include/osgParticle/Particle

Timestamp:

03/21/12 18:36:20 (15 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/include/osgParticle/Particle (modified) (26 diffs)

OpenSceneGraph/trunk/include/osgParticle/Particle

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -41 +41 @@
         time (lifeTime >= 0). For each property which is defined as a range of values, a
         "current" value will be evaluated at each frame by interpolating the <I>min</I>
-        and <I>max</I> values so that <I>curr_value = min</I> when <I>t == 0</I>, and 
+        and <I>max</I> values so that <I>curr_value = min</I> when <I>t == 0</I>, and
         <I>curr_value = max</I> when <I>t == lifeTime</I>.
         You may customize the interpolator objects to achieve any kind of transition.
@@ -51 +51 @@
         friend class ParticleSystem;
     public:
-        
+
         enum
         {
@@ -66 +66 @@
             QUAD_TRIANGLESTRIP,    // uses GL_TRI_angleSTRIP as primitive, but each particle needs a glBegin/glEnd pair
             HEXAGON,            // may save some filling time, but uses more triangles
-            LINE,               // uses GL_LINES to draw line segments that point to the direction of motion   
+            LINE,               // uses GL_LINES to draw line segments that point to the direction of motion
             USER               // uses a user-defined drawable as primitive
         };
-        
+
         Particle();
 
         /// Get the shape of the particle.
         inline Shape getShape() const;
-        
+
         /// Set the shape of the particle.
         inline void setShape(Shape s);
@@ -80 +80 @@
         /// Get whether the particle is still alive.
         inline bool isAlive() const;
-        
+
         /// Get the life time of the particle (in seconds).
         inline double getLifeTime() const;
-        
+
         /// Get the age of the particle (in seconds).
         inline double getAge() const;
-        
+
         /// Get the minimum and maximum values for polygon size.
         inline const rangef& getSizeRange() const;
-        
+
         /// Get the minimum and maximum values for alpha.
         inline const rangef& getAlphaRange() const;
-        
+
         /// Get the minimum and maximum values for color.
         inline const rangev4& getColorRange() const;
-        
+
         /// Get the interpolator for computing the size of polygons.
         inline const Interpolator* getSizeInterpolator() const;
-        
+
         /// Get the interpolator for computing alpha values.
         inline const Interpolator* getAlphaInterpolator() const;
-        
+
         /// Get the interpolator for computing color values.
         inline const Interpolator* getColorInterpolator() const;
@@ -109 +109 @@
         */
         inline float getRadius() const;
-        
+
         /** Get the mass of the particle.
             For built-in operators to work correctly, remember that the mass is expressed in kg.
         */
         inline float getMass() const;
-        
+
         /// Get <CODE>1 / getMass()</CODE>.
         inline float getMassInv() const;
-        
+
         /// Get the position vector.
         inline const osg::Vec3& getPosition() const;
-        
+
         /**    Get the velocity vector.
             For built-in operators to work correctly, remember that velocity components are expressed
             in meters per second.
         */
-        inline const osg::Vec3& getVelocity() const;        
-        
+        inline const osg::Vec3& getVelocity() const;
+
         /// Get the previous position (the position before last update).
         inline const osg::Vec3& getPreviousPosition() const;
@@ -132 +132 @@
         /// Get the angle vector.
         inline const osg::Vec3& getAngle() const;
-        
+
         /// Get the rotational velocity vector.
         inline const osg::Vec3& getAngularVelocity() const;
-        
+
         /// Get the previous angle vector.
         inline const osg::Vec3& getPreviousAngle() const;
-        
+
         /// Get the current color
         inline const osg::Vec4& getCurrentColor() const { return _current_color; }
@@ -144 +144 @@
         /// Get the current alpha
         inline float getCurrentAlpha() const { return _current_alpha; }
-        
+
         /// Get the s texture coordinate of the bottom left of the particle
         inline float getSTexCoord() const { return _s_coord; }
@@ -153 +153 @@
         /// Get width of texture tile
         inline int getTileS() const;
-        
+
         /// Get height of texture tile
         inline int getTileT() const;
-        
+
         /// Get number of texture tiles
         inline int getNumTiles() const { return _end_tile - _start_tile + 1; }
-        
+
         /** Kill the particle on next update
-            NOTE: after calling this function, the <CODE>isAlive()</CODE> method will still 
+            NOTE: after calling this function, the <CODE>isAlive()</CODE> method will still
             return true until the particle is updated again.
         */
         inline void kill();
-        
+
         /// Set the life time of the particle.
         inline void setLifeTime(double t);
-        
+
         /// Set the minimum and maximum values for polygon size.
         inline void setSizeRange(const rangef& r);
-        
+
         /// Set the minimum and maximum values for alpha.
         inline void setAlphaRange(const rangef& r);
-        
+
         /// Set the minimum and maximum values for color.
         inline void setColorRange(const rangev4& r);
-        
+
         /// Set the interpolator for computing size values.
         inline void setSizeInterpolator(Interpolator* ri);
-        
-        /// Set the interpolator for computing alpha values.        
+
+        /// Set the interpolator for computing alpha values.
         inline void setAlphaInterpolator(Interpolator* ai);
-        
+
         /// Set the interpolator for computing color values.
         inline void setColorInterpolator(Interpolator* ci);
@@ -191 +191 @@
         */
         inline void setRadius(float r);
-        
+
         /** Set the mass of the particle.
             For built-in operators to work correctly, remember that the mass is expressed in kg.
         */
         inline void setMass(float m);
-        
-        /// Set the position vector.        
+
+        /// Set the position vector.
         inline void setPosition(const osg::Vec3& p);
-        
+
         /**    Set the velocity vector.
             For built-in operators to work correctly, remember that velocity components are expressed
@@ -205 +205 @@
         */
         inline void setVelocity(const osg::Vec3& v);
-        
+
         /// Add a vector to the velocity vector.
         inline void addVelocity(const osg::Vec3& dv);
-        
+
         /// Transform position and velocity vectors by a matrix.
         inline void transformPositionVelocity(const osg::Matrix& xform);
@@ -217 +217 @@
         /// Set the angle vector.
         inline void setAngle(const osg::Vec3& a);
-        
+
         /**
-          Set the angular velocity vector. 
+          Set the angular velocity vector.
           Components x, y and z are angles of rotation around the respective axis (in radians).
         */
         inline void setAngularVelocity(const osg::Vec3& v);
-        
+
         /// Add a vector to the angular velocity vector.
         inline void addAngularVelocity(const osg::Vec3& dv);
-        
+
         /// Transform angle and angularVelocity vectors by a matrix.
         inline void transformAngleVelocity(const osg::Matrix& xform);
-        
+
         /** Update the particle (don't call this method manually).
             This method is called automatically by <CODE>ParticleSystem::update()</CODE>; it
@@ -240 +240 @@
         /// Perform some pre-rendering tasks. Called automatically by particle systems.
         inline void beginRender(osg::GLBeginEndAdapter* gl) const;
-        
+
         /// Render the particle. Called automatically by particle systems.
         void render(osg::GLBeginEndAdapter* gl, const osg::Vec3& xpos, const osg::Vec3& px, const osg::Vec3& py, float scale = 1.0f) const;
-        
+
         /// Render the particle with user-defined drawable
         void render(osg::RenderInfo& renderInfo, const osg::Vec3& xpos, const osg::Vec3& xrot) const;
-        
+
         /// Perform some post-rendering tasks. Called automatically by particle systems.
         inline void endRender(osg::GLBeginEndAdapter* gl) const;
-        
+
         /// Get the current (interpolated) polygon size. Valid only after the first call to update().
         inline float getCurrentSize() const;
-        
+
         /// Specify how the particle texture is tiled.
         /// All tiles in the given range are sequentially displayed during the lifetime
@@ -272 +272 @@
         /// Get the const next particle
         inline int getNextParticle() const { return _nextParticle; }
-        
+
         /// Set the depth of the particle
         inline void setDepth(double d) { _depth = d; }
-        
+
         /// Get the depth of the particle
         inline double getDepth() const { return _depth; }
-        
+
         /// Set the user-defined particle drawable
         inline void setDrawable(osg::Drawable* d) { _drawable = d; }
-        
+
         /// Get the user-defined particle drawable
         inline osg::Drawable* getDrawable() const { return _drawable.get(); }
-        
+
         /// Sorting operator
         bool operator<(const Particle &P) const { return _depth < P._depth; }
@@ -292 +292 @@
 
     protected:
-    
+
         Shape _shape;
 
@@ -317 +317 @@
         osg::Vec3 _angul_arvel;
 
-        double _t0;        
+        double _t0;
 
         float _alive;
@@ -324 +324 @@
         osg::Vec3 _base_prop;  // [0] _alive [1] _current_size [2] _current_alpha
         osg::Vec4 _current_color;
-        
+
         float _s_tile;
         float _t_tile;
@@ -332 +332 @@
         float _s_coord;
         float _t_coord;
-        
+
         // previous and next Particles are only used in ConnectedParticleSystems
         int _previousParticle;
         int _nextParticle;
-        
+
         // the depth of the particle is used only when sorting is enabled
         double _depth;
-        
+
         // the particle drawable is used only when USER shape is enabled
         osg::ref_ptr<osg::Drawable> _drawable;
@@ -365 +365 @@
         return _lifeTime;
     }
-    
+
     inline double Particle::getAge() const
     {
         return _t0;
     }
-    
+
     inline float Particle::getRadius() const
     {
         return _radius;
     }
-    
+
     inline void Particle::setRadius(float r)
     {
@@ -420 +420 @@
         return _velocity;
     }
-    
+
     inline const osg::Vec3& Particle::getPreviousPosition() const
     {
@@ -430 +430 @@
         return _angle;
     }
-    
+
     inline const osg::Vec3& Particle::getAngularVelocity() const
     {
         return _angul_arvel;
     }
-    
+
     inline const osg::Vec3& Particle::getPreviousAngle() const
     {
         return _prev_angle;
     }
-    
+
     inline int Particle::getTileS() const
     {
@@ -450 +450 @@
         return (_t_tile>0.0f) ? static_cast<int>(1.0f / _t_tile) : 1;
     }
-    
+
     inline void Particle::kill()
     {
@@ -511 +511 @@
         _velocity = osg::Matrix::transform3x3(_velocity, xform);
     }
-    
+
     inline void Particle::transformPositionVelocity(const osg::Matrix& xform1, const osg::Matrix& xform2, float r)
     {
@@ -522 +522 @@
         _velocity = velocity1*r + velocity2*one_minus_r;
     }
-    
+
     inline void Particle::setAngle(const osg::Vec3& a)
     {
         _angle = a;
     }
-    
+
     inline void Particle::setAngularVelocity(const osg::Vec3& v)
     {
         _angul_arvel = v;
     }
-    
+
     inline void Particle::addAngularVelocity(const osg::Vec3& dv)
     {
         _angul_arvel += dv;
     }
-    
+
     inline void Particle::transformAngleVelocity(const osg::Matrix& xform)
     {
         // this should be optimized!
-        
+
         osg::Vec3 a1 = _angle + _angul_arvel;
-        
+
         _angle = xform.preMult(_angle);
         a1 = xform.preMult(a1);
-        
+
         _angul_arvel = a1 - _angle;
     }
-            
+
     inline float Particle::getMass() const
     {
         return _mass;
     }
-    
+
     inline float Particle::getMassInv() const
     {
         return _massinv;
     }
-    
+
     inline void Particle::setMass(float m)
     {
@@ -565 +565 @@
         _massinv = 1 / m;
     }
-    
+
     inline void Particle::beginRender(osg::GLBeginEndAdapter* gl) const
     {
@@ -611 +611 @@
        _s_tile = (sTile>0) ? 1.0f / static_cast<float>(sTile) : 1.0f;
        _t_tile = (tTile>0) ? 1.0f / static_cast<float>(tTile) : 1.0f;
-       
+
        if(startTile == -1)
        {