History

added support for MenuItemProperties for addMenuItem, removed some cruft, beginning support for menu item placement

ZappoMan committed 12 years ago

Commit 74d48ab1 parent cb01c1e7 files · +239 −90Browse 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+2−1
@@ -24,6 +24,7 @@ · 23 unmodified lines
24 24
25#include <Sound.h>25#include <Sound.h>
26 26
27#include "MenuTypes.h"
27#include "ScriptEngine.h"28#include "ScriptEngine.h"
28 29
29const unsigned int VISUAL_DATA_CALLBACK_USECS = (1.0 / 60.0) * 1000 * 1000;30const unsigned int VISUAL_DATA_CALLBACK_USECS = (1.0 / 60.0) * 1000 * 1000;
@@ -136,8 +137,8 @@ void ScriptEngine::init() { · 106 unmodified lines
136 // register various meta-types137 // register various meta-types
137 registerMetaTypes(&_engine);138 registerMetaTypes(&_engine);
138 registerVoxelMetaTypes(&_engine);139 registerVoxelMetaTypes(&_engine);
139 //registerParticleMetaTypes(&_engine);
140 registerEventTypes(&_engine);140 registerEventTypes(&_engine);
141 registerMenuTypes(&_engine);
141 142
142 qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);143 qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
143 qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);144 qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);