Changeset 13041 for OpenSceneGraph/trunk/src/osgParticle/ParticleSystem.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/ParticleSystem.cpp (modified) (28 diffs)

OpenSceneGraph/trunk/src/osgParticle/ParticleSystem.cpp

@@ -31 +31 @@
 
 osgParticle::ParticleSystem::ParticleSystem()
-:    osg::Drawable(), 
+:    osg::Drawable(),
     _def_bbox(osg::Vec3(-10, -10, -10), osg::Vec3(10, 10, 10)),
     _alignment(BILLBOARD),
@@ -42 +42 @@
     _doublepass(false),
     _frozen(false),
-    _bmin(0, 0, 0), 
-    _bmax(0, 0, 0), 
+    _bmin(0, 0, 0),
+    _bmax(0, 0, 0),
     _reset_bounds_flag(false),
     _bounds_computed(false),
@@ -63 +63 @@
 
 osgParticle::ParticleSystem::ParticleSystem(const ParticleSystem& copy, const osg::CopyOp& copyop)
-:    osg::Drawable(copy, copyop), 
+:    osg::Drawable(copy, copyop),
     _def_bbox(copy._def_bbox),
     _alignment(copy._alignment),
@@ -74 +74 @@
     _doublepass(copy._doublepass),
     _frozen(copy._frozen),
-    _bmin(copy._bmin), 
-    _bmax(copy._bmax), 
+    _bmin(copy._bmin),
+    _bmax(copy._bmax),
     _reset_bounds_flag(copy._reset_bounds_flag),
     _bounds_computed(copy._bounds_computed),
@@ -108 +108 @@
         //     _cur_tile, _s_coord, _t_coord, _prev_pos, _prev_angle and _angle
         osg::StateSet* stateset = getOrCreateStateSet();
-        
+
         if (_dirty_uniforms)
         {
@@ -116 +116 @@
         }
     }
-    
+
     for(unsigned int i=0; i<_particles.size(); ++i)
     {
@@ -132 +132 @@
         }
     }
-    
+
     if (_sortMode != NO_SORT)
     {
@@ -152 +152 @@
         }
     }
-    
+
     // force recomputing of bounding box on next frame
     dirtyBound();
@@ -166 +166 @@
     // this particle system is culled
     _last_frame = state.getFrameStamp()->getFrameNumber();
-    
+
     // update the dirty flag of delta time, so next time a new request for delta time
     // will automatically cause recomputing
     _dirty_dt = true;
-    
+
     // get the current modelview matrix
     osg::Matrix modelview = state.getModelViewMatrix();
@@ -176 +176 @@
     // set up depth mask for first rendering pass
 #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GL3_AVAILABLE)
-    glPushAttrib(GL_DEPTH_BUFFER_BIT); 
+    glPushAttrib(GL_DEPTH_BUFFER_BIT);
 #endif
-    
+
     glDepthMask(GL_FALSE);
 
@@ -193 +193 @@
 
     // render, second pass
-    if (_doublepass) {    
+    if (_doublepass) {
         // set up color mask for second rendering pass
 #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GL3_AVAILABLE)
@@ -237 +237 @@
         texture->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::LINEAR);
         texture->setWrap(osg::Texture2D::WRAP_S, osg::Texture2D::MIRROR);
-        texture->setWrap(osg::Texture2D::WRAP_T, osg::Texture2D::MIRROR);        
+        texture->setWrap(osg::Texture2D::WRAP_T, osg::Texture2D::MIRROR);
         stateset->setTextureAttributeAndModes(texture_unit, texture, osg::StateAttribute::ON);
 
@@ -246 +246 @@
 
     osg::BlendFunc *blend = new osg::BlendFunc;
-    if (emissive_particles) {    
+    if (emissive_particles) {
         blend->setFunction(osg::BlendFunc::SRC_ALPHA, osg::BlendFunc::ONE);
     } else {
@@ -263 +263 @@
     osg::StateSet *stateset = new osg::StateSet;
     stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
-    
+
     osg::PointSprite *sprite = new osg::PointSprite;
     stateset->setTextureAttributeAndModes(texture_unit, sprite, osg::StateAttribute::ON);
-    
+
     #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
         stateset->setMode(GL_VERTEX_PROGRAM_POINT_SIZE, osg::StateAttribute::ON);
@@ -272 +272 @@
         OSG_NOTICE<<"Warning: ParticleSystem::setDefaultAttributesUsingShaders(..) not fully implemented."<<std::endl;
     #endif
-    
+
     if (!texturefile.empty())
     {
@@ -280 +280 @@
         texture->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::LINEAR);
         texture->setWrap(osg::Texture2D::WRAP_S, osg::Texture2D::MIRROR);
-        texture->setWrap(osg::Texture2D::WRAP_T, osg::Texture2D::MIRROR);        
+        texture->setWrap(osg::Texture2D::WRAP_T, osg::Texture2D::MIRROR);
         stateset->setTextureAttributeAndModes(texture_unit, texture, osg::StateAttribute::ON);
     }
-    
+
     osg::BlendFunc *blend = new osg::BlendFunc;
     if (emissive_particles)
-    {    
+    {
         blend->setFunction(osg::BlendFunc::SRC_ALPHA, osg::BlendFunc::ONE);
     }
@@ -294 +294 @@
     }
     stateset->setAttributeAndModes(blend, osg::StateAttribute::ON);
-    
+
     osg::Program *program = new osg::Program;
 #ifdef USE_LOCAL_SHADERS
@@ -338 +338 @@
 #endif
     stateset->setAttributeAndModes(program, osg::StateAttribute::ON);
-    
+
     stateset->addUniform(new osg::Uniform("visibilityDistance", (float)_visibilityDistance));
     stateset->addUniform(new osg::Uniform("baseTexture", texture_unit));
     setStateSet(stateset);
-    
+
     setUseVertexArray(true);
     setUseShaders(true);
@@ -384 +384 @@
             yScale = 1.0f/lengthY2;
         }
-        
+
         scaled_aligned_xAxis *= xScale;
         scaled_aligned_yAxis *= yScale;
-        
+
         xAxis *= xScale;
         yAxis *= yScale;
@@ -404 +404 @@
         glDepthMask(GL_TRUE);
     }
-    
+
     for(unsigned int i=0; i<_particles.size(); i+=_detail)
     {
         const Particle* currentParticle = &_particles[i];
-        
+
         bool insideDistance = true;
         if (_sortMode != NO_SORT && _visibilityDistance>0.0)
             insideDistance = (currentParticle->getDepth()>=0.0 && currentParticle->getDepth()<=_visibilityDistance);
-        
+
         if (currentParticle->isAlive() && insideDistance)
         {
@@ -429 +429 @@
             }
             ++_draw_count;
-            
+
             if (currentParticle->getShape() == Particle::USER)
             {
@@ -440 +440 @@
                 continue;
             }
-            
+
             const osg::Vec3& angle = currentParticle->getAngle();
             bool requiresRotation = (angle.x()!=0.0f || angle.y()!=0.0f || angle.z()!=0.0f);
@@ -447 +447 @@
                 osg::Matrix R;
                 R.makeRotate(
-                    angle.x(), osg::Vec3(1, 0, 0), 
-                    angle.y(), osg::Vec3(0, 1, 0), 
+                    angle.x(), osg::Vec3(1, 0, 0),
+                    angle.y(), osg::Vec3(0, 1, 0),
                     angle.z(), osg::Vec3(0, 0, 1));
 
@@ -455 +455 @@
                     xAxis = osg::Matrix::transform3x3(R,scaled_aligned_xAxis);
                     xAxis = osg::Matrix::transform3x3(modelview,xAxis);
-                    
+
                     yAxis = osg::Matrix::transform3x3(R,scaled_aligned_yAxis);
                     yAxis = osg::Matrix::transform3x3(modelview,yAxis);
@@ -473 +473 @@
                 currentParticle->render(gl,currentParticle->getPosition(), xAxis, yAxis, scale);
             }
-        } 
+        }
     }
 
@@ -483 +483 @@
 {
     if (_particles.size() <= 0) return;
-    
+
     // Compute the pointer and offsets
     Particle_vector::const_iterator itr = _particles.begin();
@@ -497 +497 @@
     GLsizei velOffset = (float*)(&(itr->_velocity)) - ptr;         // Velocity
     GLsizei propOffset = (float*)(&(itr->_alive)) - ptr;       // Alive, size & alpha
-    
+
     // Draw particles as arrays
     osg::State& state = *renderInfo.getState();
@@ -513 +513 @@
 
 osg::BoundingBox osgParticle::ParticleSystem::computeBound() const
-{ 
+{
     if (!_bounds_computed)
     {