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
39#include "TypedArrays.h"39#include "TypedArrays.h"
40#include "XMLHttpRequestClass.h"40#include "XMLHttpRequestClass.h"
41 41
42#include "SceneScriptingInterface.h"
43
42#include "MIDIEvent.h"44#include "MIDIEvent.h"
43 45
44EntityScriptingInterface ScriptEngine::_entityScriptingInterface;46EntityScriptingInterface ScriptEngine::_entityScriptingInterface;
@@ -208,6 +210,8 @@ void ScriptEngine::init() { · 163 unmodified lines
208 210
209 _isInitialized = true;211 _isInitialized = true;
210 212
213 auto sceneScriptingInterface = DependencyManager::set<SceneScriptingInterface>();
214
211 _entityScriptingInterface.init();215 _entityScriptingInterface.init();
212 216
213 // register various meta-types217 // register various meta-types
@@ -251,6 +255,7 @@ void ScriptEngine::init() { · 37 unmodified lines
251 registerGlobalObject("Vec3", &_vec3Library);255 registerGlobalObject("Vec3", &_vec3Library);
252 registerGlobalObject("Uuid", &_uuidLibrary);256 registerGlobalObject("Uuid", &_uuidLibrary);
253 registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data());257 registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data());
258 registerGlobalObject("Scene", DependencyManager::get<SceneScriptingInterface>().data());
254 259
255 // constants260 // constants
256 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));261 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));