Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 10 files). Show all
Unified · Split
| @@ -76,7 +76,6 @@ void avatarDataFromScriptValue(const QScriptValue &object, AvatarData* &out) { · 75 unmodified lines | ||
| 76 | 76 | out = qobject_cast<AvatarData*>(object.toQObject()); |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | − | |
| 80 | 79 | QScriptValue inputControllerToScriptValue(QScriptEngine *engine, controller::InputController* const &in) { |
| 81 | 80 | return engine->newQObject(in); |
| 82 | 81 | } |
| @@ -85,7 +84,8 @@ void inputControllerFromScriptValue(const QScriptValue &object, controller::Inpu · 2 unmodified lines | ||
| 85 | 84 | out = qobject_cast<controller::InputController*>(object.toQObject()); |
| 86 | 85 | } |
| 87 | 86 | |
| 88 | −ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString, controller::ScriptingInterface* controllerScriptingInterface, bool wantSignals) : | |
| 87 | +ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString, | |
| 88 | + controller::ScriptingInterface* controllerScriptingInterface, bool wantSignals) : | |
| 89 | 89 | |
| 90 | 90 | _scriptContents(scriptContents), |
| 91 | 91 | _isFinished(false), |
| @@ -93,6 +93,7 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam · 1 unmodified line | ||
| 93 | 93 | _isInitialized(false), |
| 94 | 94 | _timerFunctionMap(), |
| 95 | 95 | _wantSignals(wantSignals), |
| 96 | + _controllerScriptingInterface(controllerScriptingInterface), | |
| 96 | 97 | _fileNameString(fileNameString), |
| 97 | 98 | _quatLibrary(), |
| 98 | 99 | _vec3Library(), |
| @@ -300,7 +301,7 @@ void ScriptEngine::init() { · 201 unmodified lines | ||
| 300 | 301 | globalObject().setProperty("AudioEffectOptions", audioEffectOptionsConstructorValue); |
| 301 | 302 | |
| 302 | 303 | qScriptRegisterMetaType(this, injectorToScriptValue, injectorFromScriptValue); |
| 303 | − //qScriptRegisterMetaType(this, inputControllerToScriptValue, inputControllerFromScriptValue); | |
| 304 | + qScriptRegisterMetaType(this, inputControllerToScriptValue, inputControllerFromScriptValue); | |
| 304 | 305 | qScriptRegisterMetaType(this, avatarDataToScriptValue, avatarDataFromScriptValue); |
| 305 | 306 | qScriptRegisterMetaType(this, animationDetailsToScriptValue, animationDetailsFromScriptValue); |
| 306 | 307 | qScriptRegisterMetaType(this, webSocketToScriptValue, webSocketFromScriptValue); |
| @@ -309,7 +310,7 @@ void ScriptEngine::init() { · 2 unmodified lines | ||
| 309 | 310 | |
| 310 | 311 | registerGlobalObject("Script", this); |
| 311 | 312 | registerGlobalObject("Audio", &AudioScriptingInterface::getInstance()); |
| 312 | −// registerGlobalObject("Controller", _controllerScriptingInterface); | |
| 313 | + registerGlobalObject("Controller", _controllerScriptingInterface); | |
| 313 | 314 | registerGlobalObject("Entities", entityScriptingInterface.data()); |
| 314 | 315 | registerGlobalObject("Quat", &_quatLibrary); |
| 315 | 316 | registerGlobalObject("Vec3", &_vec3Library); |
| @@ -319,9 +320,9 @@ void ScriptEngine::init() { · 3 unmodified lines | ||
| 319 | 320 | // constants |
| 320 | 321 | globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE))); |
| 321 | 322 | |
| 322 | − //if (_controllerScriptingInterface) { | |
| 323 | − // _controllerScriptingInterface->registerControllerTypes(this); | |
| 324 | − //} | |
| 323 | + if (_controllerScriptingInterface) { | |
| 324 | + _controllerScriptingInterface->registerControllerTypes(this); | |
| 325 | + } | |
| 325 | 326 | |
| 326 | 327 | |
| 327 | 328 | } |