Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 23:03:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix flag bits

Browse source
This commit is contained in:
SamGondelman 2017-08-23 12:20:30 -07:00
parent d7b3686364
commit 206862a90f
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
interface/src/raypick/RayPick.h
View file

@ -41,7 +41,7 @@ public:
// The key is the Flags // The key is the Flags
Flags _flags; Flags _flags;
RayPickFilter() : _flags(PICK_NOTHING) {} RayPickFilter() : _flags(getBitMask(PICK_NOTHING)) {}
RayPickFilter(const Flags& flags) : _flags(flags) {} RayPickFilter(const Flags& flags) : _flags(flags) {}
bool operator== (const RayPickFilter& rhs) const { return _flags == rhs._flags; } bool operator== (const RayPickFilter& rhs) const { return _flags == rhs._flags; }
@ -63,27 +63,27 @@ public:
// Helpers for RayPickManager // Helpers for RayPickManager
Flags getEntityFlags() const { Flags getEntityFlags() const {
Flags toReturn(PICK_ENTITIES); unsigned int toReturn = getBitMask(PICK_ENTITIES);
if (doesPickInvisible()) { if (doesPickInvisible()) {
toReturn |= Flags(PICK_INCLUDE_INVISIBLE); toReturn |= getBitMask(PICK_INCLUDE_INVISIBLE);
} }
if (doesPickNonCollidable()) { if (doesPickNonCollidable()) {
toReturn |= Flags(PICK_INCLUDE_NONCOLLIDABLE); toReturn |= getBitMask(PICK_INCLUDE_NONCOLLIDABLE);
} }
return toReturn; return Flags(toReturn);
} }
Flags getOverlayFlags() const { Flags getOverlayFlags() const {
Flags toReturn(PICK_OVERLAYS); unsigned int toReturn = getBitMask(PICK_OVERLAYS);
if (doesPickInvisible()) { if (doesPickInvisible()) {
toReturn |= Flags(PICK_INCLUDE_INVISIBLE); toReturn |= getBitMask(PICK_INCLUDE_INVISIBLE);
} }
if (doesPickNonCollidable()) { if (doesPickNonCollidable()) {
toReturn |= Flags(PICK_INCLUDE_NONCOLLIDABLE); toReturn |= getBitMask(PICK_INCLUDE_NONCOLLIDABLE);
} }
return toReturn; return Flags(toReturn);
} }
Flags getAvatarFlags() const { return Flags(PICK_AVATARS); } Flags getAvatarFlags() const { return Flags(getBitMask(PICK_AVATARS)); }
Flags getHUDFlags() const { return Flags(PICK_HUD); } Flags getHUDFlags() const { return Flags(getBitMask(PICK_HUD)); }
static unsigned int getBitMask(FlagBit bit) { return 1 << bit; } static unsigned int getBitMask(FlagBit bit) { return 1 << bit; }