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

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osg/View.cpp

    r12195 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 WARRA;NTY; 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*/ 
     
    3636 
    3737    _camera->setClearColor(osg::Vec4f(0.2f, 0.2f, 0.4f, 1.0f)); 
    38      
     38 
    3939    osg::StateSet* stateset = _camera->getOrCreateStateSet(); 
    4040    stateset->setGlobalDefaults(); 
     
    6060        _camera->setCullCallback(0); 
    6161    } 
    62      
     62 
    6363    // detach the cameras from this View to prevent dangling pointers 
    6464    for(Slaves::iterator itr = _slaves.begin(); 
     
    7070        cd._camera->setCullCallback(0); 
    7171    } 
    72      
     72 
    7373    _camera = 0; 
    7474    _slaves.clear(); 
    75     _light = 0;     
     75    _light = 0; 
    7676 
    7777#if 0 
     
    8282    } 
    8383#endif 
    84      
     84 
    8585    OSG_INFO<<"Done destructing osg::View"<<std::endl; 
    8686} 
     
    9494    _slaves = rhs._slaves; 
    9595 
    96     // update the cameras so they all now see this View as their parent View     
     96    // update the cameras so they all now see this View as their parent View 
    9797    if (_camera.valid()) _camera->setView(this); 
    98      
     98 
    9999    for(unsigned int i=0; i<_slaves.size(); ++i) 
    100100    { 
     
    112112{ 
    113113    _lightingMode = lightingMode; 
    114     if (_lightingMode != NO_LIGHT && !_light)  
     114    if (_lightingMode != NO_LIGHT && !_light) 
    115115    { 
    116116        _light = new osg::Light; 
     
    127127{ 
    128128    if (_camera.valid()) _camera->setView(0); 
    129      
     129 
    130130    _camera = camera; 
    131131 
     
    170170    { 
    171171        camera->removeChildren(0,camera->getNumChildren()); 
    172          
     172 
    173173        if (_camera.valid()) 
    174174        { 
     
    183183 
    184184    _slaves[i].updateSlave(*this); 
    185      
    186     camera->setRenderer(createRenderer(camera));     
     185 
     186    camera->setRenderer(createRenderer(camera)); 
    187187 
    188188    return true; 
     
    195195    _slaves[pos]._camera->setView(0); 
    196196    _slaves[pos]._camera->setCullCallback(0); 
    197      
     197 
    198198    _slaves.erase(_slaves.begin()+pos); 
    199199 
     
    219219        if (_slaves[i]._camera == camera) return (i); 
    220220    } 
    221      
     221 
    222222    return _slaves.size(); 
    223223}