Ran script to remove trailing spaces and tabs

This commit is contained in:
Robert Osfield
2012-03-21 17:36:20 +00:00
parent 1e35f8975d
commit 14a563dc9f
1495 changed files with 21873 additions and 21873 deletions

View File

@@ -1,13 +1,13 @@
/* -*-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.
*/
//osgParticle - Copyright (C) 2002 Marco Jez
@@ -40,7 +40,7 @@ namespace osgParticle
Particles can either live forever (lifeTime < 0), or die after a specified
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.
If you want the particle to live forever, set its lifetime to any value <= 0;
@@ -50,7 +50,7 @@ namespace osgParticle
class OSGPARTICLE_EXPORT Particle {
friend class ParticleSystem;
public:
enum
{
INVALID_INDEX = -1
@@ -65,42 +65,42 @@ namespace osgParticle
QUAD, // uses GL_QUADS as primitive
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);
/// 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;
@@ -108,42 +108,42 @@ namespace osgParticle
For built-in operators to work correctly, lengths must be expressed in meters.
*/
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;
/// 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; }
/// 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; }
@@ -152,37 +152,37 @@ namespace osgParticle
/// 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);
@@ -190,24 +190,24 @@ namespace osgParticle
For built-in operators to work correctly, lengths must be expressed in meters.
*/
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
in meters per second.
*/
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);
@@ -216,19 +216,19 @@ namespace osgParticle
/// 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
updates the graphical properties of the particle for the current time,
@@ -239,19 +239,19 @@ namespace osgParticle
/// 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
/// of the particle. When no range is given, all tiles are displayed during the lifetime.
@@ -271,19 +271,19 @@ namespace osgParticle
/// 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; }
@@ -291,7 +291,7 @@ namespace osgParticle
void setUpTexCoordsAsPartOfConnectedParticleSystem(ParticleSystem* ps);
protected:
Shape _shape;
rangef _sr;
@@ -316,14 +316,14 @@ namespace osgParticle
osg::Vec3 _angle;
osg::Vec3 _angul_arvel;
double _t0;
double _t0;
float _alive;
float _current_size;
float _current_alpha;
osg::Vec3 _base_prop; // [0] _alive [1] _current_size [2] _current_alpha
osg::Vec4 _current_color;
float _s_tile;
float _t_tile;
int _start_tile;
@@ -331,14 +331,14 @@ namespace osgParticle
int _cur_tile;
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;
};
@@ -364,17 +364,17 @@ namespace osgParticle
{
return _lifeTime;
}
inline double Particle::getAge() const
{
return _t0;
}
inline float Particle::getRadius() const
{
return _radius;
}
inline void Particle::setRadius(float r)
{
_radius = r;
@@ -419,7 +419,7 @@ namespace osgParticle
{
return _velocity;
}
inline const osg::Vec3& Particle::getPreviousPosition() const
{
return _prev_pos;
@@ -429,17 +429,17 @@ namespace osgParticle
{
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
{
return (_s_tile>0.0f) ? static_cast<int>(1.0f / _s_tile) : 1;
@@ -449,7 +449,7 @@ namespace osgParticle
{
return (_t_tile>0.0f) ? static_cast<int>(1.0f / _t_tile) : 1;
}
inline void Particle::kill()
{
_mustdie = true;
@@ -510,7 +510,7 @@ namespace osgParticle
_position = xform.preMult(_position);
_velocity = osg::Matrix::transform3x3(_velocity, xform);
}
inline void Particle::transformPositionVelocity(const osg::Matrix& xform1, const osg::Matrix& xform2, float r)
{
osg::Vec3 position1 = xform1.preMult(_position);
@@ -521,50 +521,50 @@ namespace osgParticle
_position = position1*r + position2*one_minus_r;
_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)
{
_mass = m;
_massinv = 1 / m;
}
inline void Particle::beginRender(osg::GLBeginEndAdapter* gl) const
{
switch (_shape)
@@ -610,7 +610,7 @@ namespace osgParticle
{
_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)
{
_start_tile = 0;