History

convert AnimationCache to DependencyManager

ZappoMan committed 11 years ago

Commit 660bf271 parent 02737a48 files · +15 −21Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−2
@@ -94,7 +94,6 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam · 93 unmodified lines
94 _quatLibrary(),94 _quatLibrary(),
95 _vec3Library(),95 _vec3Library(),
96 _uuidLibrary(),96 _uuidLibrary(),
97 _animationCache(this),
98 _isUserLoaded(false),97 _isUserLoaded(false),
99 _arrayBufferClass(new ArrayBufferClass(this))98 _arrayBufferClass(new ArrayBufferClass(this))
100{99{
@@ -256,7 +255,7 @@ void ScriptEngine::init() { · 155 unmodified lines
256 registerGlobalObject("Quat", &_quatLibrary);255 registerGlobalObject("Quat", &_quatLibrary);
257 registerGlobalObject("Vec3", &_vec3Library);256 registerGlobalObject("Vec3", &_vec3Library);
258 registerGlobalObject("Uuid", &_uuidLibrary);257 registerGlobalObject("Uuid", &_uuidLibrary);
259 registerGlobalObject("AnimationCache", &_animationCache);258 registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>());
260 259
261 registerGlobalObject("Voxels", &_voxelsScriptingInterface);260 registerGlobalObject("Voxels", &_voxelsScriptingInterface);
262 261