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

change data member names to not poke other devs in the eye

Browse source
This commit is contained in:
Andrew Meadows 2019-05-31 11:03:11 -07:00
parent 0c916e0c03
commit 5f9262cf5e
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
interface/src/avatar/MyAvatar.cpp
View file

@ -325,8 +325,8 @@ MyAvatar::MyAvatar(QThread* thread) :
MyAvatar::~MyAvatar() {
_lookAtTargetAvatar.reset();
delete _myScriptEngine;
_myScriptEngine = nullptr;
delete _scriptEngine;
_scriptEngine = nullptr;
}
QString MyAvatar::getDominantHand() const {
@ -1598,8 +1598,8 @@ void MyAvatar::handleChangedAvatarEntityData() {
blobFailed = true; // blob doesn't exist
return;
}
std::lock_guard<std::mutex> guard(_myScriptEngineLock);
if (!EntityItemProperties::blobToProperties(*_myScriptEngine, itr.value(), properties)) {
std::lock_guard<std::mutex> guard(_scriptEngineLock);
if (!EntityItemProperties::blobToProperties(*_scriptEngine, itr.value(), properties)) {
blobFailed = true; // blob is corrupt
}
});
@ -1631,8 +1631,8 @@ void MyAvatar::handleChangedAvatarEntityData() {
skip = true;
return;
}
std::lock_guard<std::mutex> guard(_myScriptEngineLock);
if (!EntityItemProperties::blobToProperties(*_myScriptEngine, itr.value(), properties)) {
std::lock_guard<std::mutex> guard(_scriptEngineLock);
if (!EntityItemProperties::blobToProperties(*_scriptEngine, itr.value(), properties)) {
skip = true;
}
});
@ -1740,8 +1740,8 @@ bool MyAvatar::updateStaleAvatarEntityBlobs() const {
++numFound;
QByteArray blob;
{
std::lock_guard<std::mutex> guard(_myScriptEngineLock);
EntityItemProperties::propertiesToBlob(*_myScriptEngine, getID(), properties, blob);
std::lock_guard<std::mutex> guard(_scriptEngineLock);
EntityItemProperties::propertiesToBlob(*_scriptEngine, getID(), properties, blob);
}
_avatarEntitiesLock.withWriteLock([&] {
_cachedAvatarEntityBlobs[id] = blob;
@ -1888,8 +1888,8 @@ void MyAvatar::avatarEntityDataToJson(QJsonObject& root) const {
}
void MyAvatar::loadData() {
if (!_myScriptEngine) {
_myScriptEngine = new QScriptEngine();
if (!_scriptEngine) {
_scriptEngine = new QScriptEngine();
}
getHead()->setBasePitch(_headPitchSetting.get());
@ -2488,9 +2488,9 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() {
QVariantMap avatarEntityData;
avatarEntityData["id"] = entityID;
{
std::lock_guard<std::mutex> guard(_myScriptEngineLock);
std::lock_guard<std::mutex> guard(_scriptEngineLock);
EntityItemProperties entityProperties = entity->getProperties(desiredProperties);
QScriptValue scriptProperties = EntityItemPropertiesToScriptValue(_myScriptEngine, entityProperties);
QScriptValue scriptProperties = EntityItemPropertiesToScriptValue(_scriptEngine, entityProperties);
avatarEntityData["properties"] = scriptProperties.toVariant();
}
avatarEntitiesData.append(QVariant(avatarEntityData));

4
interface/src/avatar/MyAvatar.h
View file

@ -2741,8 +2741,8 @@ private:
mutable std::set<QUuid> _staleCachedAvatarEntityBlobs;
//
// keep a ScriptEngine around so we don't have to instantiate on the fly (these are very slow to create/delete)
mutable std::mutex _myScriptEngineLock;
QScriptEngine* _myScriptEngine { nullptr };
mutable std::mutex _scriptEngineLock;
QScriptEngine* _scriptEngine { nullptr };
bool _needToSaveAvatarEntitySettings { false };
};