Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 06:57:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5155 from sethalves/fix-line-data-handling

Browse source 
Fix line data handling
This commit is contained in:
Brad Hefta-Gaub 2015-06-17 22:47:53 -07:00
commit db56e15410
3 changed files with 56 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/octree/src/OctreePacketData.cpp
View file

@ -384,10 +384,12 @@ bool OctreePacketData::appendValue(const glm::vec3& value) {
bool OctreePacketData::appendValue(const QVector<glm::vec3>& value) { bool OctreePacketData::appendValue(const QVector<glm::vec3>& value) {
uint16_t qVecSize = value.size(); uint16_t qVecSize = value.size();
bool success = appendValue(qVecSize); bool success = appendValue(qVecSize);
success = append((const unsigned char*)value.constData(), qVecSize * sizeof(glm::vec3));
if (success) { if (success) {
_bytesOfValues += qVecSize * sizeof(glm::vec3); success = append((const unsigned char*)value.constData(), qVecSize * sizeof(glm::vec3));
_totalBytesOfValues += qVecSize * sizeof(glm::vec3); if (success) {
_bytesOfValues += qVecSize * sizeof(glm::vec3);
_totalBytesOfValues += qVecSize * sizeof(glm::vec3);
}
} }
return success; return success;
} }

72
libraries/shared/src/VariantMapToScriptValue.cpp
View file

@ -13,35 +13,61 @@
#include "SharedLogging.h" #include "SharedLogging.h"
#include "VariantMapToScriptValue.h" #include "VariantMapToScriptValue.h"
QScriptValue variantToScriptValue(QVariant& qValue, QScriptEngine& scriptEngine) {
switch(qValue.type()) {
case QVariant::Bool:
return qValue.toBool();
break;
case QVariant::Int:
return qValue.toInt();
break;
case QVariant::Double:
return qValue.toDouble();
break;
case QVariant::String: {
return scriptEngine.newVariant(qValue);
break;
}
case QVariant::Map: {
QVariantMap childMap = qValue.toMap();
return variantMapToScriptValue(childMap, scriptEngine);
break;
}
case QVariant::List: {
QVariantList childList = qValue.toList();
return variantListToScriptValue(childList, scriptEngine);
break;
}
default:
qCDebug(shared) << "unhandled QScript type" << qValue.type();
break;
}
return QScriptValue();
}
QScriptValue variantMapToScriptValue(QVariantMap& variantMap, QScriptEngine& scriptEngine) { QScriptValue variantMapToScriptValue(QVariantMap& variantMap, QScriptEngine& scriptEngine) {
QScriptValue scriptValue = scriptEngine.newObject(); QScriptValue scriptValue = scriptEngine.newObject();
for (QVariantMap::const_iterator iter = variantMap.begin(); iter != variantMap.end(); ++iter) { for (QVariantMap::const_iterator iter = variantMap.begin(); iter != variantMap.end(); ++iter) {
QString key = iter.key(); QString key = iter.key();
QVariant qValue = iter.value(); QVariant qValue = iter.value();
scriptValue.setProperty(key, variantToScriptValue(qValue, scriptEngine));
switch(qValue.type()) { }
case QVariant::Bool:
scriptValue.setProperty(key, qValue.toBool()); return scriptValue;
break; }
case QVariant::Int:
scriptValue.setProperty(key, qValue.toInt());
break; QScriptValue variantListToScriptValue(QVariantList& variantList, QScriptEngine& scriptEngine) {
case QVariant::Double: QScriptValue scriptValue = scriptEngine.newObject();
scriptValue.setProperty(key, qValue.toDouble());
break; scriptValue.setProperty("length", variantList.size());
case QVariant::String: { int i = 0;
scriptValue.setProperty(key, scriptEngine.newVariant(qValue)); foreach (QVariant v, variantList) {
break; scriptValue.setProperty(i++, variantToScriptValue(v, scriptEngine));
}
case QVariant::Map: {
QVariantMap childMap = qValue.toMap();
scriptValue.setProperty(key, variantMapToScriptValue(childMap, scriptEngine));
break;
}
default:
qCDebug(shared) << "unhandled QScript type" << qValue.type();
}
} }
return scriptValue; return scriptValue;

2
libraries/shared/src/VariantMapToScriptValue.h
View file

@ -13,4 +13,6 @@
#include <QScriptValue> #include <QScriptValue>
#include <QScriptEngine> #include <QScriptEngine>
QScriptValue variantToScriptValue(QVariant& qValue, QScriptEngine& scriptEngine);
QScriptValue variantMapToScriptValue(QVariantMap& variantMap, QScriptEngine& scriptEngine); QScriptValue variantMapToScriptValue(QVariantMap& variantMap, QScriptEngine& scriptEngine);
QScriptValue variantListToScriptValue(QVariantList& variantList, QScriptEngine& scriptEngine);