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/osgAnimation/RigTransformSoftware.cpp

    r12292 r13041  
    1 /*  -*-c++-*-  
     1/*  -*-c++-*- 
    22 *  Copyright (C) 2009 Cedric Pinson <cedric.pinson@plopbyte.net> 
    33 * 
    4  * This library is open source and may be redistributed and/or modified under   
    5  * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or  
     4 * This library is open source and may be redistributed and/or modified under 
     5 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
    66 * (at your option) any later version.  The full license is in LICENSE file 
    77 * included with this distribution, and on the openscenegraph.org website. 
    8  *  
     8 * 
    99 * This library is distributed in the hope that it will be useful, 
    1010 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1212 * OpenSceneGraph Public License for more details. 
    1313 */ 
     
    7070        *positionDst = *positionSrc; 
    7171    } 
    72      
     72 
    7373    osg::Vec3Array* normalSrc = dynamic_cast<osg::Vec3Array*>(source.getNormalArray()); 
    7474    osg::Vec3Array* normalDst = dynamic_cast<osg::Vec3Array*>(destination.getNormalArray()); 
     
    8787    if (positionDst && !positionDst->empty()) 
    8888    { 
    89         compute<osg::Vec3>(geom.getMatrixFromSkeletonToGeometry(),  
    90                            geom.getInvMatrixFromSkeletonToGeometry(),   
     89        compute<osg::Vec3>(geom.getMatrixFromSkeletonToGeometry(), 
     90                           geom.getInvMatrixFromSkeletonToGeometry(), 
    9191                           &positionSrc->front(), 
    9292                           &positionDst->front()); 
     
    9696    if (normalDst && !normalDst->empty()) 
    9797    { 
    98         computeNormal<osg::Vec3>(geom.getMatrixFromSkeletonToGeometry(),  
    99                            geom.getInvMatrixFromSkeletonToGeometry(),   
     98        computeNormal<osg::Vec3>(geom.getMatrixFromSkeletonToGeometry(), 
     99                           geom.getInvMatrixFromSkeletonToGeometry(), 
    100100                           &normalSrc->front(), 
    101101                           &normalDst->front()); 
     
    110110    int size = influence.size(); 
    111111    _boneSetVertexSet.resize(size); 
    112     for (int i = 0; i < size; i++)  
     112    for (int i = 0; i < size; i++) 
    113113    { 
    114114        const VertexInfluenceSet::UniqVertexSetToBoneSet& inf = influence[i]; 
     
    117117 
    118118        double sumOfWeight = 0; 
    119         for (int b = 0; b < nbBones; b++)  
     119        for (int b = 0; b < nbBones; b++) 
    120120        { 
    121121            const std::string& bname = inf.getBones()[b].getBoneName(); 
    122122            float weight = inf.getBones()[b].getWeight(); 
    123123            BoneMap::const_iterator it = map.find(bname); 
    124             if (it == map.end())  
     124            if (it == map.end()) 
    125125            { 
    126126                OSG_WARN << "RigTransformSoftware Bone " << bname << " not found, skip the influence group " <<bname  << std::endl; 
     
    134134        // so we check it and renormalize the all weight bone 
    135135        const double threshold = 1e-4; 
    136         if (!_boneSetVertexSet[i].getBones().empty() &&  
     136        if (!_boneSetVertexSet[i].getBones().empty() && 
    137137            (sumOfWeight < 1.0 - threshold ||  sumOfWeight > 1.0 + threshold)) 
    138138        {