Showing the changes to libraries/script-engine/src/ScriptValueUtils.cpp (1 of 16 files). Show all
Unified · Split
| @@ -29,6 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include "ScriptEngine.h" |
| 30 | 30 | #include "ScriptEngineCast.h" |
| 31 | 31 | #include "ScriptValueIterator.h" |
| 32 | +#include "ScriptEngineLogging.h" | |
| 32 | 33 | |
| 33 | 34 | bool isListOfStrings(const ScriptValue& arg) { |
| 34 | 35 | if (!arg.isArray()) { |
| @@ -78,9 +79,18 @@ void registerMetaTypes(ScriptEngine* engine) { · 43 unmodified lines | ||
| 78 | 79 | |
| 79 | 80 | scriptRegisterMetaType<StencilMaskMode, stencilMaskModeToScriptValue, stencilMaskModeFromScriptValue>(engine); |
| 80 | 81 | |
| 81 | − scriptRegisterMetaType<std::shared_ptr< MiniPromise >, promiseToScriptValue, promiseFromScriptValue>(engine); | |
| 82 | + scriptRegisterMetaType<AnimationDetails, animationDetailsToScriptValue, animationDetailsFromScriptValue>(engine); | |
| 83 | + | |
| 84 | + scriptRegisterMetaType<MeshProxy*, meshToScriptValue, meshFromScriptValue>(engine); | |
| 85 | + scriptRegisterMetaType<MeshProxyList, meshesToScriptValue, meshesFromScriptValue>(engine); | |
| 82 | 86 | |
| 83 | 87 | scriptRegisterSequenceMetaType<QVector<unsigned int> >(engine); |
| 88 | + scriptRegisterSequenceMetaType<QVector<QUuid>>(engine); | |
| 89 | + scriptRegisterSequenceMetaType<QVector<EntityItemID>>(engine); | |
| 90 | + | |
| 91 | + scriptRegisterSequenceMetaType<QVector<glm::vec2>>(engine); | |
| 92 | + scriptRegisterSequenceMetaType<QVector<glm::quat>>(engine); | |
| 93 | + scriptRegisterSequenceMetaType<QVector<QString>>(engine); | |
| 84 | 94 | } |
| 85 | 95 | |
| 86 | 96 | ScriptValue vec2ToScriptValue(ScriptEngine* engine, const glm::vec2& vec2) { |
| @@ -858,7 +868,7 @@ ScriptValue meshesToScriptValue(ScriptEngine* engine, const MeshProxyList& in) { · 771 unmodified lines | ||
| 858 | 868 | bool meshesFromScriptValue(const ScriptValue& value, MeshProxyList& out) { |
| 859 | 869 | ScriptValueIteratorPointer itr(value.newIterator()); |
| 860 | 870 | |
| 861 | − qDebug() << "in meshesFromScriptValue, value.length =" << value.property("length").toInt32(); | |
| 871 | + qDebug(scriptengine) << "in meshesFromScriptValue, value.length =" << value.property("length").toInt32(); | |
| 862 | 872 | |
| 863 | 873 | while (itr->hasNext()) { |
| 864 | 874 | itr->next(); |
| @@ -866,7 +876,7 @@ bool meshesFromScriptValue(const ScriptValue& value, MeshProxyList& out) { · 1 unmodified line | ||
| 866 | 876 | if (meshProxy) { |
| 867 | 877 | out.append(meshProxy); |
| 868 | 878 | } else { |
| 869 | − qDebug() << "null meshProxy"; | |
| 879 | + qDebug(scriptengine) << "null meshProxy"; | |
| 870 | 880 | } |
| 871 | 881 | } |
| 872 | 882 | return true; |