History

Merge pull request #2764 from ZappoMan/modelserver

Model Server, Renderer, Scripting, etc

AndrewMeadows committed 12 years ago

Commit 05e52772 parents 1954672 8938c1c47 files · +3476 −22Browse files

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

Unified · Split

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