Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 23:33:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

avatar-action-far-grab works now

Browse source
This commit is contained in:
Seth Alves 2017-04-14 12:44:54 -07:00
parent 1009182c06
commit d0144f4110
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/avatar/AvatarActionFarGrab.cpp
View file

@ -15,13 +15,13 @@ AvatarActionFarGrab::AvatarActionFarGrab(const QUuid& id, EntityItemPointer owne
ObjectActionSpring(id, ownerEntity) {
_type = DYNAMIC_TYPE_FAR_GRAB;
#if WANT_DEBUG
qCDebug(physics) << "AvatarActionFarGrab::AvatarActionFarGrab";
qDebug() << "AvatarActionFarGrab::AvatarActionFarGrab";
#endif
}
AvatarActionFarGrab::~AvatarActionFarGrab() {
#if WANT_DEBUG
qCDebug(physics) << "AvatarActionFarGrab::~AvatarActionFarGrab";
qDebug() << "AvatarActionFarGrab::~AvatarActionFarGrab";
#endif
}
@ -32,7 +32,7 @@ QByteArray AvatarActionFarGrab::serialize() const {
dataStream << DYNAMIC_TYPE_FAR_GRAB;
dataStream << getID();
dataStream << AvatarActionFarGrab::springVersion;
dataStream << ObjectActionSpring::springVersion;
serializeParameters(dataStream);
@ -52,7 +52,7 @@ void AvatarActionFarGrab::deserialize(QByteArray serializedArguments) {
uint16_t serializationVersion;
dataStream >> serializationVersion;
if (serializationVersion != AvatarActionFarGrab::springVersion) {
if (serializationVersion != ObjectActionSpring::springVersion) {
assert(false);
return;
}

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

@ -66,6 +66,7 @@ bool ObjectActionSpring::prepareForSpringUpdate(btScalar deltaTimeStep) {
QList<EntityDynamicPointer> springDerivedActions;
springDerivedActions.append(ownerEntity->getActionsOfType(DYNAMIC_TYPE_SPRING));
springDerivedActions.append(ownerEntity->getActionsOfType(DYNAMIC_TYPE_FAR_GRAB));
springDerivedActions.append(ownerEntity->getActionsOfType(DYNAMIC_TYPE_HOLD));
foreach (EntityDynamicPointer action, springDerivedActions) {
@ -259,7 +260,7 @@ QVariantMap ObjectActionSpring::getArguments() {
return arguments;
}
QByteArray ObjectActionSpring::serializeParameters(QDataStream& dataStream) const {
void ObjectActionSpring::serializeParameters(QDataStream& dataStream) const {
withReadLock([&] {
dataStream << _desiredPositionalTarget;
dataStream << _linearTimeScale;

2
libraries/physics/src/ObjectActionSpring.h
View file

@ -48,7 +48,7 @@ protected:
virtual bool prepareForSpringUpdate(btScalar deltaTimeStep);
QByteArray serializeParameters(QDataStream& dataStream) const;
void serializeParameters(QDataStream& dataStream) const;
void deserializeParameters(QByteArray serializedArguments, QDataStream& dataStream);
};