Model Server, Renderer, Scripting, etc
Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 47 files). Show all
Unified · Split
| @@ -21,14 +21,14 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <AudioRingBuffer.h> |
| 22 | 22 | #include <AvatarData.h> |
| 23 | 23 | #include <CollisionInfo.h> |
| 24 | +#include <ModelsScriptingInterface.h> | |
| 24 | 25 | #include <NodeList.h> |
| 25 | 26 | #include <PacketHeaders.h> |
| 27 | +#include <ParticlesScriptingInterface.h> | |
| 28 | +#include <Sound.h> | |
| 26 | 29 | #include <UUID.h> |
| 27 | 30 | #include <VoxelConstants.h> |
| 28 | 31 | #include <VoxelDetail.h> |
| 29 | −#include <ParticlesScriptingInterface.h> | |
| 30 | − | |
| 31 | −#include <Sound.h> | |
| 32 | 32 | |
| 33 | 33 | #include "AnimationObject.h" |
| 34 | 34 | #include "MenuItemProperties.h" |
| @@ -37,6 +37,7 @@ · 2 unmodified lines | ||
| 37 | 37 | |
| 38 | 38 | VoxelsScriptingInterface ScriptEngine::_voxelsScriptingInterface; |
| 39 | 39 | ParticlesScriptingInterface ScriptEngine::_particlesScriptingInterface; |
| 40 | +ModelsScriptingInterface ScriptEngine::_modelsScriptingInterface; | |
| 40 | 41 | |
| 41 | 42 | static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* engine) { |
| 42 | 43 | QUrl soundURL = QUrl(context->argument(0).toString()); |
| @@ -204,6 +205,11 @@ void ScriptEngine::init() { · 161 unmodified lines | ||
| 204 | 205 | qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue); |
| 205 | 206 | qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue); |
| 206 | 207 | qScriptRegisterSequenceMetaType<QVector<ParticleID> >(&_engine); |
| 208 | + | |
| 209 | + qScriptRegisterMetaType(&_engine, ModelItemPropertiesToScriptValue, ModelItemPropertiesFromScriptValue); | |
| 210 | + qScriptRegisterMetaType(&_engine, ModelItemIDtoScriptValue, ModelItemIDfromScriptValue); | |
| 211 | + qScriptRegisterSequenceMetaType<QVector<ModelItemID> >(&_engine); | |
| 212 | + | |
| 207 | 213 | qScriptRegisterSequenceMetaType<QVector<glm::vec2> >(&_engine); |
| 208 | 214 | qScriptRegisterSequenceMetaType<QVector<glm::quat> >(&_engine); |
| 209 | 215 | qScriptRegisterSequenceMetaType<QVector<QString> >(&_engine); |
| @@ -224,6 +230,7 @@ void ScriptEngine::init() { · 14 unmodified lines | ||
| 224 | 230 | registerGlobalObject("Script", this); |
| 225 | 231 | registerGlobalObject("Audio", &_audioScriptingInterface); |
| 226 | 232 | registerGlobalObject("Controller", _controllerScriptingInterface); |
| 233 | + registerGlobalObject("Models", &_modelsScriptingInterface); | |
| 227 | 234 | registerGlobalObject("Particles", &_particlesScriptingInterface); |
| 228 | 235 | registerGlobalObject("Quat", &_quatLibrary); |
| 229 | 236 | registerGlobalObject("Vec3", &_vec3Library); |