From d0330b0a28de7f19ca4a4fc0d9a22c7ebaa04286 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 6 Aug 2013 11:56:54 -0700 Subject: [PATCH] include QVariantMap in AvatarData, map values to floats for glm::vec3 --- libraries/avatars/src/AvatarData.cpp | 4 +++- libraries/avatars/src/AvatarData.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 4df93de340..f4a3ab8067 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -52,7 +52,9 @@ AvatarData::~AvatarData() { } void AvatarData::setPositionFromVariantMap(QVariantMap positionMap) { - _position = glm::vec3(positionMap.value("x"), positionMap.value("y"), positionMap.value("z")); + _position = glm::vec3(positionMap.value("x").toFloat(), + positionMap.value("y").toFloat(), + positionMap.value("z").toFloat()); } QVariantMap AvatarData::getPositionVariantMap() { diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 90a01954ad..5d8b022e34 100755 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -17,6 +17,7 @@ #include #include +#include #include #include "HeadData.h"