History

Merge pull request #2093 from ZappoMan/menu_js

Adds support for editing application Menus to JS

Stephen Birarda committed 12 years ago

Commit bf3b5c02 parents e7ce728 3943c4916 files · +717 −75Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 16 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 "MenuItemProperties.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;
@@ -140,8 +141,8 @@ void ScriptEngine::init() { · 110 unmodified lines
140 // register various meta-types141 // register various meta-types
141 registerMetaTypes(&_engine);142 registerMetaTypes(&_engine);
142 registerVoxelMetaTypes(&_engine);143 registerVoxelMetaTypes(&_engine);
143 //registerParticleMetaTypes(&_engine);
144 registerEventTypes(&_engine);144 registerEventTypes(&_engine);
145 registerMenuItemProperties(&_engine);
145 146
146 qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);147 qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
147 qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);148 qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);