Changeset 13041 for OpenSceneGraph/trunk/src/osgParticle/FireEffect.cpp

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgParticle/FireEffect.cpp (modified) (7 diffs)

OpenSceneGraph/trunk/src/osgParticle/FireEffect.cpp

@@ -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.
 */
@@ -31 +31 @@
 {
     setDefaults();
-    
+
     _position.set(0.0f,0.0f,0.0f);
     _scale = 1.0f;
     _intensity = 1.0f;
-     
+
     _emitterDuration = 60.0;
     _defaultParticleTemplate.setLifeTime(0.5+0.1*_scale);
-       
+
     if (_automaticSetup) buildEffect();
 }
@@ -45 +45 @@
 {
     setDefaults();
-    
+
     _position = position;
     _scale = scale;
     _intensity = intensity;
-     
+
     _emitterDuration = 60.0;
     _defaultParticleTemplate.setLifeTime(0.5+0.1*_scale);
-       
+
     if (_automaticSetup) buildEffect();
 }
@@ -65 +65 @@
 {
     ParticleEffect::setDefaults();
-    
-    _textureFileName = "Images/smoke.rgb";    
+
+    _textureFileName = "Images/smoke.rgb";
     _emitterDuration = 60.0;
 
@@ -74 +74 @@
     _defaultParticleTemplate.setAlphaRange(osgParticle::rangef(0.1f, 1.0f));
     _defaultParticleTemplate.setColorRange(osgParticle::rangev4(
-                                            osg::Vec4(1, 0.8f, 0.2f, 1.0f), 
+                                            osg::Vec4(1, 0.8f, 0.2f, 1.0f),
                                             osg::Vec4(1, 0.3f, 0.2f, 0.0f)));
 }
@@ -93 +93 @@
         osgParticle::Particle& ptemplate = _particleSystem->getDefaultParticleTemplate();
 
-        float radius = 0.25f*_scale; 
+        float radius = 0.25f*_scale;
         float density = 0.5f; // 0.5kg/m^3
 
         ptemplate.setLifeTime(_defaultParticleTemplate.getLifeTime());
 
-        // the following ranges set the envelope of the respective 
+        // the following ranges set the envelope of the respective
         // graphical properties in time.
         ptemplate.setSizeRange(osgParticle::rangef(radius*_defaultParticleTemplate.getSizeRange().minimum,
@@ -158 +158 @@
     // set up program.
     if (!_program)
-    {        
+    {
         _program = new osgParticle::FluidProgram;
     }
-    
+
     if (_program.valid())
     {