Changeset 13041 for OpenSceneGraph/trunk/src/osgVolume/FixedFunctionTechnique.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/osgVolume/FixedFunctionTechnique.cpp (modified) (16 diffs)

OpenSceneGraph/trunk/src/osgVolume/FixedFunctionTechnique.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -47 +47 @@
 {
     if (_numSlices==numSlices) return;
-    
+
     _numSlices = numSlices;
-    
+
     if (_volumeTile) _volumeTile->setDirty(true);
 }
- 
+
 osg::Node* createCube(const osg::Vec3& center, float size, unsigned int numSlices)
 {
@@ -75 +75 @@
         (*coords)[i*4+3].set(halfSize,y,halfSize);
     }
-    
+
     osg::Vec3Array* normals = new osg::Vec3Array(1);
     (*normals)[0].set(0.0f,-1.0f,0.0f);
@@ -92 +92 @@
     billboard->addDrawable(geom);
     billboard->setPosition(0,center);
-    
+
     return billboard;
 }
@@ -120 +120 @@
 
     float alphaFuncValue = 0.1;
-   
+
     osg::Image* image_3d = 0;
     osgVolume::Locator* masterLocator = _volumeTile->getLocator();
-    osg::Texture::InternalFormatMode internalFormatMode = osg::Texture::USE_IMAGE_DATA_FORMAT; 
+    osg::Texture::InternalFormatMode internalFormatMode = osg::Texture::USE_IMAGE_DATA_FORMAT;
 
     image_3d = _volumeTile->getLayer()->getImage();
-    
+
     CollectPropertiesVisitor cpv;
     if (_volumeTile->getLayer()->getProperty())
@@ -155 +155 @@
         matrix = masterLocator->getTransform();
     }
-    
+
     OSG_NOTICE<<"Matrix = "<<matrix<<std::endl;
 
@@ -165 +165 @@
     osg::Vec3d v010 = osg::Vec3d(0.0,1.0,0.0) * matrix;
     osg::Vec3d v110 = osg::Vec3d(1.0,1.0,0.0) * matrix;
-    
+
     osg::Vec3d v001 = osg::Vec3d(0.0,0.0,1.0) * matrix;
     osg::Vec3d v101 = osg::Vec3d(1.0,0.0,1.0) * matrix;
     osg::Vec3d v011 = osg::Vec3d(0.0,1.0,1.0) * matrix;
     osg::Vec3d v111 = osg::Vec3d(1.0,1.0,1.0) * matrix;
-    
+
     double cubeSize = (v111-v000).length();
     osg::Vec3d center = (v000+v111)*0.5;
@@ -186 +186 @@
     osg::TexGenNode* texgenNode_0 = new osg::TexGenNode;
     texgenNode_0->addChild(clipnode);
-    texgenNode_0->setTextureUnit(0);                                                                                                                              
-    texgenNode_0->getTexGen()->setMode(osg::TexGen::EYE_LINEAR);                                                                                                  
-    texgenNode_0->getTexGen()->setPlanesFromMatrix(osg::Matrix::inverse(matrix));                                                            
+    texgenNode_0->setTextureUnit(0);
+    texgenNode_0->getTexGen()->setMode(osg::TexGen::EYE_LINEAR);
+    texgenNode_0->getTexGen()->setPlanesFromMatrix(osg::Matrix::inverse(matrix));
 
     osg::StateSet* stateset = texgenNode_0->getOrCreateStateSet();
@@ -194 +194 @@
     stateset->setMode(GL_LIGHTING,osg::StateAttribute::ON);
     stateset->setMode(GL_BLEND,osg::StateAttribute::ON);
-    
+
     if (cpv._afProperty.valid())
     {
@@ -203 +203 @@
         stateset->setAttributeAndModes(new osg::AlphaFunc(osg::AlphaFunc::GREATER,alphaFuncValue), osg::StateAttribute::ON);
     }
-    
+
     osg::Material* material = new osg::Material;
     material->setDiffuse(osg::Material::FRONT_AND_BACK,osg::Vec4(1.0f,1.0f,1.0f,1.0f));
     stateset->setAttributeAndModes(material);
-    
+
     if (cpv._mipProperty.valid())
     {
@@ -226 +226 @@
     texture3D->setWrap(osg::Texture3D::WRAP_S,osg::Texture3D::CLAMP_TO_EDGE);
     texture3D->setWrap(osg::Texture3D::WRAP_T,osg::Texture3D::CLAMP_TO_EDGE);
-    if (image_3d->getPixelFormat()==GL_ALPHA || 
+    if (image_3d->getPixelFormat()==GL_ALPHA ||
         image_3d->getPixelFormat()==GL_LUMINANCE)
     {
@@ -246 +246 @@
 
     stateset->setTextureAttributeAndModes(0,new osg::TexEnv(),osg::StateAttribute::ON);
-        
+
     _node = texgenNode_0;
 }
@@ -257 +257 @@
 void FixedFunctionTechnique::cull(osgUtil::CullVisitor* cv)
 {
-    //OSG_NOTICE<<"FixedFunctionTechnique::cull(osgUtil::CullVisitor* nv)"<<std::endl;    
+    //OSG_NOTICE<<"FixedFunctionTechnique::cull(osgUtil::CullVisitor* nv)"<<std::endl;
     if (_node.valid())
     {
@@ -284 +284 @@
             update(uv);
             return;
-        }        
-        
+        }
+
     }
     else if (nv.getVisitorType()==osg::NodeVisitor::CULL_VISITOR)
@@ -298 +298 @@
 
 
-    if (_volumeTile->getDirty()) 
+    if (_volumeTile->getDirty())
     {
         OSG_INFO<<"******* Doing init ***********"<<std::endl;
@@ -304 +304 @@
     }
 }
-    
+