Showing the changes to libraries/physics/src/ObjectActionSpring.cpp (1 of 2 files). Show all
Unified · Split
| @@ -191,16 +191,16 @@ QByteArray ObjectActionSpring::serialize() const { · 190 unmodified lines | ||
| 191 | 191 | dataStream << getID(); |
| 192 | 192 | dataStream << ObjectActionSpring::springVersion; |
| 193 | 193 | |
| 194 | − dataStream << _positionalTarget; | |
| 195 | − dataStream << _linearTimeScale; | |
| 196 | − dataStream << _positionalTargetSet; | |
| 197 | − | |
| 198 | − dataStream << _rotationalTarget; | |
| 199 | − dataStream << _angularTimeScale; | |
| 200 | − dataStream << _rotationalTargetSet; | |
| 201 | − | |
| 202 | − dataStream << _expires; | |
| 203 | − dataStream << _tag; | |
| 194 | + withReadLock([&] { | |
| 195 | + dataStream << _positionalTarget; | |
| 196 | + dataStream << _linearTimeScale; | |
| 197 | + dataStream << _positionalTargetSet; | |
| 198 | + dataStream << _rotationalTarget; | |
| 199 | + dataStream << _angularTimeScale; | |
| 200 | + dataStream << _rotationalTargetSet; | |
| 201 | + dataStream << _expires; | |
| 202 | + dataStream << _tag; | |
| 203 | + }); | |
| 204 | 204 | |
| 205 | 205 | return serializedActionArguments; |
| 206 | 206 | } |
| @@ -222,16 +222,18 @@ void ObjectActionSpring::deserialize(QByteArray serializedArguments) { · 15 unmodified lines | ||
| 222 | 222 | return; |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | − dataStream >> _positionalTarget; | |
| 226 | − dataStream >> _linearTimeScale; | |
| 227 | − dataStream >> _positionalTargetSet; | |
| 225 | + withWriteLock([&] { | |
| 226 | + dataStream >> _positionalTarget; | |
| 227 | + dataStream >> _linearTimeScale; | |
| 228 | + dataStream >> _positionalTargetSet; | |
| 228 | 229 | |
| 229 | − dataStream >> _rotationalTarget; | |
| 230 | − dataStream >> _angularTimeScale; | |
| 231 | − dataStream >> _rotationalTargetSet; | |
| 230 | + dataStream >> _rotationalTarget; | |
| 231 | + dataStream >> _angularTimeScale; | |
| 232 | + dataStream >> _rotationalTargetSet; | |
| 232 | 233 | |
| 233 | − dataStream >> _expires; | |
| 234 | − dataStream >> _tag; | |
| 234 | + dataStream >> _expires; | |
| 235 | + dataStream >> _tag; | |
| 235 | 236 | |
| 236 | − _active = true; | |
| 237 | + _active = true; | |
| 238 | + }); | |
| 237 | 239 | } |