Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-15 15:28:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix mistakes

Browse source
This commit is contained in:
Dante Ruiz 2018-02-01 08:13:43 -08:00
parent bd5fc65bfb
commit ab20643ada
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/entities/src/EntityItem.cpp
View file

@ -2834,7 +2834,7 @@ DEFINE_PROPERTY_ACCESSOR(quint32, StaticCertificateVersion, staticCertificateVer
uint32_t EntityItem::getDirtyFlags() const { uint32_t EntityItem::getDirtyFlags() const {
uint32_t result; uint32_t result;
withReadLock([&] { withReadLock([&] {
result = _flags & Simulation::SPECIAL_FLAGS; result = _flags & Simulation::DIRTY_FLAGS;
}); });
return result; return result;
} }
@ -2842,14 +2842,14 @@ uint32_t EntityItem::getDirtyFlags() const {
void EntityItem::markDirtyFlags(uint32_t mask) { void EntityItem::markDirtyFlags(uint32_t mask) {
withWriteLock([&] { withWriteLock([&] {
mask &= ~Simulation::SPECIAL_FLAGS; mask &= Simulation::DIRTY_FLAGS;
_flags |= mask; _flags |= mask;
}); });
} }
void EntityItem::clearDirtyFlags(uint32_t mask) { void EntityItem::clearDirtyFlags(uint32_t mask) {
withWriteLock([&] { withWriteLock([&] {
mask &= ~Simulation::SPECIAL_FLAGS; mask &= Simulation::DIRTY_FLAGS;
_flags &= ~mask; _flags &= ~mask;
}); });
} }
@ -2857,21 +2857,21 @@ void EntityItem::clearDirtyFlags(uint32_t mask) {
uint32_t EntityItem::getSpecialFlags() const { uint32_t EntityItem::getSpecialFlags() const {
uint32_t result; uint32_t result;
withReadLock([&] { withReadLock([&] {
result = _flags & Simulation::DIRTY_FLAGS; result = _flags & Simulation::SPECIAL_FLAGS;
}); });
return result; return result;
} }
void EntityItem::markSpecialFlags(uint32_t mask) { void EntityItem::markSpecialFlags(uint32_t mask) {
withWriteLock([&] { withWriteLock([&] {
mask &= ~Simulation::DIRTY_FLAGS; mask &= Simulation::SPECIAL_FLAGS;
_flags |= mask; _flags |= mask;
}); });
} }
void EntityItem::clearSpecialFlags(uint32_t mask) { void EntityItem::clearSpecialFlags(uint32_t mask) {
withWriteLock([&] { withWriteLock([&] {
mask &= ~Simulation::DIRTY_FLAGS; mask &= Simulation::SPECIAL_FLAGS;
_flags &= ~mask; _flags &= ~mask;
}); });
} }