History

include argument-packing version in serialized argument data

Seth Alves committed 11 years ago

Commit c95db561 parent 50d85257 files · +33 −8Browse files

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

Unified · Split

libraries/physics/src/ObjectActionSpring.cpp+9−1
@@ -11,6 +11,8 @@ · 10 unmodified lines
11 11
12#include "ObjectActionSpring.h"12#include "ObjectActionSpring.h"
13 13
14const uint16_t ObjectActionSpring::springVersion = 1;
15
14ObjectActionSpring::ObjectActionSpring(EntityActionType type, QUuid id, EntityItemPointer ownerEntity) :16ObjectActionSpring::ObjectActionSpring(EntityActionType type, QUuid id, EntityItemPointer ownerEntity) :
15 ObjectAction(type, id, ownerEntity) {17 ObjectAction(type, id, ownerEntity) {
16 #if WANT_DEBUG18 #if WANT_DEBUG
@@ -149,6 +151,7 @@ QByteArray ObjectActionSpring::serialize() { · 132 unmodified lines
149 151
150 dataStream << getType();152 dataStream << getType();
151 dataStream << getID();153 dataStream << getID();
154 dataStream << ObjectActionSpring::springVersion;
152 155
153 dataStream << _positionalTarget;156 dataStream << _positionalTarget;
154 dataStream << _linearTimeScale;157 dataStream << _linearTimeScale;
@@ -166,11 +169,16 @@ void ObjectActionSpring::deserialize(QByteArray serializedArguments) { · 11 unmodified lines
166 169
167 EntityActionType type;170 EntityActionType type;
168 QUuid id;171 QUuid id;
172 uint16_t serializationVersion;
169 173
170 dataStream >> type;174 dataStream >> type;
171 dataStream >> id;
172 assert(type == getType());175 assert(type == getType());
176 dataStream >> id;
173 assert(id == getID());177 assert(id == getID());
178 dataStream >> serializationVersion;
179 if (serializationVersion != ObjectActionSpring::springVersion) {
180 return;
181 }
174 182
175 dataStream >> _positionalTarget;183 dataStream >> _positionalTarget;
176 dataStream >> _linearTimeScale;184 dataStream >> _linearTimeScale;