Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 20:58:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made QScript Object more JS friendly

Browse source
This commit is contained in:
kunalgosar 2017-02-07 13:28:09 -08:00
parent 99e51e88ae
commit 3af05ece7d
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/avatars/src/AvatarData.cpp
View file

@ -36,6 +36,7 @@
#include <shared/JSONHelpers.h> #include <shared/JSONHelpers.h>
#include <ShapeInfo.h> #include <ShapeInfo.h>
#include <AudioHelpers.h> #include <AudioHelpers.h>
#include <VariantMapToScriptValue.h>
#include "AvatarLogging.h" #include "AvatarLogging.h"
@ -2313,9 +2314,18 @@ void RayToAvatarIntersectionResultFromScriptValue(const QScriptValue& object, Ra
QScriptValue AvatarEntityMapToScriptValue(QScriptEngine* engine, const AvatarEntityMap& value) { QScriptValue AvatarEntityMapToScriptValue(QScriptEngine* engine, const AvatarEntityMap& value) {
QScriptValue obj = engine->newObject(); QScriptValue obj = engine->newObject();
for (auto entityID : value.keys()) { for (auto entityID : value.keys()) {
QScriptValue EntityProperties = engine->newVariant(QVariant::fromValue(value.value(entityID))); QByteArray entityProperties = value.value(entityID);
QJsonDocument jsonEntityProperties = QJsonDocument::fromBinaryData(entityProperties);
if (!jsonEntityProperties.isObject()) {
qCDebug(avatars) << "bad AvatarEntityData in AvatarEntityMap" << QString(entityProperties.toHex());
}
QVariant variantEntityProperties = jsonEntityProperties.toVariant();
QVariantMap entityPropertiesMap = variantEntityProperties.toMap();
QScriptValue scriptEntityProperties = variantMapToScriptValue(entityPropertiesMap, *engine);
QString key = entityID.toString(); QString key = entityID.toString();
obj.setProperty(key, EntityProperties); obj.setProperty(key, scriptEntityProperties);
} }
return obj; return obj;
} }
@ -2325,6 +2335,12 @@ void AvatarEntityMapFromScriptValue(const QScriptValue& object, AvatarEntityMap&
while (itr.hasNext()) { while (itr.hasNext()) {
itr.next(); itr.next();
QUuid EntityID = QUuid(itr.name()); QUuid EntityID = QUuid(itr.name());
value[EntityID] = qvariant_cast<QByteArray>(itr.value().data().toVariant());
QScriptValue scriptEntityProperties = itr.value();
QVariant variantEntityProperties = scriptEntityProperties.toVariant();
QJsonDocument jsonEntityProperties = QJsonDocument::fromVariant(variantEntityProperties);
QByteArray binaryEntityProperties = jsonEntityProperties.toBinaryData();
value[EntityID] = binaryEntityProperties;
} }
} }