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

Removed redudent spaces at ends of lines

Browse Source
This commit is contained in:
Robert Osfield
2012-03-01 10:14:55 +00:00
parent 1744617988
commit 2907284d00
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/osg/Program
View File

@@ -1,4 +1,4 @@
/* -*-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
* Copyright (C) 2008 Zebra Imaging
@@ -7,7 +7,7 @@
* 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
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -104,7 +104,7 @@ class OSG_EXPORT Program : public osg::StateAttribute
/** Add an attribute location binding. */
void addBindAttribLocation( const std::string& name, GLuint index );
/** Remove an attribute location binding. */
void removeBindAttribLocation( const std::string& name );
@@ -171,13 +171,13 @@ class OSG_EXPORT Program : public osg::StateAttribute
/** Set the Program using a ProgramBinary. If a ProgramBinary is not yet
* available then setting an empty one signals that compileProgramBinary
* will be called later.*/
void setProgramBinary(ProgramBinary* programBinary) { _programBinary = programBinary; }
void setProgramBinary(ProgramBinary* programBinary) { _programBinary = programBinary; }
/** Get the Program's ProgramBinary, return NULL if none is assigned. */
ProgramBinary* getProgramBinary() { return _programBinary.get(); }
ProgramBinary* getProgramBinary() { return _programBinary.get(); }
/** Get the const Program's ProgramBinary, return NULL if none is assigned. */
const ProgramBinary* getProgramBinary() const { return _programBinary.get(); }
const ProgramBinary* getProgramBinary() const { return _programBinary.get(); }
typedef std::map<std::string,GLuint> AttribBindingList;
typedef std::map<std::string,GLuint> FragDataBindingList;
@@ -276,8 +276,8 @@ class OSG_EXPORT Program : public osg::StateAttribute
(*itr).second = 0;
}
}
inline void apply(const Uniform& uniform) const
{
GLint location = getUniformLocation(uniform.getNameID());
@@ -311,8 +311,8 @@ class OSG_EXPORT Program : public osg::StateAttribute
* Alternative version of getUniformLocation( unsigned int uniformNameID )
* retrofited into OSG for backward compatibility with osgCal,
* after uniform ids were refactored from std::strings to GLints in OSG version 2.9.10.
*
* Drawbacks: This method is not particularly fast. It has to access mutexed static
*
* Drawbacks: This method is not particularly fast. It has to access mutexed static
* map of uniform ids. So don't overuse it or your app performance will suffer.
*/
inline GLint getUniformLocation( const std::string & uniformName ) const { return getUniformLocation( Uniform::getNameID( uniformName ) ); }
@@ -328,7 +328,7 @@ class OSG_EXPORT Program : public osg::StateAttribute
{
_shadersToDetach.push_back(shader);
}
protected: /*methods*/
~PerContextProgram();
@@ -350,11 +350,11 @@ class OSG_EXPORT Program : public osg::StateAttribute
ActiveUniformMap _uniformInfoMap;
ActiveVarInfoMap _attribInfoMap;
UniformBlockMap _uniformBlockMap;
typedef std::pair<osg::ref_ptr<const osg::Uniform>, unsigned int> UniformModifiedCountPair;
typedef std::vector<UniformModifiedCountPair> LastAppliedUniformList;
mutable LastAppliedUniformList _lastAppliedUniformList;
typedef std::vector< ref_ptr<Shader> > ShaderList;
ShaderList _shadersToDetach;
ShaderList _shadersToAttach;