Changeset 13041 for OpenSceneGraph/trunk/src/osgVolume/Volume.cpp
- Timestamp:
- 03/21/12 18:36:20 (15 months ago)
- Files:
-
- 1 modified
-
OpenSceneGraph/trunk/src/osgVolume/Volume.cpp (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgVolume/Volume.cpp
r12292 r13041 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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 */ … … 37 37 const_cast<VolumeTile*>(*itr)->_volume = 0; 38 38 } 39 39 40 40 _volumeTileSet.clear(); 41 41 _volumeTileMap.clear(); … … 53 53 VolumeTileMap::iterator itr = _volumeTileMap.find(tileID); 54 54 if (itr != _volumeTileMap.end()) return 0; 55 55 56 56 return itr->second; 57 57 } … … 63 63 VolumeTileMap::const_iterator itr = _volumeTileMap.find(tileID); 64 64 if (itr != _volumeTileMap.end()) return 0; 65 65 66 66 return itr->second; 67 67 } … … 85 85 86 86 OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); 87 87 88 88 if (volumeTile->getTileID().valid()) 89 89 { 90 90 _volumeTileMap[volumeTile->getTileID()] = volumeTile; 91 91 } 92 92 93 93 _volumeTileSet.insert(volumeTile); 94 94 … … 108 108 _volumeTileMap.erase(volumeTile->getTileID()); 109 109 } 110 110 111 111 _volumeTileSet.erase(volumeTile); 112 112
