Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 16:23:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

initialize prop defaults, no bool returns

Browse source
This commit is contained in:
David Back 2018-05-17 14:50:14 -07:00
parent 42d8492427
commit b8ce07744d
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3095,25 +3095,21 @@ void EntityItem::setCloneOriginID(const QUuid& value) {
});
}
bool EntityItem::addCloneID(const QUuid& cloneID) {
void EntityItem::addCloneID(const QUuid& cloneID) {
withWriteLock([&] {
if (!_cloneIDs.contains(cloneID)) {
_cloneIDs.append(cloneID);
return true;
}
});
return false;
}
bool EntityItem::removeCloneID(const QUuid& cloneID) {
void EntityItem::removeCloneID(const QUuid& cloneID) {
withWriteLock([&] {
int index = _cloneIDs.indexOf(cloneID);
if (index >= 0) {
_cloneIDs.removeAt(index);
return true;
}
});
return false;
}
const QList<QUuid> EntityItem::getCloneIDs() const {

14
libraries/entities/src/EntityItem.h
View file

@ -507,8 +507,8 @@ public:
void setSimulationOwnershipExpiry(uint64_t expiry) { _simulationOwnershipExpiry = expiry; }
uint64_t getSimulationOwnershipExpiry() const { return _simulationOwnershipExpiry; }
bool addCloneID(const QUuid& cloneID);
bool removeCloneID(const QUuid& cloneID);
void addCloneID(const QUuid& cloneID);
void removeCloneID(const QUuid& cloneID);
const QList<QUuid> getCloneIDs() const;
void setCloneIDs(const QList<QUuid>& cloneIDs);
@ -666,11 +666,11 @@ protected:
bool _cauterized { false }; // if true, don't draw because it would obscure 1st-person camera
bool _cloneable;
float _cloneLifetime;
float _cloneLimit;
bool _cloneDynamic;
bool _cloneAvatarEntity;
bool _cloneable { ENTITY_ITEM_CLONEABLE };
float _cloneLifetime { ENTITY_ITEM_CLONE_LIFETIME };
float _cloneLimit { ENTITY_ITEM_CLONE_LIMIT };
bool _cloneDynamic { ENTITY_ITEM_CLONE_DYNAMIC };
bool _cloneAvatarEntity { ENTITY_ITEM_CLONE_AVATAR_ENTITY };
QUuid _cloneOriginID;
QList<QUuid> _cloneIDs;