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