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/osgUtil/SceneGraphBuilder.cpp

    r12372 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*/ 
     
    6060{ 
    6161    if (!_matrixStack.empty()) _matrixStack.pop_back(); 
    62      
     62 
    6363    matrixChanged(); 
    6464} 
     
    215215{ 
    216216    osg::Vec3 vertex(x,y,z); 
    217      
     217 
    218218    vertex = vertex * _matrixStack.back(); 
    219      
     219 
    220220    if (_vertices.valid()) _vertices->push_back(vertex); 
    221221    if (_normal.valid()) _normals->push_back(_normal); 
     
    229229    _primitiveMode = mode; 
    230230    _vertices = new osg::Vec3Array; 
    231      
     231 
    232232    _normalSet = false; 
    233233    _normals = new osg::Vec3Array; 
     
    246246 
    247247    _geometry->setVertexArray(_vertices.get()); 
    248      
     248 
    249249    if (_colorSet) 
    250250    { 
     
    256256         osg::Vec4Array* colors = new osg::Vec4Array; 
    257257         colors->push_back(_color); 
    258           
     258 
    259259         _geometry->setColorArray(colors); 
    260260         _geometry->setColorBinding(osg::Geometry::BIND_OVERALL); 
    261261    } 
    262      
     262 
    263263    if (_normalSet) 
    264264    { 
     
    270270         _geometry->setNormalBinding(osg::Geometry::BIND_OFF); 
    271271    } 
    272      
     272 
    273273    if (_maxNumTexCoordComponents==1) 
    274274    { 
     
    449449{ 
    450450    osg::ref_ptr<osg::Node> node; 
    451      
     451 
    452452    if (_group.valid() && _group->getNumChildren()>0) node = _group.get(); 
    453453    else if (_transform.valid() && _transform->getNumChildren()>0) node = _transform.get(); 
    454454    else if (_geode.valid() && _geode->getNumDrawables()>0) node = _geode.get(); 
    455      
     455 
    456456    // reset all the pointers to properly release the scene graph 
    457457    _geometry = 0; 
     
    459459    _transform = 0; 
    460460    _group = 0; 
    461          
     461 
    462462    return node.release(); 
    463463} 
     
    496496    osg::ShapeDrawable* sd = new osg::ShapeDrawable(shape); 
    497497    sd->setColor(_color); 
    498      
     498 
    499499    addDrawable(sd); 
    500500} 
     
    520520        _statesetAssigned = false; 
    521521    } 
    522      
     522 
    523523    if (!_stateset) _stateset = new osg::StateSet; 
    524524}