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/src/osgSim/LineOfSight.cpp

    r11487 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*/ 
     
    4040    { 
    4141        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); 
    42          
     42 
    4343        FileNameSceneMap::iterator itr = _filenameSceneMap.find(filename); 
    4444        if (itr != _filenameSceneMap.end()) 
    4545        { 
    4646            OSG_INFO<<"Getting from cache "<<filename<<std::endl; 
    47          
     47 
    4848            return itr->second.get(); 
    4949        } 
    5050    } 
    51      
     51 
    5252    // now load the file. 
    5353    osg::ref_ptr<osg::Node> node = osgDB::readNodeFile(filename); 
    54      
     54 
    5555    // insert into the cache. 
    5656    if (node.valid()) 
    5757    { 
    5858        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); 
    59          
     59 
    6060        if (_filenameSceneMap.size() < _maxNumFilesToCache) 
    6161        { 
     
    8484        } 
    8585    } 
    86      
     86 
    8787    return node.release(); 
    8888} 
     
    116116        intersectorGroup->addIntersector( intersector.get() ); 
    117117    } 
    118      
     118 
    119119    _intersectionVisitor.reset(); 
    120120    _intersectionVisitor.setTraversalMask(traversalMask); 
    121121    _intersectionVisitor.setIntersector( intersectorGroup.get() ); 
    122      
     122 
    123123    scene->accept(_intersectionVisitor); 
    124      
     124 
    125125    unsigned int index = 0; 
    126126    osgUtil::IntersectorGroup::Intersectors& intersectors = intersectorGroup->getIntersectors(); 
     
    134134            Intersections& intersectionsLOS = _LOSList[index]._intersections; 
    135135            _LOSList[index]._intersections.clear(); 
    136              
     136 
    137137            osgUtil::LineSegmentIntersector::Intersections& intersections = lsi->getIntersections(); 
    138              
     138 
    139139            for(osgUtil::LineSegmentIntersector::Intersections::iterator itr = intersections.begin(); 
    140140                itr != intersections.end(); 
     
    147147        } 
    148148    } 
    149      
     149 
    150150} 
    151151