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/Shape.cpp

    r10504 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*/ 
     
    7272} 
    7373 
    74 HeightField::HeightField(const HeightField& mesh,const CopyOp& copyop):  
     74HeightField::HeightField(const HeightField& mesh,const CopyOp& copyop): 
    7575    Shape(mesh,copyop), 
    7676    _columns(mesh._columns), 
     
    100100} 
    101101 
    102 Vec3 HeightField::getNormal(unsigned int c,unsigned int r) const  
     102Vec3 HeightField::getNormal(unsigned int c,unsigned int r) const 
    103103{ 
    104104    // four point normal generation. 
     
    116116        dz_dx = 0.5f*(getHeight(c+1,r)-getHeight(c-1,r))/getXInterval(); 
    117117    } 
    118      
     118 
    119119    float dz_dy; 
    120120    if (r==0) 
     
    130130        dz_dy = 0.5f*(getHeight(c,r+1)-getHeight(c,r-1))/getYInterval(); 
    131131    } 
    132      
     132 
    133133    Vec3 normal(-dz_dx,-dz_dy,1.0f); 
    134134    normal.normalize(); 
    135      
     135 
    136136    return normal; 
    137137} 
     
    153153        heightDelta.x() = 0.5f*(getHeight(c+1,r)-getHeight(c-1,r)); 
    154154    } 
    155      
     155 
    156156    if (r==0) 
    157157    {