History

Modified the Script engine for Local voxel handling

Atlante45 committed 12 years ago

Commit 96d4f381 parent 41303131 file · +5 −0Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+5−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
21#include <VoxelConstants.h>21#include <VoxelConstants.h>
22#include <VoxelDetail.h>22#include <VoxelDetail.h>
23#include <ParticlesScriptingInterface.h>23#include <ParticlesScriptingInterface.h>
24#include <LocalVoxels.h>
24 25
25#include <Sound.h>26#include <Sound.h>
26 27
@@ -122,6 +123,7 @@ bool ScriptEngine::setScriptContents(const QString& scriptContents) { · 95 unmodified lines
122}123}
123 124
124Q_SCRIPT_DECLARE_QMETAOBJECT(AudioInjectorOptions, QObject*)125Q_SCRIPT_DECLARE_QMETAOBJECT(AudioInjectorOptions, QObject*)
126Q_SCRIPT_DECLARE_QMETAOBJECT(LocalVoxels, QString)
125 127
126void ScriptEngine::init() {128void ScriptEngine::init() {
127 if (_isInitialized) {129 if (_isInitialized) {
@@ -150,6 +152,9 @@ void ScriptEngine::init() { · 22 unmodified lines
150 152
151 QScriptValue injectionOptionValue = _engine.scriptValueFromQMetaObject<AudioInjectorOptions>();153 QScriptValue injectionOptionValue = _engine.scriptValueFromQMetaObject<AudioInjectorOptions>();
152 _engine.globalObject().setProperty("AudioInjectionOptions", injectionOptionValue);154 _engine.globalObject().setProperty("AudioInjectionOptions", injectionOptionValue);
155
156 QScriptValue localVoxelsValue = _engine.scriptValueFromQMetaObject<LocalVoxels>();
157 _engine.globalObject().setProperty("LocalVoxels", localVoxelsValue);
153 158
154 registerGlobalObject("Script", this);159 registerGlobalObject("Script", this);
155 registerGlobalObject("Audio", &_audioScriptingInterface);160 registerGlobalObject("Audio", &_audioScriptingInterface);