History

fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl'

Seth Alves committed 11 years ago

Commit 8d0aaed1 parent 5cf936f9 files · +62 −34Browse files

Showing the changes to libraries/physics/src/ObjectActionSpring.cpp (1 of 9 files). Show all

Unified · Split

libraries/physics/src/ObjectActionSpring.cpp+5−3
@@ -198,7 +198,7 @@ QByteArray ObjectActionSpring::serialize() const { · 197 unmodified lines
198 dataStream << _rotationalTarget;198 dataStream << _rotationalTarget;
199 dataStream << _angularTimeScale;199 dataStream << _angularTimeScale;
200 dataStream << _rotationalTargetSet;200 dataStream << _rotationalTargetSet;
201 dataStream << _expires + getEntityServerClockSkew();201 dataStream << localTimeToServerTime(_expires);
202 dataStream << _tag;202 dataStream << _tag;
203 });203 });
204 204
@@ -232,8 +232,10 @@ void ObjectActionSpring::deserialize(QByteArray serializedArguments) { · 27 unmodified lines
232 dataStream >> _angularTimeScale;232 dataStream >> _angularTimeScale;
233 dataStream >> _rotationalTargetSet;233 dataStream >> _rotationalTargetSet;
234 234
235 dataStream >> _expires;235 quint64 serverExpires;
236 _expires -= getEntityServerClockSkew();236 dataStream >> serverExpires;
237 _expires = serverTimeToLocalTime(serverExpires);
238
237 dataStream >> _tag;239 dataStream >> _tag;
238 240
239 _active = true;241 _active = true;