History

Merge branch 'master' of https://github.com/worklist/hifi into flocking_birds

ZappoMan committed 12 years ago

Commit 15b5bb42 parents 161e04f 2e3e69941 files · +766 −207Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+5−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
25#include <Sound.h>25#include <Sound.h>
26 26
27#include "MenuItemProperties.h"27#include "MenuItemProperties.h"
28#include "LocalVoxels.h"
28#include "ScriptEngine.h"29#include "ScriptEngine.h"
29 30
30const unsigned int VISUAL_DATA_CALLBACK_USECS = (1.0 / 60.0) * 1000 * 1000;31const unsigned int VISUAL_DATA_CALLBACK_USECS = (1.0 / 60.0) * 1000 * 1000;
@@ -118,6 +119,7 @@ bool ScriptEngine::setScriptContents(const QString& scriptContents) { · 87 unmodified lines
118}119}
119 120
120Q_SCRIPT_DECLARE_QMETAOBJECT(AudioInjectorOptions, QObject*)121Q_SCRIPT_DECLARE_QMETAOBJECT(AudioInjectorOptions, QObject*)
122Q_SCRIPT_DECLARE_QMETAOBJECT(LocalVoxels, QString)
121 123
122void ScriptEngine::init() {124void ScriptEngine::init() {
123 if (_isInitialized) {125 if (_isInitialized) {
@@ -146,6 +148,9 @@ void ScriptEngine::init() { · 22 unmodified lines
146 148
147 QScriptValue injectionOptionValue = _engine.scriptValueFromQMetaObject<AudioInjectorOptions>();149 QScriptValue injectionOptionValue = _engine.scriptValueFromQMetaObject<AudioInjectorOptions>();
148 _engine.globalObject().setProperty("AudioInjectionOptions", injectionOptionValue);150 _engine.globalObject().setProperty("AudioInjectionOptions", injectionOptionValue);
151
152 QScriptValue localVoxelsValue = _engine.scriptValueFromQMetaObject<LocalVoxels>();
153 _engine.globalObject().setProperty("LocalVoxels", localVoxelsValue);
149 154
150 registerGlobalObject("Script", this);155 registerGlobalObject("Script", this);
151 registerGlobalObject("Audio", &_audioScriptingInterface);156 registerGlobalObject("Audio", &_audioScriptingInterface);