Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 10 files). Show all
Unified · Split
| @@ -20,15 +20,14 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <AudioRingBuffer.h> |
| 21 | 21 | #include <AvatarData.h> |
| 22 | 22 | #include <CollisionInfo.h> |
| 23 | +#include <ModelsScriptingInterface.h> | |
| 23 | 24 | #include <NodeList.h> |
| 24 | 25 | #include <PacketHeaders.h> |
| 26 | +#include <ParticlesScriptingInterface.h> | |
| 27 | +#include <Sound.h> | |
| 25 | 28 | #include <UUID.h> |
| 26 | 29 | #include <VoxelConstants.h> |
| 27 | 30 | #include <VoxelDetail.h> |
| 28 | −#include <ParticlesScriptingInterface.h> | |
| 29 | −#include <ModelsScriptingInterface.h> | |
| 30 | − | |
| 31 | −#include <Sound.h> | |
| 32 | 31 | |
| 33 | 32 | #include "AnimationObject.h" |
| 34 | 33 | #include "MenuItemProperties.h" |
| @@ -205,6 +204,11 @@ void ScriptEngine::init() { · 170 unmodified lines | ||
| 205 | 204 | qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue); |
| 206 | 205 | qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue); |
| 207 | 206 | qScriptRegisterSequenceMetaType<QVector<ParticleID> >(&_engine); |
| 207 | + | |
| 208 | + qScriptRegisterMetaType(&_engine, ModelItemPropertiesToScriptValue, ModelItemPropertiesFromScriptValue); | |
| 209 | + qScriptRegisterMetaType(&_engine, ModelItemIDtoScriptValue, ModelItemIDfromScriptValue); | |
| 210 | + qScriptRegisterSequenceMetaType<QVector<ModelItemID> >(&_engine); | |
| 211 | + | |
| 208 | 212 | qScriptRegisterSequenceMetaType<QVector<glm::vec2> >(&_engine); |
| 209 | 213 | qScriptRegisterSequenceMetaType<QVector<glm::quat> >(&_engine); |
| 210 | 214 | qScriptRegisterSequenceMetaType<QVector<QString> >(&_engine); |
| @@ -225,6 +229,7 @@ void ScriptEngine::init() { · 14 unmodified lines | ||
| 225 | 229 | registerGlobalObject("Script", this); |
| 226 | 230 | registerGlobalObject("Audio", &_audioScriptingInterface); |
| 227 | 231 | registerGlobalObject("Controller", _controllerScriptingInterface); |
| 232 | + registerGlobalObject("Models", &_modelsScriptingInterface); | |
| 228 | 233 | registerGlobalObject("Particles", &_particlesScriptingInterface); |
| 229 | 234 | registerGlobalObject("Quat", &_quatLibrary); |
| 230 | 235 | registerGlobalObject("Vec3", &_vec3Library); |