History

Merge branch 'master' of https://github.com/highfidelity/hifi into baseball

Atlante45 committed 10 years ago

Commit 1d498af2 parents c4e43c4 06c8235276 files · +6552 −4777Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−3
@@ -81,6 +81,9 @@ void avatarDataFromScriptValue(const QScriptValue &object, AvatarData* &out) { · 80 unmodified lines
81 out = qobject_cast<AvatarData*>(object.toQObject());81 out = qobject_cast<AvatarData*>(object.toQObject());
82}82}
83 83
84Q_DECLARE_METATYPE(controller::InputController*)
85static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>();
86
84QScriptValue inputControllerToScriptValue(QScriptEngine *engine, controller::InputController* const &in) {87QScriptValue inputControllerToScriptValue(QScriptEngine *engine, controller::InputController* const &in) {
85 return engine->newQObject(in);88 return engine->newQObject(in);
86}89}
@@ -89,8 +92,6 @@ void inputControllerFromScriptValue(const QScriptValue &object, controller::Inpu · 2 unmodified lines
89 out = qobject_cast<controller::InputController*>(object.toQObject());92 out = qobject_cast<controller::InputController*>(object.toQObject());
90}93}
91 94
92
93
94static bool hasCorrectSyntax(const QScriptProgram& program) {95static bool hasCorrectSyntax(const QScriptProgram& program) {
95 const auto syntaxCheck = QScriptEngine::checkSyntax(program.sourceCode());96 const auto syntaxCheck = QScriptEngine::checkSyntax(program.sourceCode());
96 if (syntaxCheck.state() != QScriptSyntaxCheckResult::Valid) {97 if (syntaxCheck.state() != QScriptSyntaxCheckResult::Valid) {
@@ -673,7 +674,6 @@ void ScriptEngine::run() { · 576 unmodified lines
673 }674 }
674 675
675 _isRunning = true;676 _isRunning = true;
676 _isFinished = false;
677 if (_wantSignals) {677 if (_wantSignals) {
678 emit runningStateChanged();678 emit runningStateChanged();
679 }679 }