Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/dae/daeRSceneObjects.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/daeRSceneObjects.cpp (modified) (22 diffs)

OpenSceneGraph/trunk/src/osgPlugins/dae/daeRSceneObjects.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.
  */
 
@@ -43 +43 @@
         OSG_WARN << "Expected element 'ActiveSwitchSet' not found" << std::endl;
     }
-    
+
     any = daeSafeCast<domAny>(teq->getChild("ValueLists"));
     if (any)
@@ -60 +60 @@
                     cdom::tokenize(child->getValue(), " ", stringValues);
                     cdom::tokenIter iter = stringValues.begin();
-                    
+
                     while (iter != stringValues.end())
                     {
@@ -66 +66 @@
                         ++iter;
                     }
-                    
+
                     msw->setValueList(currChild, values);
                 }
@@ -157 +157 @@
         OSG_WARN << "Expected element 'LoopMode' not found" << std::endl;
     }
-    
+
     int begin=0;
     any = daeSafeCast< domAny >(teq->getChild("IntervalBegin"));
@@ -168 +168 @@
         OSG_WARN << "Expected element 'IntervalBegin' not found" << std::endl;
     }
-    
+
     int end=-1;
     any = daeSafeCast< domAny >(teq->getChild("IntervalEnd"));
@@ -192 +192 @@
         OSG_WARN << "Expected element 'DurationSpeed' not found" << std::endl;
     }
-    
+
     int nreps = -1;
     any = daeSafeCast< domAny >(teq->getChild("DurationNReps"));
@@ -267 +267 @@
                     std::list<std::string> stringValues;
                     osg::LOD::MinMaxPair minMaxPair;
-        
+
                     cdom::tokenize(child->getValue(), " ", stringValues);
                     cdom::tokenIter iter = stringValues.begin();
-                    
+
                     if (iter != stringValues.end())
                     {
@@ -335 +335 @@
     domLight::domTechnique_common::domSpot *spot;
 
-    if ( dlight->getTechnique_common() == NULL || 
+    if ( dlight->getTechnique_common() == NULL ||
          dlight->getTechnique_common()->getContents().getCount() == 0 )
     {
@@ -350 +350 @@
     // Enable this OpenGL light
     _rootStateSet->setMode(GL_LIGHT0 + _numlights++, osg::StateAttribute::ON);
-    
+
     // Set ambient of lightmodel to zero
     // Ambient lights are added as separate lights with only an ambient term
     osg::LightModel* lightmodel = new osg::LightModel;
     lightmodel->setAmbientIntensity(osg::Vec4(0.0f,0.0f,0.0f,1.0f));
-    _rootStateSet->setAttributeAndModes(lightmodel, osg::StateAttribute::ON); 
+    _rootStateSet->setAttributeAndModes(lightmodel, osg::StateAttribute::ON);
 
     osg::LightSource* lightsource = new osg::LightSource();
@@ -371 +371 @@
     if ( ambient != NULL )
     {
-        if ( ambient->getColor() == NULL ) 
+        if ( ambient->getColor() == NULL )
         {
             OSG_WARN << "Invalid content for ambient light" << std::endl;
@@ -378 +378 @@
 
         light->setAmbient(    osg::Vec4(    ambient->getColor()->getValue()[0],
-                                        ambient->getColor()->getValue()[1], 
+                                        ambient->getColor()->getValue()[1],
                                         ambient->getColor()->getValue()[2], 1.0f ) );
         light->setDiffuse(    osg::Vec4(    0, 0, 0, 0));
         light->setSpecular(    osg::Vec4(    0, 0, 0, 0));
-        
+
         // Tell OpenGL to make it a directional light (w=0)
         light->setPosition(    osg::Vec4(0,0,0,0));
@@ -388 +388 @@
     else if ( directional != NULL )
     {
-        if ( directional->getColor() == NULL ) 
+        if ( directional->getColor() == NULL )
         {
             OSG_WARN << "Invalid content for directional light" << std::endl;
@@ -394 +394 @@
         }
         light->setAmbient(    osg::Vec4(    0, 0, 0, 0));
-        light->setDiffuse(    osg::Vec4(    directional->getColor()->getValue()[0], 
-                                        directional->getColor()->getValue()[1], 
+        light->setDiffuse(    osg::Vec4(    directional->getColor()->getValue()[0],
+                                        directional->getColor()->getValue()[1],
                                         directional->getColor()->getValue()[2], 1.0f ) );
         light->setSpecular( osg::Vec4(    directional->getColor()->getValue()[0],
-                                        directional->getColor()->getValue()[1], 
+                                        directional->getColor()->getValue()[1],
                                         directional->getColor()->getValue()[2], 1.0f ) );
-        
+
         light->setDirection(osg::Vec3(0,0,-1));
 
@@ -408 +408 @@
     else if ( point != NULL )
     {
-        if ( point->getColor() == NULL ) 
+        if ( point->getColor() == NULL )
         {
             OSG_WARN << "Invalid content for point light" << std::endl;
@@ -414 +414 @@
         }
         light->setAmbient(    osg::Vec4(    0, 0, 0, 0));
-        light->setDiffuse(    osg::Vec4(    point->getColor()->getValue()[0], 
-                                        point->getColor()->getValue()[1], 
+        light->setDiffuse(    osg::Vec4(    point->getColor()->getValue()[0],
+                                        point->getColor()->getValue()[1],
                                         point->getColor()->getValue()[2], 1.0f ) );
-        light->setSpecular( osg::Vec4(    point->getColor()->getValue()[0], 
-                                        point->getColor()->getValue()[1], 
+        light->setSpecular( osg::Vec4(    point->getColor()->getValue()[0],
+                                        point->getColor()->getValue()[1],
                                         point->getColor()->getValue()[2], 1.0f ) );
 
@@ -451 +451 @@
     else if ( spot != NULL )
     {
-        if ( spot->getColor() == NULL ) 
+        if ( spot->getColor() == NULL )
         {
             OSG_WARN << "Invalid content for spot light" << std::endl;
@@ -457 +457 @@
         }
         light->setAmbient(    osg::Vec4(    0, 0, 0, 0));
-        light->setDiffuse(    osg::Vec4(    spot->getColor()->getValue()[0], 
-                                        spot->getColor()->getValue()[1], 
+        light->setDiffuse(    osg::Vec4(    spot->getColor()->getValue()[0],
+                                        spot->getColor()->getValue()[1],
                                         spot->getColor()->getValue()[2], 1.0f ) );
-        light->setSpecular( osg::Vec4(    spot->getColor()->getValue()[0], 
-                                        spot->getColor()->getValue()[1], 
+        light->setSpecular( osg::Vec4(    spot->getColor()->getValue()[0],
+                                        spot->getColor()->getValue()[1],
                                         spot->getColor()->getValue()[2], 1.0f ) );
 
@@ -558 +558 @@
                 pOsgCameraView->setFieldOfView(pXfov->getValue());
                 pOsgCameraView->setFieldOfViewMode(osg::CameraView::HORIZONTAL);
-                
+
                 if (pAspectRatio)
                 {
@@ -570 +570 @@
                 pOsgCameraView->setFieldOfViewMode(osg::CameraView::HORIZONTAL);
             }
-            else 
+            else
             {
                 // <xfov>
@@ -605 +605 @@
     else if (pDomOrthographic)
     {
-        // <orthographic> 
+        // <orthographic>
         // 1    <xmag>, <ymag>, <xmag> and <ymag>, <xmag> and <aspect_ratio>, <ymag> and <aspect_ratio>
         // 1    <znear>
         // 1    <zfar>
-        
+
         //domTargetableFloat *pXmag = daeSafeCast< domTargetableFloat >(pDomOrthographic->getXmag());
         //domTargetableFloat *pYmag = daeSafeCast< domTargetableFloat >(pDomOrthographic->getYmag());
@@ -618 +618 @@
 
         //domTargetableFloat *pZnear = daeSafeCast< domTargetableFloat >(pDomOrthographic->getZnear());
-        //domTargetableFloat *pZfar = daeSafeCast< domTargetableFloat >(pDomOrthographic->getZfar());    
+        //domTargetableFloat *pZfar = daeSafeCast< domTargetableFloat >(pDomOrthographic->getZfar());
 
         // TODO The current osg::CameraView does not support storage of near far