Changeset 13041 for OpenSceneGraph/trunk/include/osg/Shader

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/include/osg/Shader (modified) (7 diffs)

OpenSceneGraph/trunk/include/osg/Shader

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  * Copyright (C) 2003-2005 3Dlabs Inc. Ltd.
  * Copyright (C) 2004-2005 Nathan Cournia
@@ -5 +5 @@
  * Copyright (C) 2010 VIRES Simulationstechnologie GmbH
  *
- * This application is open source and may be redistributed and/or modified   
+ * This application is open source and may be redistributed and/or modified
  * freely and without restriction, both in commercial and non commercial
  * applications, as long as this copyright notice is maintained.
- * 
+ *
  * This application is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34 +34 @@
 class Program;
 
-/** Simple class for wrapping up the data used in OpenGL ES 2's glShaderBinary calls.  
+/** Simple class for wrapping up the data used in OpenGL ES 2's glShaderBinary calls.
   * ShaderBinary is set up with the binary data then assigned to one or more osg::Shader. */
 class OSG_EXPORT ShaderBinary : public osg::Object
@@ -115 +115 @@
         /** Get the Shader type as a descriptive string. */
         const char* getTypename() const;
-        
+
 
         /** Set file name for the shader source code. */
@@ -132 +132 @@
 
         /** Set the Shader using a ShaderBinary. */
-        void setShaderBinary(ShaderBinary* shaderBinary) { _shaderBinary = shaderBinary; } 
-        
+        void setShaderBinary(ShaderBinary* shaderBinary) { _shaderBinary = shaderBinary; }
+
         /** Get the Shader's ShaderBinary, return NULL if none is assigned. */
-        ShaderBinary* getShaderBinary() { return _shaderBinary.get(); } 
+        ShaderBinary* getShaderBinary() { return _shaderBinary.get(); }
 
         /** Get the const Shader's ShaderBinary, return NULL if none is assigned. */
-        const ShaderBinary* getShaderBinary() const { return _shaderBinary.get(); } 
+        const ShaderBinary* getShaderBinary() const { return _shaderBinary.get(); }
 
 
@@ -178 +178 @@
         /** Mark our PCSs as needing recompilation.
           * Also mark Programs that depend on us as needing relink */
-        void dirtyShader();        
+        void dirtyShader();
 
         /** If needed, compile the PCS's glShader */
@@ -268 +268 @@
 
         CodeInjectionMap                _codeInjectionMap;
-        
+
         /** osg::Programs that this osg::Shader is attached to */
         typedef std::set< osg::Program* > ProgramSet;