Showing the changes to libraries/script-engine/src/AssetScriptingInterface.cpp (1 of 35 files). Show all
Unified · Split
| @@ -4,6 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | // |
| 5 | 5 | // Created by Stephen Birarda on 2016-03-08. |
| 6 | 6 | // Copyright 2016 High Fidelity, Inc. |
| 7 | +// Copyright 2022 Overte e.V. | |
| 7 | 8 | // |
| 8 | 9 | // Distributed under the Apache License, Version 2.0. |
| 9 | 10 | // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html |
| @@ -34,12 +35,15 @@ · 24 unmodified lines | ||
| 34 | 35 | #include <future> |
| 35 | 36 | |
| 36 | 37 | using Promise = MiniPromise::Promise; |
| 38 | +STATIC_SCRIPT_TYPES_INITIALIZER((+[](ScriptManager* manager){ | |
| 39 | + auto scriptEngine = manager->engine().get(); | |
| 40 | + | |
| 41 | + scriptRegisterMetaType<std::shared_ptr< MiniPromise >, promiseToScriptValue, promiseFromScriptValue>(scriptEngine); | |
| 42 | +})); | |
| 43 | + | |
| 37 | 44 | |
| 38 | 45 | AssetScriptingInterface::AssetScriptingInterface(QObject* parent) : BaseAssetScriptingInterface(parent) { |
| 39 | 46 | qCDebug(scriptengine) << "AssetScriptingInterface::AssetScriptingInterface" << parent; |
| 40 | − | |
| 41 | − auto scriptManager = qobject_cast<ScriptManager*>(parent); | |
| 42 | − scriptRegisterMetaType(scriptManager->engine().get(), promiseToScriptValue, promiseFromScriptValue); | |
| 43 | 47 | } |
| 44 | 48 | |
| 45 | 49 | #define JS_VERIFY(cond, error) { if (!this->jsVerify(cond, error)) { return; } } |