Changeset 13041 for OpenSceneGraph/trunk/src/osgUtil/ShaderGen.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/osgUtil/ShaderGen.cpp (modified) (14 diffs)

OpenSceneGraph/trunk/src/osgUtil/ShaderGen.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.
 */
@@ -60 +60 @@
     {
         UniformMap::const_iterator it = _uniformMap.find(name);
-        return it != _uniformMap.end() ? 
+        return it != _uniformMap.end() ?
             const_cast<osg::Uniform *>(it->second.uniformVec.back().first) : 0;
     }
@@ -67 +67 @@
 
     osg::StateAttribute::GLModeValue getMode(const ModeMap &modeMap,
-        osg::StateAttribute::GLMode mode, 
+        osg::StateAttribute::GLMode mode,
         osg::StateAttribute::GLModeValue def = osg::StateAttribute::INHERIT) const
     {
@@ -78 +78 @@
     {
         AttributeMap::const_iterator it = attributeMap.find(std::make_pair(type, member));
-        return (it != attributeMap.end() && it->second.attributeVec.size()) ? 
+        return (it != attributeMap.end() && it->second.attributeVec.size()) ?
             const_cast<osg::StateAttribute*>(it->second.attributeVec.back().first) : 0;
     }
@@ -135 +135 @@
         vert << "varying vec3 viewDir;\n";
     }
-    
+
     // copy varying to fragment shader
     frag << vert.str();
@@ -169 +169 @@
     if (stateMask & NORMAL_MAP)
     {
-        vert << 
+        vert <<
             "  vec3 n = gl_NormalMatrix * gl_Normal;\n"\
             "  vec3 t = gl_NormalMatrix * tangent;\n"\
@@ -188 +188 @@
     else if (stateMask & LIGHTING)
     {
-        vert << 
+        vert <<
             "  normalDir = gl_NormalMatrix * gl_Normal;\n"\
             "  vec3 dir = -vec3(gl_ModelViewMatrix * gl_Vertex);\n"\
@@ -200 +200 @@
     else if (stateMask & FOG)
     {
-        vert << 
+        vert <<
             "  viewDir = -vec3(gl_ModelViewMatrix * gl_Vertex);\n"\
             "  gl_FrontColor = gl_Color;\n";
@@ -208 +208 @@
         vert << "  gl_FrontColor = gl_Color;\n";
     }
-    
+
     vert << "}\n";
 
@@ -231 +231 @@
     if (stateMask & (LIGHTING | NORMAL_MAP))
     {
-        frag << 
+        frag <<
             "  vec3 nd = normalize(normalDir);\n"\
             "  vec3 ld = normalize(lightDir);\n"\
@@ -259 +259 @@
     if (stateMask & FOG)
     {
-        frag << 
+        frag <<
             "  float d2 = dot(viewDir, viewDir);//gl_FragCoord.z/gl_FragCoord.w;\n"\
             "  float f = exp2(-1.442695*gl_Fog.density*gl_Fog.density*d2);\n"\
             "  color.rgb = mix(gl_Fog.color.rgb, color.rgb, clamp(f, 0.0, 1.0));\n";
     }
-    
+
     frag << "  gl_FragColor = color;\n";
     frag << "}\n";
@@ -280 +280 @@
 }
 
-ShaderGenVisitor::ShaderGenVisitor() : 
+ShaderGenVisitor::ShaderGenVisitor() :
     NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
     _stateCache(new ShaderGenCache),
@@ -287 +287 @@
 }
 
-ShaderGenVisitor::ShaderGenVisitor(ShaderGenCache *stateCache) : 
+ShaderGenVisitor::ShaderGenVisitor(ShaderGenCache *stateCache) :
     NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
     _stateCache(stateCache),
@@ -384 +384 @@
     ss->setAttribute(progss->getAttribute(osg::StateAttribute::PROGRAM));
     ss->setUniformList(progss->getUniformList());
-    
+
     // remove any modes that won't be appropriate when using shaders
     if ((stateMask&ShaderGenCache::LIGHTING)!=0)