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/osgVolume/RayTracedTechnique.cpp

    r12879 r13041  
    1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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*/ 
     
    230230            texture3D->setWrap(osg::Texture3D::WRAP_T,osg::Texture3D::CLAMP_TO_BORDER); 
    231231            texture3D->setBorderColor(osg::Vec4(0.0,0.0,0.0,0.0)); 
    232             if (image_3d->getPixelFormat()==GL_ALPHA ||  
     232            if (image_3d->getPixelFormat()==GL_ALPHA || 
    233233                image_3d->getPixelFormat()==GL_LUMINANCE) 
    234234            { 
     
    304304            } 
    305305            else 
    306             {     
     306            { 
    307307                osg::Shader* fragmentShader = osgDB::readShaderFile(osg::Shader::FRAGMENT, "shaders/volume_mip.frag"); 
    308308                if (fragmentShader) 
     
    338338            } 
    339339            else 
    340             {     
     340            { 
    341341                osg::Shader* fragmentShader = osgDB::readShaderFile(osg::Shader::FRAGMENT, "shaders/volume_iso.frag"); 
    342342                if (fragmentShader) 
    343343                { 
    344344                    OSG_INFO<<"Shader found"<<std::endl; 
    345                  
     345 
    346346                    program->addShader(fragmentShader); 
    347347                } 
     
    354354                } 
    355355            } 
    356         }  
     356        } 
    357357        else if (shadingModel==Light) 
    358358        { 
     
    374374            } 
    375375            else 
    376             {     
     376            { 
    377377                osg::Shader* fragmentShader = osgDB::readShaderFile(osg::Shader::FRAGMENT, "shaders/volume_lit.frag"); 
    378378                if (fragmentShader) 
     
    490490        drawElements->push_back(2); 
    491491        drawElements->push_back(3); 
    492          
     492 
    493493        // bottom 
    494494        drawElements->push_back(3); 
     
    525525        geode->addDrawable(geom); 
    526526 
    527     }  
     527    } 
    528528 
    529529    if (cpv._sampleDensityWhenMovingProperty.valid()) 
     
    600600            update(uv); 
    601601            return; 
    602         }         
    603          
     602        } 
     603 
    604604    } 
    605605    else if (nv.getVisitorType()==osg::NodeVisitor::CULL_VISITOR) 
     
    614614 
    615615 
    616     if (_volumeTile->getDirty())  
     616    if (_volumeTile->getDirty()) 
    617617    { 
    618618        OSG_INFO<<"******* Doing init ***********"<<std::endl; 
     
    620620    } 
    621621} 
    622      
     622 
    623623 
    624624} // end of osgVolume namespace