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

made requested changes

Browse source
This commit is contained in:
Dante Ruiz 2018-01-31 15:21:22 -08:00
parent 01f8227fa2
commit f6029ed9dc
2 changed files with 22 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 & 0x0000ffff; result = _flags & ~Simulation::SPECIAL_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 &= 0x0000ffff; mask &= ~Simulation::SPECIAL_FLAGS;
_flags |= mask; _flags |= mask;
}); });
} }
void EntityItem::clearDirtyFlags(uint32_t mask) { void EntityItem::clearDirtyFlags(uint32_t mask) {
withWriteLock([&] { withWriteLock([&] {
mask &= 0x0000ffff; mask &= ~Simulation::SPECIAL_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 & 0xffff0000; result = _flags & ~Simulation::DIRTY_FLAGS;
}); });
return result; return result;
} }
void EntityItem::markSpecialFlags(uint32_t mask) { void EntityItem::markSpecialFlags(uint32_t mask) {
withWriteLock([&] { withWriteLock([&] {
mask &= 0xffff0000; mask &= ~Simulation::DIRTY_FLAGS;
_flags |= mask; _flags |= mask;
}); });
} }
void EntityItem::clearSpecialFlags(uint32_t mask) { void EntityItem::clearSpecialFlags(uint32_t mask) {
withWriteLock([&] { withWriteLock([&] {
mask &= 0xffff0000; mask &= ~Simulation::DIRTY_FLAGS;
_flags &= ~mask; _flags &= ~mask;
}); });
} }

16
libraries/entities/src/SimulationFlags.h
View file

@ -33,6 +33,22 @@ namespace Simulation {
const uint32_t DIRTY_TRANSFORM = DIRTY_POSITION | DIRTY_ROTATION; const uint32_t DIRTY_TRANSFORM = DIRTY_POSITION | DIRTY_ROTATION;
const uint32_t DIRTY_VELOCITIES = DIRTY_LINEAR_VELOCITY | DIRTY_ANGULAR_VELOCITY; const uint32_t DIRTY_VELOCITIES = DIRTY_LINEAR_VELOCITY | DIRTY_ANGULAR_VELOCITY;
const uint32_t SPECIAL_FLAGS = SPECIAL_FLAGS_NO_BOOTSTRAPPING;
const uint32_t DIRTY_FLAGS = DIRTY_POSITION |
DIRTY_ROTATION |
DIRTY_LINEAR_VELOCITY |
DIRTY_ANGULAR_VELOCITY |
DIRTY_MASS |
DIRTY_COLLISION_GROUP |
DIRTY_MOTION_TYPE |
DIRTY_SHAPE |
DIRTY_LIFETIME |
DIRTY_UPDATEABLE |
DIRTY_MATERIAL |
DIRTY_PHYSICS_ACTIVATION |
DIRTY_SIMULATOR_ID |
DIRTY_SIMULATION_OWNERSHIP_PRIORITY;
}; };
#endif // hifi_SimulationFlags_h #endif // hifi_SimulationFlags_h