Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:49:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

changed qVector to qVectorVec3

Browse source
This commit is contained in:
Eric Levin 2015-05-28 11:26:41 -07:00
parent 72af4e4e67
commit 8886e93d5f
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityItemProperties.cpp
View file

@ -531,7 +531,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object) {
COPY_PROPERTY_FROM_QSCRITPTVALUE_ENUM(backgroundMode, BackgroundMode); COPY_PROPERTY_FROM_QSCRITPTVALUE_ENUM(backgroundMode, BackgroundMode);
COPY_PROPERTY_FROM_QSCRIPTVALUE(sourceUrl, QString, setSourceUrl); COPY_PROPERTY_FROM_QSCRIPTVALUE(sourceUrl, QString, setSourceUrl);
COPY_PROPERTY_FROM_QSCRIPTVALUE(lineWidth, float, setLineWidth); COPY_PROPERTY_FROM_QSCRIPTVALUE(lineWidth, float, setLineWidth);
COPY_PROPERTY_FROM_QSCRIPTVALUE(linePoints, qVector, setLinePoints); COPY_PROPERTY_FROM_QSCRIPTVALUE(linePoints, qVectorVec3, setLinePoints);

8
libraries/entities/src/EntityItemPropertiesMacros.h
View file

@ -94,7 +94,7 @@ inline QScriptValue convertScriptValue(QScriptEngine* e, const QString& v) { ret
inline QScriptValue convertScriptValue(QScriptEngine* e, const xColor& v) { return xColorToScriptValue(e, v); } inline QScriptValue convertScriptValue(QScriptEngine* e, const xColor& v) { return xColorToScriptValue(e, v); }
inline QScriptValue convertScriptValue(QScriptEngine* e, const glm::quat& v) { return quatToScriptValue(e, v); } inline QScriptValue convertScriptValue(QScriptEngine* e, const glm::quat& v) { return quatToScriptValue(e, v); }
inline QScriptValue convertScriptValue(QScriptEngine* e, const QScriptValue& v) { return v; } inline QScriptValue convertScriptValue(QScriptEngine* e, const QScriptValue& v) { return v; }
inline QScriptValue convertScriptValue(QScriptEngine* e, const QVector<glm::vec3>& v) {return qVectorToScriptValue(e, v); } inline QScriptValue convertScriptValue(QScriptEngine* e, const QVector<glm::vec3>& v) {return qVectorVec3ToScriptValue(e, v); }
#define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(G,g,P,p) \ #define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(G,g,P,p) \
if (!skipDefaults || defaultEntityProperties.get##G().get##P() != get##P()) { \ if (!skipDefaults || defaultEntityProperties.get##G().get##P() != get##P()) { \
@ -124,7 +124,7 @@ inline QScriptValue convertScriptValue(QScriptEngine* e, const QVector<glm::vec
typedef glm::vec3 glmVec3; typedef glm::vec3 glmVec3;
typedef glm::quat glmQuat; typedef glm::quat glmQuat;
typedef QVector<glm::vec3> qVector; typedef QVector<glm::vec3> qVectorVec3;
inline float float_convertFromScriptValue(const QScriptValue& v, bool& isValid) { return v.toVariant().toFloat(&isValid); } inline float float_convertFromScriptValue(const QScriptValue& v, bool& isValid) { return v.toVariant().toFloat(&isValid); }
inline uint16_t uint16_t_convertFromScriptValue(const QScriptValue& v, bool& isValid) { return v.toVariant().toInt(&isValid); } inline uint16_t uint16_t_convertFromScriptValue(const QScriptValue& v, bool& isValid) { return v.toVariant().toInt(&isValid); }
inline int int_convertFromScriptValue(const QScriptValue& v, bool& isValid) { return v.toVariant().toInt(&isValid); } inline int int_convertFromScriptValue(const QScriptValue& v, bool& isValid) { return v.toVariant().toInt(&isValid); }
@ -151,9 +151,9 @@ inline glmVec3 glmVec3_convertFromScriptValue(const QScriptValue& v, bool& isVal
return glm::vec3(0); return glm::vec3(0);
} }
inline qVector qVector_convertFromScriptValue(const QScriptValue& v, bool& isValid){ inline qVectorVec3 qVectorVec3_convertFromScriptValue(const QScriptValue& v, bool& isValid){
isValid = true; isValid = true;
return qVectorFromScriptValue(v); return qVectorVec3FromScriptValue(v);
} }
inline glmQuat glmQuat_convertFromScriptValue(const QScriptValue& v, bool& isValid) { inline glmQuat glmQuat_convertFromScriptValue(const QScriptValue& v, bool& isValid) {

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

@ -72,14 +72,18 @@ void vec3FromScriptValue(const QScriptValue &object, glm::vec3 &vec3) {
vec3.z = object.property("z").toVariant().toFloat(); vec3.z = object.property("z").toVariant().toFloat();
} }
QScriptValue qVectorToScriptValue(QScriptEngine* engine, const QVector<glm::vec3> &vector){ QScriptValue qVectorVec3ToScriptValue(QScriptEngine* engine, const QVector<glm::vec3> &vector){
QScriptValue array = engine->newArray(); QScriptValue array = engine->newArray();
for(int i = 0; i < vector.size(); i++){
array.setProperty(i, vec3toScriptValue(vector.at(i)));
}
return array; return array;
} }
QVector<glm::vec3> qVectorFromScriptValue(const QScriptValue &array){ QVector<glm::vec3> qVectorVec3FromScriptValue(const QScriptValue &array){
QVector<glm:vec3> newVector;
qDebug()<<"Point 2 x"<<array.property(1).property("y").toString(); qDebug()<<"Point 2 x"<<array.property(1).property("y").toString();
return QVector<glm::vec3>(7); return QVector<glm::vec3>(8);
} }
QScriptValue vec2toScriptValue(QScriptEngine* engine, const glm::vec2 &vec2) { QScriptValue vec2toScriptValue(QScriptEngine* engine, const glm::vec2 &vec2) {

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

@ -56,8 +56,8 @@ void qColorFromScriptValue(const QScriptValue& object, QColor& color);
QScriptValue qURLToScriptValue(QScriptEngine* engine, const QUrl& url); QScriptValue qURLToScriptValue(QScriptEngine* engine, const QUrl& url);
void qURLFromScriptValue(const QScriptValue& object, QUrl& url); void qURLFromScriptValue(const QScriptValue& object, QUrl& url);
QScriptValue qVectorToScriptValue(QScriptEngine*, const QVector<glm::vec3>& vector); QScriptValue qVectorVec3ToScriptValue(QScriptEngine*, const QVector<glm::vec3>& vector);
QVector<glm::vec3> qVectorFromScriptValue( const QScriptValue &array); QVector<glm::vec3> qVectorVec3FromScriptValue( const QScriptValue &array);
class PickRay { class PickRay {
public: public: