History

Breaking up UserInputMapper, restoring some mappings

Brad Davis committed 11 years ago

Commit 734a39f1 parent a75316f21 files · +670 −630Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−7
@@ -308,8 +308,6 @@ void ScriptEngine::init() { · 307 unmodified lines
308 308
309 registerGlobalObject("Script", this);309 registerGlobalObject("Script", this);
310 registerGlobalObject("Audio", &AudioScriptingInterface::getInstance());310 registerGlobalObject("Audio", &AudioScriptingInterface::getInstance());
311 auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();
312 registerGlobalObject("Controller", scriptingInterface.data());
313 registerGlobalObject("Entities", entityScriptingInterface.data());311 registerGlobalObject("Entities", entityScriptingInterface.data());
314 registerGlobalObject("Quat", &_quatLibrary);312 registerGlobalObject("Quat", &_quatLibrary);
315 registerGlobalObject("Vec3", &_vec3Library);313 registerGlobalObject("Vec3", &_vec3Library);
@@ -319,11 +317,9 @@ void ScriptEngine::init() { · 3 unmodified lines
319 // constants317 // constants
320 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));318 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));
321 319
322 if (scriptingInterface) {320 auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();
323 scriptingInterface->registerControllerTypes(this);321 registerGlobalObject("Controller", scriptingInterface.data());
324 }322 UserInputMapper::registerControllerTypes(this);
325
326
327}323}
328 324
329void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {325void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {