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

Merge pull request #6142 from ZappoMan/fixEntityItemDependency

Browse source 
fix EntityItemID dependency
This commit is contained in:
Andrew Meadows 2015-10-21 14:57:07 -07:00
commit 27c6624f0c
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/entities/src/EntityItemID.cpp
View file

@ -52,3 +52,19 @@ QScriptValue EntityItemIDtoScriptValue(QScriptEngine* engine, const EntityItemID
void EntityItemIDfromScriptValue(const QScriptValue &object, EntityItemID& id) {
quuidFromScriptValue(object, id);
}
QVector<EntityItemID> qVectorEntityItemIDFromScriptValue(const QScriptValue& array) {
if (!array.isArray()) {
return QVector<EntityItemID>();
}
QVector<EntityItemID> newVector;
int length = array.property("length").toInteger();
newVector.reserve(length);
for (int i = 0; i < length; i++) {
QString uuidAsString = array.property(i).toString();
EntityItemID fromString(uuidAsString);
newVector << fromString;
}
return newVector;
}

1
libraries/entities/src/EntityItemID.h
View file

@ -43,5 +43,6 @@ Q_DECLARE_METATYPE(EntityItemID);
Q_DECLARE_METATYPE(QVector<EntityItemID>);
QScriptValue EntityItemIDtoScriptValue(QScriptEngine* engine, const EntityItemID& properties);
void EntityItemIDfromScriptValue(const QScriptValue &object, EntityItemID& properties);
QVector<EntityItemID> qVectorEntityItemIDFromScriptValue(const QScriptValue& array);
#endif // hifi_EntityItemID_h

15
libraries/shared/src/RegisteredMetaTypes.cpp
View file

@ -118,21 +118,6 @@ QVector<QUuid> qVectorQUuidFromScriptValue(const QScriptValue& array) {
return newVector;
}
QVector<EntityItemID> qVectorEntityItemIDFromScriptValue(const QScriptValue& array) {
if (!array.isArray()) {
return QVector<EntityItemID>();
}
QVector<EntityItemID> newVector;
int length = array.property("length").toInteger();
newVector.reserve(length);
for (int i = 0; i < length; i++) {
QString uuidAsString = array.property(i).toString();
EntityItemID fromString(uuidAsString);
newVector << fromString;
}
return newVector;
}
QScriptValue qVectorFloatToScriptValue(QScriptEngine* engine, const QVector<float>& vector) {
QScriptValue array = engine->newArray();
for (int i = 0; i < vector.size(); i++) {

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

@ -14,7 +14,6 @@
#include <QtScript/QScriptEngine>
#include <QtCore/QUuid>
#include "../../entities/src/EntityItemID.h"
#include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp>
@ -67,7 +66,6 @@ void qVectorFloatFromScriptValue(const QScriptValue& array, QVector<float>& vect
QVector<float> qVectorFloatFromScriptValue(const QScriptValue& array);
QVector<QUuid> qVectorQUuidFromScriptValue(const QScriptValue& array);
QVector<EntityItemID> qVectorEntityItemIDFromScriptValue(const QScriptValue& array);
class PickRay {
public: