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/osgPlugins/dae/daeReader.h

    r12992 r13041  
    22 * Copyright 2006 Sony Computer Entertainment Inc. 
    33 * 
    4  * Licensed under the SCEA Shared Source License, Version 1.0 (the "License"); you may not use this  
     4 * Licensed under the SCEA Shared Source License, Version 1.0 (the "License"); you may not use this 
    55 * file except in compliance with the License. You may obtain a copy of the License at: 
    66 * http://research.scea.com/scea_shared_source_license.html 
    77 * 
    8  * Unless required by applicable law or agreed to in writing, software distributed under the License  
    9  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or  
    10  * implied. See the License for the specific language governing permissions and limitations under the  
    11  * License.  
     8 * Unless required by applicable law or agreed to in writing, software distributed under the License 
     9 * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
     10 * implied. See the License for the specific language governing permissions and limitations under the 
     11 * License. 
    1212 */ 
    1313 
     
    7777 
    7878template< typename TInputArray, typename TInputType > 
    79 bool findInputSourceBySemantic( TInputArray& inputs, const char* semantic, daeElement *& element,  
     79bool findInputSourceBySemantic( TInputArray& inputs, const char* semantic, daeElement *& element, 
    8080                                TInputType ** input = NULL, int unit = 0 ) 
    8181{ 
     
    130130/** 
    131131@class daeReader 
    132 @brief Read a OSG scene from a DAE file  
    133 */  
     132@brief Read a OSG scene from a DAE file 
     133*/ 
    134134class daeReader { 
    135135public: 
     
    154154 
    155155    bool convert( const std::string &fileURI ); 
    156      
     156 
    157157    osg::Node* getRootNode()    { return _rootNode; } 
    158158 
     
    168168    }; 
    169169 
    170     enum InterpolationType  
    171     {  
    172         INTERPOLATION_UNKNOWN,  
    173         INTERPOLATION_STEP,  
    174         INTERPOLATION_LINEAR,  
    175         INTERPOLATION_BEZIER,  
    176         INTERPOLATION_HERMITE,  
    177         INTERPOLATION_CARDINAL,  
     170    enum InterpolationType 
     171    { 
     172        INTERPOLATION_UNKNOWN, 
     173        INTERPOLATION_STEP, 
     174        INTERPOLATION_LINEAR, 
     175        INTERPOLATION_BEZIER, 
     176        INTERPOLATION_HERMITE, 
     177        INTERPOLATION_CARDINAL, 
    178178        INTERPOLATION_BSPLINE, 
    179179 
     
    275275    heuristically decides which way the values should be interpreted.*/ 
    276276    bool findInvertTransparency(daeDatabase*) const; 
    277      
     277 
    278278    osgAnimation::BasicAnimationManager* processAnimationLibraries(domCOLLADA* document); 
    279279    void processAnimationClip(osgAnimation::BasicAnimationManager* pOsgAnimationManager, domAnimation_clip* pDomAnimationClip); 
     
    318318    template< typename T > 
    319319    void processSinglePPrimitive(osg::Geode* geode, const domMesh* pDomMesh, const T* group, SourceMap& sources, GLenum mode); 
    320      
     320 
    321321    template< typename T > 
    322322    void processMultiPPrimitive(osg::Geode* geode, const domMesh* pDomMesh, const T* group, SourceMap& sources, GLenum mode); 
     
    338338    void processProfileCOMMON(osg::StateSet *ss, domProfile_COMMON *pc ); 
    339339    bool processColorOrTextureType(const osg::StateSet*, 
    340                                     domCommon_color_or_texture_type *cot,  
    341                                     osg::Material::ColorMode channel,  
    342                                     osg::Material *mat,  
    343                                     domCommon_float_or_param_type *fop = NULL,  
     340                                    domCommon_color_or_texture_type *cot, 
     341                                    osg::Material::ColorMode channel, 
     342                                    osg::Material *mat, 
     343                                    domCommon_float_or_param_type *fop = NULL, 
    344344                                    osg::Texture2D **sa = NULL, 
    345345                                    bool normalizeShininess=false); 
    346346    void processTransparencySettings( domCommon_transparent_type *ctt, 
    347                                         domCommon_float_or_param_type *pTransparency,  
     347                                        domCommon_float_or_param_type *pTransparency, 
    348348                                        osg::StateSet*, 
    349349                                        osg::Material *material,