History

changes to allow AudioInjectorOptions to operate as a hash from js

Stephen Birarda committed 12 years ago

Commit a8681cd1 parent d083e757 files · +85 −89Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−4
@@ -234,7 +234,6 @@ bool ScriptEngine::setScriptContents(const QString& scriptContents, const QStrin · 233 unmodified lines
234 return true;234 return true;
235}235}
236 236
237Q_SCRIPT_DECLARE_QMETAOBJECT(AudioInjectorOptions, QObject*)
238Q_SCRIPT_DECLARE_QMETAOBJECT(LocalVoxels, QString)237Q_SCRIPT_DECLARE_QMETAOBJECT(LocalVoxels, QString)
239 238
240void ScriptEngine::init() {239void ScriptEngine::init() {
@@ -254,6 +253,7 @@ void ScriptEngine::init() { · 13 unmodified lines
254 registerMenuItemProperties(this);253 registerMenuItemProperties(this);
255 registerAnimationTypes(this);254 registerAnimationTypes(this);
256 registerAvatarTypes(this);255 registerAvatarTypes(this);
256 registerAudioMetaTypes(this);
257 Bitstream::registerTypes(this);257 Bitstream::registerTypes(this);
258 258
259 qScriptRegisterMetaType(this, EntityItemPropertiesToScriptValue, EntityItemPropertiesFromScriptValue);259 qScriptRegisterMetaType(this, EntityItemPropertiesToScriptValue, EntityItemPropertiesFromScriptValue);
@@ -275,9 +275,6 @@ void ScriptEngine::init() { · 15 unmodified lines
275 QScriptValue soundMetaObject = newQMetaObject(&Sound::staticMetaObject, soundConstructorValue);275 QScriptValue soundMetaObject = newQMetaObject(&Sound::staticMetaObject, soundConstructorValue);
276 globalObject().setProperty("Sound", soundMetaObject);276 globalObject().setProperty("Sound", soundMetaObject);
277 277
278 QScriptValue injectionOptionValue = scriptValueFromQMetaObject<AudioInjectorOptions>();
279 globalObject().setProperty("AudioInjectionOptions", injectionOptionValue);
280
281 QScriptValue localVoxelsValue = scriptValueFromQMetaObject<LocalVoxels>();278 QScriptValue localVoxelsValue = scriptValueFromQMetaObject<LocalVoxels>();
282 globalObject().setProperty("LocalVoxels", localVoxelsValue);279 globalObject().setProperty("LocalVoxels", localVoxelsValue);
283 280