Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 5 files). Show all
Unified · Split
| @@ -63,7 +63,15 @@ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine){ · 62 unmodified lines | |||
| 63 | return QScriptValue(); | 63 | return QScriptValue(); |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | QScriptValue injectorToScriptValue(QScriptEngine *engine, AudioInjector* const &in) { | 66 | QScriptValue avatarDataToScriptValue(QScriptEngine* engine, AvatarData* const &in) { |
| 67 | return engine->newQObject(in); | ||
| 68 | } | ||
| 69 | |||
| 70 | void avatarDataFromScriptValue(const QScriptValue &object, AvatarData* &out) { | ||
| 71 | out = qobject_cast<AvatarData*>(object.toQObject()); | ||
| 72 | } | ||
| 73 | |||
| 74 | QScriptValue injectorToScriptValue(QScriptEngine* engine, AudioInjector* const &in) { | ||
| 67 | return engine->newQObject(in); | 75 | return engine->newQObject(in); |
| 68 | } | 76 | } |
| 69 | 77 | ||
| @@ -272,7 +280,7 @@ void ScriptEngine::init() { · 202 unmodified lines | |||
| 272 | 280 | ||
| 273 | qScriptRegisterMetaType(this, injectorToScriptValue, injectorFromScriptValue); | 281 | qScriptRegisterMetaType(this, injectorToScriptValue, injectorFromScriptValue); |
| 274 | qScriptRegisterMetaType(this, inputControllerToScriptValue, inputControllerFromScriptValue); | 282 | qScriptRegisterMetaType(this, inputControllerToScriptValue, inputControllerFromScriptValue); |
| 275 | 283 | qScriptRegisterMetaType(this, avatarDataToScriptValue, avatarDataFromScriptValue); | |
| 276 | qScriptRegisterMetaType(this, animationDetailsToScriptValue, animationDetailsFromScriptValue); | 284 | qScriptRegisterMetaType(this, animationDetailsToScriptValue, animationDetailsFromScriptValue); |
| 277 | 285 | ||
| 278 | registerGlobalObject("Script", this); | 286 | registerGlobalObject("Script", this); |