Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 96 files). Show all
Unified · Split
| @@ -18,6 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <QtNetwork/QNetworkReply> |
| 19 | 19 | #include <QScriptEngine> |
| 20 | 20 | |
| 21 | +#include <AudioInjector.h> | |
| 21 | 22 | #include <AudioRingBuffer.h> |
| 22 | 23 | #include <AvatarData.h> |
| 23 | 24 | #include <CollisionInfo.h> |
| @@ -53,6 +54,14 @@ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine){ · 29 unmodified lines | ||
| 53 | 54 | return QScriptValue(); |
| 54 | 55 | } |
| 55 | 56 | |
| 57 | +QScriptValue injectorToScriptValue(QScriptEngine *engine, AudioInjector* const &in) { | |
| 58 | + return engine->newQObject(in); | |
| 59 | +} | |
| 60 | + | |
| 61 | +void injectorFromScriptValue(const QScriptValue &object, AudioInjector* &out) { | |
| 62 | + out = qobject_cast<AudioInjector*>(object.toQObject()); | |
| 63 | +} | |
| 64 | + | |
| 56 | 65 | ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString, |
| 57 | 66 | AbstractControllerScriptingInterface* controllerScriptingInterface) : |
| 58 | 67 | |
| @@ -202,6 +211,7 @@ void ScriptEngine::init() { · 143 unmodified lines | ||
| 202 | 211 | registerEventTypes(&_engine); |
| 203 | 212 | registerMenuItemProperties(&_engine); |
| 204 | 213 | registerAnimationTypes(&_engine); |
| 214 | + registerAvatarTypes(&_engine); | |
| 205 | 215 | |
| 206 | 216 | qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue); |
| 207 | 217 | qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue); |
| @@ -230,6 +240,8 @@ void ScriptEngine::init() { · 22 unmodified lines | ||
| 230 | 240 | |
| 231 | 241 | QScriptValue localVoxelsValue = _engine.scriptValueFromQMetaObject<LocalVoxels>(); |
| 232 | 242 | _engine.globalObject().setProperty("LocalVoxels", localVoxelsValue); |
| 243 | + | |
| 244 | + qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue); | |
| 233 | 245 | |
| 234 | 246 | registerGlobalObject("Script", this); |
| 235 | 247 | registerGlobalObject("Audio", &_audioScriptingInterface); |