Ran script to remove trailing spaces and tabs

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

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.
*/
@@ -19,11 +19,11 @@ template <typename Type>
osg::PrimitiveSet * drawElementsTemplate(GLenum mode,GLsizei count, const typename Type::value_type* indices)
{
if (indices==0 || count==0) return NULL;
Type * dePtr = new Type(mode);
Type & de = *dePtr;
de.reserve(count);
typedef const typename Type::value_type* IndexPointer;
switch(mode)
@@ -31,7 +31,7 @@ osg::PrimitiveSet * drawElementsTemplate(GLenum mode,GLsizei count, const typena
case(GL_TRIANGLES):
{
IndexPointer ilast = &indices[count];
for (IndexPointer iptr=indices; iptr<ilast; iptr+=3)
{
de.push_back(*(iptr));
@@ -42,7 +42,7 @@ osg::PrimitiveSet * drawElementsTemplate(GLenum mode,GLsizei count, const typena
}
case (GL_QUADS):
{
IndexPointer ilast = &indices[count - 3];
for (IndexPointer iptr = indices; iptr<ilast; iptr+=4)
{
@@ -67,12 +67,12 @@ osg::PrimitiveSet * drawElementsTemplate(GLenum mode,GLsizei count, const typena
case (GL_TRIANGLE_FAN):
{
de.push_back(*indices);
IndexPointer iptr = indices + 1;
IndexPointer ilast = &indices[count];
de.resize(count);
std::reverse_copy(iptr, ilast, de.begin() + 1);
break;
}
case (GL_POLYGON):
@@ -85,13 +85,13 @@ osg::PrimitiveSet * drawElementsTemplate(GLenum mode,GLsizei count, const typena
IndexPointer ilast = &indices[count];
de.resize(count);
std::reverse_copy(iptr, ilast, de.begin());
break;
}
default:
break;
}
return &de;
}
@@ -100,18 +100,18 @@ namespace osgUtil {
void ReversePrimitiveFunctor::drawArrays(GLenum mode, GLint first, GLsizei count)
{
if (count==0) return ;
osg::DrawElementsUInt * dePtr = new osg::DrawElementsUInt(mode);
osg::DrawElementsUInt & de = *dePtr;
de.reserve(count);
GLint end = first + count;
switch (mode)
switch (mode)
{
case (GL_TRIANGLES):
case (GL_TRIANGLES):
{
for (GLint i=first; i<end; i+=3)
for (GLint i=first; i<end; i+=3)
{
de.push_back(i);
de.push_back(i+2);
@@ -119,9 +119,9 @@ void ReversePrimitiveFunctor::drawArrays(GLenum mode, GLint first, GLsizei count
}
break;
}
case (GL_QUADS):
case (GL_QUADS):
{
for (GLint i=first; i<end; i+=4)
for (GLint i=first; i<end; i+=4)
{
de.push_back(i);
de.push_back(i+3);
@@ -131,20 +131,20 @@ void ReversePrimitiveFunctor::drawArrays(GLenum mode, GLint first, GLsizei count
break;
}
case (GL_TRIANGLE_STRIP):
case (GL_QUAD_STRIP):
case (GL_QUAD_STRIP):
{
for (GLint i=first; i<end; i+=2)
for (GLint i=first; i<end; i+=2)
{
de.push_back(i+1);
de.push_back(i);
}
break;
}
case (GL_TRIANGLE_FAN):
case (GL_TRIANGLE_FAN):
{
de.push_back(first);
for (GLint i=end-1; i>first; i--)
for (GLint i=end-1; i>first; i--)
de.push_back(i);
break;
@@ -153,11 +153,11 @@ void ReversePrimitiveFunctor::drawArrays(GLenum mode, GLint first, GLsizei count
case (GL_POINTS):
case (GL_LINES):
case (GL_LINE_STRIP):
case (GL_LINE_LOOP):
case (GL_LINE_LOOP):
{
for (GLint i=end-1; i>=first; i--)
for (GLint i=end-1; i>=first; i--)
de.push_back(i);
break;
}
default:
@@ -189,7 +189,7 @@ void ReversePrimitiveFunctor::begin(GLenum mode)
else
{
_running = true;
_reversedPrimitiveSet = new osg::DrawElementsUInt(mode);
}
}
@@ -207,7 +207,7 @@ void ReversePrimitiveFunctor::vertex(unsigned int pos)
}
void ReversePrimitiveFunctor::end()
{
{
if (_running == false)
{
OSG_WARN << "ReversePrimitiveFunctor : call \"end\" without call \"begin\"." << std::endl;
@@ -215,9 +215,9 @@ void ReversePrimitiveFunctor::end()
else
{
_running = false;
osg::ref_ptr<osg::DrawElementsUInt> tmpDe(static_cast<osg::DrawElementsUInt*>(_reversedPrimitiveSet.get()));
_reversedPrimitiveSet = drawElementsTemplate<osg::DrawElementsUInt>(tmpDe->getMode(), tmpDe->size(), &(tmpDe->front()));
}
}