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

try to fix build errors?

Browse source
This commit is contained in:
SamGondelman 2019-03-29 10:21:43 -07:00
parent 4ed7c09016
commit 33b3e2afac
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,6 +40,7 @@ int qMapURLStringMetaTypeId = qRegisterMetaType<QMap<QUrl,QString>>();
int socketErrorMetaTypeId = qRegisterMetaType<QAbstractSocket::SocketError>();
int voidLambdaType = qRegisterMetaType<std::function<void()>>();
int variantLambdaType = qRegisterMetaType<std::function<QVariant()>>();
int stencilModeMetaTypeId = qRegisterMetaType<StencilMode>();
void registerMetaTypes(QScriptEngine* engine) {
qScriptRegisterMetaType(engine, vec2ToScriptValue, vec2FromScriptValue);
@ -64,6 +65,8 @@ void registerMetaTypes(QScriptEngine* engine) {
qScriptRegisterMetaType(engine, collisionToScriptValue, collisionFromScriptValue);
qScriptRegisterMetaType(engine, quuidToScriptValue, quuidFromScriptValue);
qScriptRegisterMetaType(engine, aaCubeToScriptValue, aaCubeFromScriptValue);
qScriptRegisterMetaType(engine, stencilModeToScriptValue, stencilModeFromScriptValue);
}
QScriptValue vec2ToScriptValue(QScriptEngine* engine, const glm::vec2& vec2) {
@ -1280,4 +1283,12 @@ QVariantMap parseTexturesToMap(QString newTextures, const QVariantMap& defaultTe
}
return toReturn;
}
QScriptValue stencilModeToScriptValue(QScriptEngine* engine, const StencilMode& stencilMode) {
return engine->newVariant((int)stencilMode);
}
void stencilModeFromScriptValue(const QScriptValue& object, StencilMode& stencilMode) {
stencilMode = StencilMode(object.toVariant().toInt());
}

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

@ -25,6 +25,7 @@
#include "shared/Bilateral.h"
#include "Transform.h"
#include "PhysicsCollisionGroups.h"
#include "StencilMode.h"
class QColor;
class QUrl;
@ -708,5 +709,8 @@ void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<MeshFace>
QVariantMap parseTexturesToMap(QString textures, const QVariantMap& defaultTextures);
Q_DECLARE_METATYPE(StencilMode)
QScriptValue stencilModeToScriptValue(QScriptEngine* engine, const StencilMode& stencilMode);
void stencilModeFromScriptValue(const QScriptValue &object, StencilMode& stencilMode);
#endif // hifi_RegisteredMetaTypes_h