History

Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request

Leopoly_Phase1_003_Asset-Request

MiladNazeri committed 8 years ago

Commit 9baf02b2 parents 8e3097d e8f0df432 files · +2218 −334Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 32 files). Show all

Unified · Split

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