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

Put the ordering of the callbacks so that the update callback is first,

Browse Source 
then cull then draw.  Added missing copy of update callback into copy
constructor.
This commit is contained in:
Robert Osfield 2003-12-16 08:56:49 +00:00
parent 1158e4605d
commit 2e9676f2cb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/Drawable
View File

@ -692,8 +692,8 @@ class SG_EXPORT Drawable : public Object
mutable GLObjectList _vboList; mutable GLObjectList _vboList;
ref_ptr<UpdateCallback> _updateCallback; ref_ptr<UpdateCallback> _updateCallback;
ref_ptr<DrawCallback> _drawCallback;
ref_ptr<CullCallback> _cullCallback; ref_ptr<CullCallback> _cullCallback;
ref_ptr<DrawCallback> _drawCallback;
}; };

5
src/osg/Drawable.cpp
View File

@ -154,8 +154,9 @@ Drawable::Drawable(const Drawable& drawable,const CopyOp& copyop):
_useDisplayList(drawable._useDisplayList), _useDisplayList(drawable._useDisplayList),
_supportsVertexBufferObjects(drawable._supportsVertexBufferObjects), _supportsVertexBufferObjects(drawable._supportsVertexBufferObjects),
_useVertexBufferObjects(drawable._useVertexBufferObjects), _useVertexBufferObjects(drawable._useVertexBufferObjects),
_drawCallback(drawable._drawCallback), _updateCallback(drawable._updateCallback),
_cullCallback(drawable._cullCallback) _cullCallback(drawable._cullCallback),
_drawCallback(drawable._drawCallback)
{ {
} }