Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/dae/daeWMaterials.cpp

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/daeWMaterials.cpp (modified) (9 diffs)

OpenSceneGraph/trunk/src/osgPlugins/dae/daeWMaterials.cpp

@@ -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.
  */
 
@@ -78 +78 @@
     domEffect *effect = daeSafeCast< domEffect >( lib_effects->add( COLLADA_ELEMENT_EFFECT ) );
     std::string efName = name + "_effect";
-    
+
     effect->setId( efName.c_str() );
 
@@ -143 +143 @@
             domFx_sampler2D_common *sampler = daeSafeCast< domFx_sampler2D_common >( np->add( COLLADA_ELEMENT_SAMPLER2D ) );
             domFx_sampler2D_common_complexType::domSource *source = daeSafeCast< domFx_sampler2D_common_complexType::domSource >( sampler->add( COLLADA_ELEMENT_SOURCE ) );
-            source->setValue( surfName.c_str() ); 
+            source->setValue( surfName.c_str() );
 
             //set sampler state
             domFx_sampler2D_common_complexType::domWrap_s *wrap_s = daeSafeCast< domFx_sampler2D_common_complexType::domWrap_s >( sampler->add( COLLADA_ELEMENT_WRAP_S ) );
             osg::Texture::WrapMode wrap = tex->getWrap( osg::Texture::WRAP_S );
-            switch( wrap ) 
+            switch( wrap )
             {
             case osg::Texture::CLAMP:
@@ -170 +170 @@
             domFx_sampler2D_common_complexType::domWrap_t *wrap_t = daeSafeCast< domFx_sampler2D_common_complexType::domWrap_t >( sampler->add( COLLADA_ELEMENT_WRAP_T ) );
             wrap = tex->getWrap( osg::Texture::WRAP_T );
-            switch( wrap ) 
+            switch( wrap )
             {
             case osg::Texture::CLAMP:
@@ -273 +273 @@
         const osg::Vec4 &sCol = osgmat->getSpecularFrontAndBack()?osgmat->getSpecular( osg::Material::FRONT_AND_BACK ):osgmat->getSpecular( osg::Material::FRONT );
         float shininess = osgmat->getShininessFrontAndBack()?osgmat->getShininess( osg::Material::FRONT_AND_BACK ):osgmat->getShininess( osg::Material::FRONT );
-        
+
         domCommon_color_or_texture_type *cot = daeSafeCast< domCommon_color_or_texture_type >( phong->add( COLLADA_ELEMENT_EMISSION ) );
         domCommon_color_or_texture_type_complexType::domColor *col = daeSafeCast< domCommon_color_or_texture_type_complexType::domColor >( cot->add( COLLADA_ELEMENT_COLOR ) );
@@ -288 +288 @@
         col->getValue().append( aCol.a() );
 
-        
+
         //### check if we really have a texture
         if ( phong->getDiffuse() == NULL )
@@ -302 +302 @@
         {
             cot = phong->getDiffuse();
-            
+
             if (_pluginOptions.writeExtras)
             {
@@ -395 +395 @@
                 ctt->setOpaque( FX_OPAQUE_ENUM_A_ONE );
                 domCommon_color_or_texture_type_complexType::domTexture * dtex = daeSafeCast< domCommon_color_or_texture_type_complexType::domTexture >( ctt->add(COLLADA_ELEMENT_TEXTURE) );
-                
+
                 if (!_pluginOptions.earthTex)
                 {
@@ -406 +406 @@
                     dtex->setTexture( iName.c_str() );
                 }
-                dtex->setTexcoord( "texcoord0" );           
+                dtex->setTexcoord( "texcoord0" );
             }
             else