add lifetime and tag arguments to actions

Seth Alves committed 11 years ago

Commit 7c6846c1 parent ba317a09 files · +106 −14Browse files

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

Unified · Split

 const float MIN_TIMESCALE = 0.1f;
 bool ObjectActionSpring::updateArguments(QVariantMap arguments) {
+    if (!ObjectAction::updateArguments(arguments)) {
+        return false;
+    }
     // targets are required, spring-constants are optional
     bool ok = true;
     glm::vec3 positionalTarget =
 }
 QVariantMap ObjectActionSpring::getArguments() {
-    QVariantMap arguments;
+    QVariantMap arguments = ObjectAction::getArguments();
     withReadLock([&] {
         arguments["linearTimeScale"] = _linearTimeScale;
         arguments["targetPosition"] = glmToQMap(_positionalTarget);
     dataStream << _angularTimeScale;
     dataStream << _rotationalTargetSet;
+    dataStream << _expires;
+    dataStream << _tag;
     return serializedActionArguments;
 }
     dataStream >> _angularTimeScale;
     dataStream >> _rotationalTargetSet;
+    dataStream >> _expires;
+    dataStream >> _tag;
     _active = true;
 }

Keyboard shortcuts