Merge pull request #1745 from ZappoMan/scripting_work

support for global collision callbacks in JS

AndrewMeadows committed 12 years ago

Commit bed63512 parents 0badc02 da5e0f526 files · +660 −144Browse files

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

Unified · Split

@@ -19,6 +19,7 @@ · 18 unmodified lines
19	19	#include <PacketHeaders.h>
20	20	#include <UUID.h>
21	21	#include <VoxelConstants.h>
	22	+#include <VoxelDetail.h>
22	23	#include <ParticlesScriptingInterface.h>
23	24
24	25	#include <Sound.h>
@@ -115,10 +116,12 @@ void ScriptEngine::init() { · 90 unmodified lines
115	116	_voxelsScriptingInterface.init();
116	117	_particlesScriptingInterface.init();
117	118
118		− // register meta-type for glm::vec3 conversions
	119	+ // register various meta-types
119	120	registerMetaTypes(&_engine);
120		−
	121	+ registerVoxelMetaTypes(&_engine);
	122	+ //registerParticleMetaTypes(&_engine);
121	123	registerEventTypes(&_engine);
	124	+
122	125	qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
123	126	qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);
124	127	qScriptRegisterSequenceMetaType<QVector<ParticleID> >(&_engine);