FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ran script to remove trailing spaces and tabs

Browse Source
This commit is contained in:
Robert Osfield
2012-03-21 17:36:20 +00:00
parent 1e35f8975d
commit 14a563dc9f
1495 changed files with 21873 additions and 21873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/osg/VertexProgram.cpp
View File

@@ -1,13 +1,13 @@
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 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.
*/
#include <osg/Notify>
@@ -23,7 +23,7 @@
using namespace osg;
// static cache of deleted vertex programs which can only
// static cache of deleted vertex programs which can only
// by completely deleted once the appropriate OpenGL context
// is set.
typedef std::list<GLuint> VertexProgramObjectList;
@@ -69,7 +69,7 @@ void VertexProgram::flushDeletedVertexProgramObjects(unsigned int contextID,doub
elapsedTime = timer.delta_s(start_tick,timer.tick());
}
}
availableTime -= elapsedTime;
}
@@ -91,13 +91,13 @@ VertexProgram::VertexProgram(const VertexProgram& vp,const CopyOp& copyop):
{
_vertexProgram = vp._vertexProgram;
for( LocalParamList::const_iterator itr = vp._programLocalParameters.begin();
for( LocalParamList::const_iterator itr = vp._programLocalParameters.begin();
itr != vp._programLocalParameters.end(); ++itr )
{
_programLocalParameters[itr->first] = itr->second;
}
for( MatrixList::const_iterator mitr = vp._matrixList.begin();
for( MatrixList::const_iterator mitr = vp._matrixList.begin();
mitr != vp._matrixList.end(); ++mitr )
{
_matrixList[mitr->first] = mitr->second;
@@ -278,7 +278,7 @@ void VertexProgram::Extensions::glBindProgram(GLenum target, GLuint id) const
else
{
OSG_WARN<<"Error: glBindProgram not supported by OpenGL driver"<<std::endl;
}
}
}
void VertexProgram::Extensions::glGenPrograms(GLsizei n, GLuint *programs) const
@@ -309,7 +309,7 @@ void VertexProgram::Extensions::glProgramString(GLenum target, GLenum format, GL
{
if (_glProgramString)
{
_glProgramString(target,format, len, string);
_glProgramString(target,format, len, string);
}
else
{