Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 14 files). Show all
Unified · Split
| @@ -56,6 +56,7 @@ · 55 unmodified lines | ||
| 56 | 56 | #include <AnimationObject.h> |
| 57 | 57 | |
| 58 | 58 | #include "ArrayBufferViewClass.h" |
| 59 | +#include "AssetScriptingInterface.h" | |
| 59 | 60 | #include "BatchLoader.h" |
| 60 | 61 | #include "BaseScriptEngine.h" |
| 61 | 62 | #include "DataViewClass.h" |
| @@ -175,6 +176,7 @@ ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const · 113 unmodified lines | ||
| 175 | 176 | _timerFunctionMap(), |
| 176 | 177 | _fileNameString(fileNameString), |
| 177 | 178 | _arrayBufferClass(new ArrayBufferClass(this)), |
| 179 | + _assetScriptingInterface(new AssetScriptingInterface(this)), | |
| 178 | 180 | // don't delete `ScriptEngines` until all `ScriptEngine`s are gone |
| 179 | 181 | _scriptEngines(DependencyManager::get<ScriptEngines>()) |
| 180 | 182 | { |
| @@ -704,7 +706,7 @@ void ScriptEngine::init() { · 523 unmodified lines | ||
| 704 | 706 | // constants |
| 705 | 707 | globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE))); |
| 706 | 708 | |
| 707 | − registerGlobalObject("Assets", &_assetScriptingInterface); | |
| 709 | + registerGlobalObject("Assets", _assetScriptingInterface); | |
| 708 | 710 | registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data()); |
| 709 | 711 | |
| 710 | 712 | registerGlobalObject("DebugDraw", &DebugDraw::getInstance()); |