Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/dae/daeReader.h

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgPlugins/dae/daeReader.h (modified) (8 diffs)

OpenSceneGraph/trunk/src/osgPlugins/dae/daeReader.h

@@ -2 +2 @@
  * Copyright 2006 Sony Computer Entertainment Inc.
  *
- * Licensed under the SCEA Shared Source License, Version 1.0 (the "License"); you may not use this 
+ * Licensed under the SCEA Shared Source License, Version 1.0 (the "License"); you may not use this
  * file except in compliance with the License. You may obtain a copy of the License at:
  * http://research.scea.com/scea_shared_source_license.html
  *
- * Unless required by applicable law or agreed to in writing, software distributed under the License 
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
- * implied. See the License for the specific language governing permissions and limitations under the 
- * License. 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing permissions and limitations under the
+ * License.
  */
 
@@ -77 +77 @@
 
 template< typename TInputArray, typename TInputType >
-bool findInputSourceBySemantic( TInputArray& inputs, const char* semantic, daeElement *& element, 
+bool findInputSourceBySemantic( TInputArray& inputs, const char* semantic, daeElement *& element,
                                 TInputType ** input = NULL, int unit = 0 )
 {
@@ -130 +130 @@
 /**
 @class daeReader
-@brief Read a OSG scene from a DAE file 
-*/ 
+@brief Read a OSG scene from a DAE file
+*/
 class daeReader {
 public:
@@ -154 +154 @@
 
     bool convert( const std::string &fileURI );
-    
+
     osg::Node* getRootNode()    { return _rootNode; }
 
@@ -168 +168 @@
     };
 
-    enum InterpolationType 
-    { 
-        INTERPOLATION_UNKNOWN, 
-        INTERPOLATION_STEP, 
-        INTERPOLATION_LINEAR, 
-        INTERPOLATION_BEZIER, 
-        INTERPOLATION_HERMITE, 
-        INTERPOLATION_CARDINAL, 
+    enum InterpolationType
+    {
+        INTERPOLATION_UNKNOWN,
+        INTERPOLATION_STEP,
+        INTERPOLATION_LINEAR,
+        INTERPOLATION_BEZIER,
+        INTERPOLATION_HERMITE,
+        INTERPOLATION_CARDINAL,
         INTERPOLATION_BSPLINE,
 
@@ -275 +275 @@
     heuristically decides which way the values should be interpreted.*/
     bool findInvertTransparency(daeDatabase*) const;
-    
+
     osgAnimation::BasicAnimationManager* processAnimationLibraries(domCOLLADA* document);
     void processAnimationClip(osgAnimation::BasicAnimationManager* pOsgAnimationManager, domAnimation_clip* pDomAnimationClip);
@@ -318 +318 @@
     template< typename T >
     void processSinglePPrimitive(osg::Geode* geode, const domMesh* pDomMesh, const T* group, SourceMap& sources, GLenum mode);
-    
+
     template< typename T >
     void processMultiPPrimitive(osg::Geode* geode, const domMesh* pDomMesh, const T* group, SourceMap& sources, GLenum mode);
@@ -338 +338 @@
     void processProfileCOMMON(osg::StateSet *ss, domProfile_COMMON *pc );
     bool processColorOrTextureType(const osg::StateSet*,
-                                    domCommon_color_or_texture_type *cot, 
-                                    osg::Material::ColorMode channel, 
-                                    osg::Material *mat, 
-                                    domCommon_float_or_param_type *fop = NULL, 
+                                    domCommon_color_or_texture_type *cot,
+                                    osg::Material::ColorMode channel,
+                                    osg::Material *mat,
+                                    domCommon_float_or_param_type *fop = NULL,
                                     osg::Texture2D **sa = NULL,
                                     bool normalizeShininess=false);
     void processTransparencySettings( domCommon_transparent_type *ctt,
-                                        domCommon_float_or_param_type *pTransparency, 
+                                        domCommon_float_or_param_type *pTransparency,
                                         osg::StateSet*,
                                         osg::Material *material,