Show
Ignore:
Timestamp:
03/21/12 18:36:20 (2 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgParticle/MultiSegmentPlacer

    r11755 r13041  
    1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
    22 * 
    3  * This library is open source and may be redistributed and/or modified under   
    4  * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or  
     3 * This library is open source and may be redistributed and/or modified under 
     4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
    55 * (at your option) any later version.  The full license is in LICENSE file 
    66 * included with this distribution, and on the openscenegraph.org website. 
    7  *  
     7 * 
    88 * This library is distributed in the hope that it will be useful, 
    99 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    10  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1111 * OpenSceneGraph Public License for more details. 
    1212*/ 
     
    4343        /// Get the number of vertices which define the segments. 
    4444        inline int numVertices() const; 
    45          
     45 
    4646        /// Get a vertex. 
    4747        inline const osg::Vec3& getVertex(int i) const; 
    48          
     48 
    4949        /// Set a vertex. 
    5050        inline void setVertex(int i, const osg::Vec3& v); 
    51          
     51 
    5252        /// Set a vertex. 
    5353        inline void setVertex(int i, float x, float y, float z); 
    54          
     54 
    5555        /// Add a vertex. 
    5656        inline void addVertex(const osg::Vec3& v); 
    57          
     57 
    5858        /// Add a vertex. 
    5959        inline void addVertex(float x, float y, float z); 
    60          
     60 
    6161        /// Remove a vertex. 
    6262        inline void removeVertex(int i); 
    63          
     63 
    6464        /// Place a partice. Called automatically by <CODE>ModularEmitter</CODE>, do not call this method manually. 
    6565        void place(Particle* P) const; 
     
    6767        /// return the length of the multi-segment 
    6868        inline float volume() const; 
    69          
     69 
    7070        /// return the control position 
    7171        inline osg::Vec3 getControlPosition() const; 
     
    7373    protected: 
    7474        virtual ~MultiSegmentPlacer() {} 
    75         MultiSegmentPlacer& operator=(const MultiSegmentPlacer&) { return *this; }         
     75        MultiSegmentPlacer& operator=(const MultiSegmentPlacer&) { return *this; } 
    7676 
    7777    private: 
    7878        typedef std::pair<osg::Vec3, float> Vertex_data; 
    7979        typedef std::vector<Vertex_data> Vertex_vector; 
    80          
     80 
    8181        Vertex_vector _vx; 
    8282        float _total_length; 
    83          
     83 
    8484        void recompute_length(); 
    8585    }; 
    8686 
    8787    // INLINE FUNCTIONS 
    88      
     88 
    8989 
    9090    inline int MultiSegmentPlacer::numVertices() const 
     
    112112    inline void MultiSegmentPlacer::addVertex(const osg::Vec3& v) 
    113113    { 
    114         float l = 0;         
     114        float l = 0; 
    115115        if (_vx.size() > 0) { 
    116116            l = (v - _vx.back().first).length(); 
    117         }                 
     117        } 
    118118        _total_length += l; 
    119         _vx.push_back(std::make_pair(v, _total_length));         
     119        _vx.push_back(std::make_pair(v, _total_length)); 
    120120    } 
    121121 
     
    130130        recompute_length(); 
    131131    } 
    132      
     132 
    133133    inline float MultiSegmentPlacer::volume() const 
    134134    { 
    135135        return _total_length; 
    136136    } 
    137      
     137 
    138138    inline osg::Vec3 MultiSegmentPlacer::getControlPosition() const 
    139139    {