Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 08:56:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more lock adjustments

Browse source
This commit is contained in:
Seth Alves 2015-10-15 10:22:25 -07:00
parent 8195145dc7
commit e571cb7ca4
2 changed files with 39 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libraries/physics/src/ObjectActionOffset.cpp
View file

@ -151,17 +151,18 @@ QVariantMap ObjectActionOffset::getArguments() {
QByteArray ObjectActionOffset::serialize() const { QByteArray ObjectActionOffset::serialize() const {
QByteArray ba; QByteArray ba;
QDataStream dataStream(&ba, QIODevice::WriteOnly); QDataStream dataStream(&ba, QIODevice::WriteOnly);
dataStream << getType(); dataStream << ACTION_TYPE_OFFSET;
dataStream << getID(); dataStream << getID();
dataStream << ObjectActionOffset::offsetVersion; dataStream << ObjectActionOffset::offsetVersion;
dataStream << _pointToOffsetFrom; withReadLock([&] {
dataStream << _linearDistance; dataStream << _pointToOffsetFrom;
dataStream << _linearTimeScale; dataStream << _linearDistance;
dataStream << _positionalTargetSet; dataStream << _linearTimeScale;
dataStream << _positionalTargetSet;
dataStream << _expires; dataStream << _expires;
dataStream << _tag; dataStream << _tag;
});
return ba; return ba;
} }
@ -183,13 +184,13 @@ void ObjectActionOffset::deserialize(QByteArray serializedArguments) {
return; return;
} }
dataStream >> _pointToOffsetFrom; withWriteLock([&] {
dataStream >> _linearDistance; dataStream >> _pointToOffsetFrom;
dataStream >> _linearTimeScale; dataStream >> _linearDistance;
dataStream >> _positionalTargetSet; dataStream >> _linearTimeScale;
dataStream >> _positionalTargetSet;
dataStream >> _expires; dataStream >> _expires;
dataStream >> _tag; dataStream >> _tag;
_active = true;
_active = true; });
} }

40
libraries/physics/src/ObjectActionSpring.cpp
View file

@ -191,16 +191,16 @@ QByteArray ObjectActionSpring::serialize() const {
dataStream << getID(); dataStream << getID();
dataStream << ObjectActionSpring::springVersion; dataStream << ObjectActionSpring::springVersion;
dataStream << _positionalTarget; withReadLock([&] {
dataStream << _linearTimeScale; dataStream << _positionalTarget;
dataStream << _positionalTargetSet; dataStream << _linearTimeScale;
dataStream << _positionalTargetSet;
dataStream << _rotationalTarget; dataStream << _rotationalTarget;
dataStream << _angularTimeScale; dataStream << _angularTimeScale;
dataStream << _rotationalTargetSet; dataStream << _rotationalTargetSet;
dataStream << _expires;
dataStream << _expires; dataStream << _tag;
dataStream << _tag; });
return serializedActionArguments; return serializedActionArguments;
} }
@ -222,16 +222,18 @@ void ObjectActionSpring::deserialize(QByteArray serializedArguments) {
return; return;
} }
dataStream >> _positionalTarget; withWriteLock([&] {
dataStream >> _linearTimeScale; dataStream >> _positionalTarget;
dataStream >> _positionalTargetSet; dataStream >> _linearTimeScale;
dataStream >> _positionalTargetSet;
dataStream >> _rotationalTarget; dataStream >> _rotationalTarget;
dataStream >> _angularTimeScale; dataStream >> _angularTimeScale;
dataStream >> _rotationalTargetSet; dataStream >> _rotationalTargetSet;
dataStream >> _expires; dataStream >> _expires;
dataStream >> _tag; dataStream >> _tag;
_active = true; _active = true;
});
} }