History

Merge branch 'master' of git://github.com/highfidelity/hifi into 19614

Ryan Huffman committed 12 years ago

Commit dca555a2 parents 0267684 f12d47196 files · +3736 −1344Browse files

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

Unified · Split

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