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

rename a function

Browse source
This commit is contained in:
Seth Alves 2015-10-14 06:17:55 -07:00
parent f61a005ebc
commit 742cc0f511
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/AvatarActionHold.h
View file

@ -30,7 +30,7 @@ public:
QByteArray serialize() const;
virtual void deserialize(QByteArray serializedArguments);
virtual bool shouldSuppressEdits() { return true; }
virtual bool shouldSuppressLocationEdits() { return true; }
private:
static const uint16_t holdVersion;

2
libraries/entities/src/EntityActionInterface.h
View file

@ -51,7 +51,7 @@ public:
bool locallyAddedButNotYetReceived = false;
virtual bool shouldSuppressEdits() { return false; }
virtual bool shouldSuppressLocationEdits() { return false; }
protected:
virtual glm::vec3 getPosition() = 0;

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

@ -1791,10 +1791,10 @@ QVariantMap EntityItem::getActionArguments(const QUuid& actionID) const {
return result;
}
bool EntityItem::shouldSuppressEdits() const {
bool EntityItem::shouldSuppressLocationEdits() const {
QHash<QUuid, EntityActionPointer>::const_iterator i = _objectActions.begin();
while (i != _objectActions.end()) {
if (i.value()->shouldSuppressEdits()) {
if (i.value()->shouldSuppressLocationEdits()) {
return true;
}
i++;

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

@ -424,7 +424,7 @@ public:
QVariantMap getActionArguments(const QUuid& actionID) const;
void deserializeActions();
void setActionDataDirty(bool value) const { _actionDataDirty = value; }
bool shouldSuppressEdits() const;
bool shouldSuppressLocationEdits() const;
protected:

2
libraries/physics/src/EntityMotionState.cpp
View file

@ -291,7 +291,7 @@ bool EntityMotionState::remoteSimulationOutOfSync(uint32_t simulationStep) {
return true;
}
if (_entity->shouldSuppressEdits()) {
if (_entity->shouldSuppressLocationEdits()) {
return false;
}