TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-17 12:12:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Joe Shochet 2002-01-24 18:15:08 +00:00
parent 6008bc93a9
commit 03476f1b2f
2 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
panda/src/tform/mouseWatcherGroup.cxx
View File

@ -38,8 +38,21 @@ MouseWatcherGroup::
// added, or false if it was already on the list.
////////////////////////////////////////////////////////////////////
bool MouseWatcherGroup::
add_region(MouseWatcherRegion *region) {
return _regions.insert(region).second;
add_region(PT(MouseWatcherRegion) region) {
//return _regions.insert(region).second;
// See if the region is in the set/vector already
Regions::const_iterator ri = find(_regions.begin(),
_regions.end(),
region);
if (ri != _regions.end()) {
// Already in the set, return false
return false;
}
// Not in the set, add it and return true
_regions.push_back(region);
return true;
}
////////////////////////////////////////////////////////////////////
@ -49,8 +62,17 @@ add_region(MouseWatcherRegion *region) {
// added to the MouseWatcherGroup, false otherwise.
////////////////////////////////////////////////////////////////////
bool MouseWatcherGroup::
has_region(MouseWatcherRegion *region) const {
return _regions.count(region) != 0;
has_region(PT(MouseWatcherRegion) region) const {
// See if the region is in the set/vector
Regions::const_iterator ri = find(_regions.begin(),
_regions.end(),
region);
if (ri != _regions.end()) {
// Found it
return true;
}
// Did not find the region
return false;
}
////////////////////////////////////////////////////////////////////
@ -61,8 +83,21 @@ has_region(MouseWatcherRegion *region) const {
// if it wasn't there in the first place.
////////////////////////////////////////////////////////////////////
bool MouseWatcherGroup::
remove_region(MouseWatcherRegion *region) {
return _regions.erase(region) != 0;
remove_region(PT(MouseWatcherRegion) region) {
//return _regions.erase(region) != 0;
// See if the region is in the set/vector
Regions::iterator ri = find(_regions.begin(),
_regions.end(),
region);
if (ri != _regions.end()) {
// Found it, now erase it
_regions.erase(ri);
return true;
}
// Did not find the region to erase
return false;
}
////////////////////////////////////////////////////////////////////

10
panda/src/tform/mouseWatcherGroup.h
View File

@ -24,7 +24,7 @@
#include "pointerTo.h"
#include "referenceCount.h"
#include "pset.h"
#include "pvector.h"
////////////////////////////////////////////////////////////////////
// Class : MouseWatcherGroup
@ -36,14 +36,14 @@ public:
virtual ~MouseWatcherGroup();
PUBLISHED:
bool add_region(MouseWatcherRegion *region);
bool has_region(MouseWatcherRegion *region) const;
bool remove_region(MouseWatcherRegion *region);
bool add_region(PT(MouseWatcherRegion) region);
bool has_region(PT(MouseWatcherRegion) region) const;
bool remove_region(PT(MouseWatcherRegion) region);
MouseWatcherRegion *find_region(const string &name) const;
void clear_regions();
protected:
typedef pset< PT(MouseWatcherRegion) > Regions;
typedef pvector< PT(MouseWatcherRegion) > Regions;
Regions _regions;
public: