Changeset 13041 for OpenSceneGraph/trunk/src/osg/Geode.cpp
- Timestamp:
- 03/21/12 18:36:20 (15 months ago)
- Files:
-
- 1 modified
-
OpenSceneGraph/trunk/src/osg/Geode.cpp (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osg/Geode.cpp
r11472 r13041 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 2 2 * 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 5 5 * (at your option) any later version. The full license is in LICENSE file 6 6 * included with this distribution, and on the openscenegraph.org website. 7 * 7 * 8 8 * This library is distributed in the hope that it will be useful, 9 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 11 * OpenSceneGraph Public License for more details. 12 12 */ … … 54 54 // note ref_ptr<> automatically handles incrementing drawable's reference count. 55 55 _drawables.push_back(drawable); 56 56 57 57 // register as parent of drawable. 58 58 drawable->addParent(this); 59 59 60 60 if (drawable->requiresUpdateTraversal()) 61 61 { 62 62 setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1); 63 63 } 64 64 65 65 if (drawable->requiresEventTraversal()) 66 66 { … … 68 68 } 69 69 70 dirtyBound(); 71 70 dirtyBound(); 71 72 72 return true; 73 73 } … … 110 110 setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()-updateCallbackRemoved); 111 111 } 112 112 113 113 if (eventCallbackRemoved) 114 114 { … … 117 117 118 118 dirtyBound(); 119 119 120 120 return true; 121 121 } … … 139 139 if (i<_drawables.size() && newDrawable) 140 140 { 141 141 142 142 Drawable* origDrawable = _drawables[i].get(); 143 143 … … 161 161 // remove from origDrawable's parent list. 162 162 origDrawable->removeParent(this); 163 163 164 164 // note ref_ptr<> automatically handles decrementing origGset's reference count, 165 165 // and incrementing newGset's reference count. … … 171 171 172 172 dirtyBound(); 173 173 174 174 return true; 175 175 } … … 213 213 { 214 214 Node::setThreadSafeRefUnref(threadSafe); 215 215 216 216 for(DrawableList::const_iterator itr=_drawables.begin(); 217 217 itr!=_drawables.end();
