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

Removed unneccessary parameter

Browse Source
This commit is contained in:
Robert Osfield 2016-09-02 19:26:20 +01:00
parent e11e45a2e3
commit 0ee65c9d2f
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/Drawable
View File

@ -278,7 +278,7 @@ class OSG_EXPORT Drawable : public Node
*/ */
virtual void compileGLObjects(RenderInfo& renderInfo) const; virtual void compileGLObjects(RenderInfo& renderInfo) const;
virtual VertexArrayState* createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const; virtual VertexArrayState* createVertexArrayState(RenderInfo& renderInfo) const;
/** Set whether to use a mutex to ensure ref() and unref() are thread safe.*/ /** Set whether to use a mutex to ensure ref() and unref() are thread safe.*/
@ -509,7 +509,7 @@ inline void Drawable::draw(RenderInfo& renderInfo) const
VertexArrayState* vas = _vertexArrayStateList[contextID].get(); VertexArrayState* vas = _vertexArrayStateList[contextID].get();
if (!vas) if (!vas)
{ {
_vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo, true); _vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo);
} }
else else
{ {

2
include/osg/Geometry
View File

@ -230,7 +230,7 @@ class OSG_EXPORT Geometry : public Drawable
bool _containsDeprecatedData; bool _containsDeprecatedData;
virtual VertexArrayState* createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const; virtual VertexArrayState* createVertexArrayState(RenderInfo& renderInfo) const;
public: public:

2
include/osgParticle/ParticleSystem
View File

@ -265,7 +265,7 @@ namespace osgParticle
* for all graphics contexts. */ * for all graphics contexts. */
virtual void releaseGLObjects(osg::State* state=0) const; virtual void releaseGLObjects(osg::State* state=0) const;
virtual osg::VertexArrayState* createVertexArrayState(osg::RenderInfo& renderInfo, bool usingVBOs) const; virtual osg::VertexArrayState* createVertexArrayState(osg::RenderInfo& renderInfo) const;
void adjustEstimatedMaxNumOfParticles(int delta) { _estimatedMaxNumOfParticles += delta; } void adjustEstimatedMaxNumOfParticles(int delta) { _estimatedMaxNumOfParticles += delta; }

2
src/osg/Drawable.cpp
View File

@ -696,7 +696,7 @@ void Drawable::draw(RenderInfo& renderInfo) const
#endif #endif
VertexArrayState* Drawable::createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const VertexArrayState* Drawable::createVertexArrayState(RenderInfo& renderInfo) const
{ {
VertexArrayState* vos = new osg::VertexArrayState(renderInfo.getState()); VertexArrayState* vos = new osg::VertexArrayState(renderInfo.getState());
vos->assignAllDispatchers(); vos->assignAllDispatchers();

4
src/osg/Geometry.cpp
View File

@ -672,7 +672,7 @@ void Geometry::releaseGLObjects(State* state) const
} }
VertexArrayState* Geometry::createVertexArrayState(RenderInfo& renderInfo, bool usingVBOs) const VertexArrayState* Geometry::createVertexArrayState(RenderInfo& renderInfo) const
{ {
State& state = *renderInfo.getState(); State& state = *renderInfo.getState();
@ -768,7 +768,7 @@ void Geometry::compileGLObjects(RenderInfo& renderInfo) const
{ {
VertexArrayState* vas = 0; VertexArrayState* vas = 0;
_vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo, true); _vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo);
State::SetCurrentVertexArrayStateProxy setVASProxy(state, vas); State::SetCurrentVertexArrayStateProxy setVASProxy(state, vas);

2
src/osgParticle/ParticleSystem.cpp
View File

@ -657,7 +657,7 @@ void osgParticle::ParticleSystem::releaseGLObjects(osg::State* state) const
} }
} }
osg::VertexArrayState* osgParticle::ParticleSystem::createVertexArrayState(osg::RenderInfo& renderInfo, bool usingVBOs) const osg::VertexArrayState* osgParticle::ParticleSystem::createVertexArrayState(osg::RenderInfo& renderInfo) const
{ {
osg::State& state = *renderInfo.getState(); osg::State& state = *renderInfo.getState();