History

Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters

Sam Gateau committed 11 years ago

Commit 3b929101 parent 92c55f96 files · +118 −27Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+0−3
@@ -305,8 +305,6 @@ void ScriptEngine::init() { · 304 unmodified lines
305 305
306 _isInitialized = true;306 _isInitialized = true;
307 307
308 auto sceneScriptingInterface = DependencyManager::set<SceneScriptingInterface>();
309
310 auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();308 auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
311 entityScriptingInterface->init();309 entityScriptingInterface->init();
312 310
@@ -350,7 +348,6 @@ void ScriptEngine::init() { · 37 unmodified lines
350 registerGlobalObject("Vec3", &_vec3Library);348 registerGlobalObject("Vec3", &_vec3Library);
351 registerGlobalObject("Uuid", &_uuidLibrary);349 registerGlobalObject("Uuid", &_uuidLibrary);
352 registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data());350 registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data());
353 registerGlobalObject("Scene", DependencyManager::get<SceneScriptingInterface>().data());
354 351
355 // constants352 // constants
356 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));353 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));