Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 21 files). Show all
Unified · Split
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | #include <PacketHeaders.h> | 19 | #include <PacketHeaders.h> |
| 20 | #include <UUID.h> | 20 | #include <UUID.h> |
| 21 | #include <VoxelConstants.h> | 21 | #include <VoxelConstants.h> |
| 22 | #include <VoxelDetail.h> | ||
| 22 | #include <ParticlesScriptingInterface.h> | 23 | #include <ParticlesScriptingInterface.h> |
| 23 | 24 | ||
| 24 | #include <Sound.h> | 25 | #include <Sound.h> |
| @@ -114,10 +115,12 @@ void ScriptEngine::init() { · 89 unmodified lines | |||
| 114 | _voxelsScriptingInterface.init(); | 115 | _voxelsScriptingInterface.init(); |
| 115 | _particlesScriptingInterface.init(); | 116 | _particlesScriptingInterface.init(); |
| 116 | 117 | ||
| 117 | // register meta-type for glm::vec3 conversions | 118 | // register various meta-types |
| 118 | registerMetaTypes(&_engine); | 119 | registerMetaTypes(&_engine); |
| 119 | 120 | registerVoxelMetaTypes(&_engine); | |
| 121 | //registerParticleMetaTypes(&_engine); | ||
| 120 | registerEventTypes(&_engine); | 122 | registerEventTypes(&_engine); |
| 123 | |||
| 121 | qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue); | 124 | qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue); |
| 122 | qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue); | 125 | qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue); |
| 123 | qScriptRegisterSequenceMetaType<QVector<ParticleID> >(&_engine); | 126 | qScriptRegisterSequenceMetaType<QVector<ParticleID> >(&_engine); |