History

Adding the Stage of the Scene and exposing control of the sun light from javascript

Sam Gateau committed 11 years ago

Commit 6b29e311 parent 5202d218 files · +741 −6Browse 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+5−0
@@ -39,6 +39,8 @@ · 38 unmodified lines
3939 #include "TypedArrays.h"
4040 #include "XMLHttpRequestClass.h"
4141
42+#include "SceneScriptingInterface.h"
43+
4244 #include "MIDIEvent.h"
4345
4446 EntityScriptingInterface ScriptEngine::_entityScriptingInterface;
@@ -208,6 +210,8 @@ void ScriptEngine::init() { · 163 unmodified lines
208210
209211 _isInitialized = true;
210212
213+ auto sceneScriptingInterface = DependencyManager::set<SceneScriptingInterface>();
214+
211215 _entityScriptingInterface.init();
212216
213217 // register various meta-types
@@ -251,6 +255,7 @@ void ScriptEngine::init() { · 37 unmodified lines
251255 registerGlobalObject("Vec3", &_vec3Library);
252256 registerGlobalObject("Uuid", &_uuidLibrary);
253257 registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data());
258+ registerGlobalObject("Scene", DependencyManager::get<SceneScriptingInterface>().data());
254259
255260 // constants
256261 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));