History

support for global collision callbacks in JS

ZappoMan committed 12 years ago

Commit 08b06cc1 parent 616cfac21 files · +447 −240Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+5−2
@@ -19,6 +19,7 @@ · 18 unmodified lines
1919 #include <PacketHeaders.h>
2020 #include <UUID.h>
2121 #include <VoxelConstants.h>
22+#include <VoxelDetail.h>
2223 #include <ParticlesScriptingInterface.h>
2324
2425 #include <Sound.h>
@@ -114,10 +115,12 @@ void ScriptEngine::init() { · 89 unmodified lines
114115 _voxelsScriptingInterface.init();
115116 _particlesScriptingInterface.init();
116117
117− // register meta-type for glm::vec3 conversions
118+ // register various meta-types
118119 registerMetaTypes(&_engine);
119−
120+ registerVoxelMetaTypes(&_engine);
121+ //registerParticleMetaTypes(&_engine);
120122 registerEventTypes(&_engine);
123+
121124 qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
122125 qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);
123126 qScriptRegisterSequenceMetaType<QVector<ParticleID> >(&_engine);