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
2525 #include <Sound.h>
2626
2727 #include "MenuItemProperties.h"
28+#include "LocalVoxels.h"
2829 #include "ScriptEngine.h"
2930
3031 const 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
118119 }
119120
120121 Q_SCRIPT_DECLARE_QMETAOBJECT(AudioInjectorOptions, QObject*)
122+Q_SCRIPT_DECLARE_QMETAOBJECT(LocalVoxels, QString)
121123
122124 void ScriptEngine::init() {
123125 if (_isInitialized) {
@@ -146,6 +148,9 @@ void ScriptEngine::init() { · 22 unmodified lines
146148
147149 QScriptValue injectionOptionValue = _engine.scriptValueFromQMetaObject<AudioInjectorOptions>();
148150 _engine.globalObject().setProperty("AudioInjectionOptions", injectionOptionValue);
151+
152+ QScriptValue localVoxelsValue = _engine.scriptValueFromQMetaObject<LocalVoxels>();
153+ _engine.globalObject().setProperty("LocalVoxels", localVoxelsValue);
149154
150155 registerGlobalObject("Script", this);
151156 registerGlobalObject("Audio", &_audioScriptingInterface);