History

first cut at renaming Models to Entities

ZappoMan committed 12 years ago

Commit ccc9eab1 parent f7820ce42 files · +1426 −1424Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+16−16
@@ -22,7 +22,7 @@ · 21 unmodified lines
22#include <AudioRingBuffer.h>22#include <AudioRingBuffer.h>
23#include <AvatarData.h>23#include <AvatarData.h>
24#include <CollisionInfo.h>24#include <CollisionInfo.h>
25#include <ModelsScriptingInterface.h>25#include <EntityScriptingInterface.h>
26#include <NodeList.h>26#include <NodeList.h>
27#include <PacketHeaders.h>27#include <PacketHeaders.h>
28#include <ParticlesScriptingInterface.h>28#include <ParticlesScriptingInterface.h>
@@ -39,7 +39,7 @@ · 10 unmodified lines
39 39
40VoxelsScriptingInterface ScriptEngine::_voxelsScriptingInterface;40VoxelsScriptingInterface ScriptEngine::_voxelsScriptingInterface;
41ParticlesScriptingInterface ScriptEngine::_particlesScriptingInterface;41ParticlesScriptingInterface ScriptEngine::_particlesScriptingInterface;
42ModelsScriptingInterface ScriptEngine::_modelsScriptingInterface;42EntityScriptingInterface ScriptEngine::_entityScriptingInterface;
43 43
44static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* engine) {44static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* engine) {
45 QUrl soundURL = QUrl(context->argument(0).toString());45 QUrl soundURL = QUrl(context->argument(0).toString());
@@ -227,10 +227,10 @@ void ScriptEngine::init() { · 181 unmodified lines
227 qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);227 qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);
228 qScriptRegisterSequenceMetaType<QVector<ParticleID> >(&_engine);228 qScriptRegisterSequenceMetaType<QVector<ParticleID> >(&_engine);
229 229
230 qScriptRegisterMetaType(&_engine, ModelItemPropertiesToScriptValue, ModelItemPropertiesFromScriptValue);230 qScriptRegisterMetaType(&_engine, EntityItemPropertiesToScriptValue, EntityItemPropertiesFromScriptValue);
231 qScriptRegisterMetaType(&_engine, ModelItemIDtoScriptValue, ModelItemIDfromScriptValue);231 qScriptRegisterMetaType(&_engine, EntityItemIDtoScriptValue, EntityItemIDfromScriptValue);
232 qScriptRegisterMetaType(&_engine, RayToModelIntersectionResultToScriptValue, RayToModelIntersectionResultFromScriptValue);232 qScriptRegisterMetaType(&_engine, RayToEntityIntersectionResultToScriptValue, RayToEntityIntersectionResultFromScriptValue);
233 qScriptRegisterSequenceMetaType<QVector<ModelItemID> >(&_engine);233 qScriptRegisterSequenceMetaType<QVector<EntityItemID> >(&_engine);
234 234
235 qScriptRegisterSequenceMetaType<QVector<glm::vec2> >(&_engine);235 qScriptRegisterSequenceMetaType<QVector<glm::vec2> >(&_engine);
236 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(&_engine);236 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(&_engine);
@@ -257,7 +257,7 @@ void ScriptEngine::init() { · 20 unmodified lines
257 registerGlobalObject("Script", this);257 registerGlobalObject("Script", this);
258 registerGlobalObject("Audio", &_audioScriptingInterface);258 registerGlobalObject("Audio", &_audioScriptingInterface);
259 registerGlobalObject("Controller", _controllerScriptingInterface);259 registerGlobalObject("Controller", _controllerScriptingInterface);
260 registerGlobalObject("Models", &_modelsScriptingInterface);260 registerGlobalObject("Entities", &_entityScriptingInterface);
261 registerGlobalObject("Particles", &_particlesScriptingInterface);261 registerGlobalObject("Particles", &_particlesScriptingInterface);
262 registerGlobalObject("Quat", &_quatLibrary);262 registerGlobalObject("Quat", &_quatLibrary);
263 registerGlobalObject("Vec3", &_vec3Library);263 registerGlobalObject("Vec3", &_vec3Library);
@@ -403,13 +403,13 @@ void ScriptEngine::run() { · 139 unmodified lines
403 }403 }
404 }404 }
405 405
406 if (_modelsScriptingInterface.getModelPacketSender()->serversExist()) {406 if (_entityScriptingInterface.getEntityPacketSender()->serversExist()) {
407 // release the queue of edit voxel messages.407 // release the queue of edit voxel messages.
408 _modelsScriptingInterface.getModelPacketSender()->releaseQueuedMessages();408 _entityScriptingInterface.getEntityPacketSender()->releaseQueuedMessages();
409 409
410 // since we're in non-threaded mode, call process so that the packets are sent410 // since we're in non-threaded mode, call process so that the packets are sent
411 if (!_modelsScriptingInterface.getModelPacketSender()->isThreaded()) {411 if (!_entityScriptingInterface.getEntityPacketSender()->isThreaded()) {
412 _modelsScriptingInterface.getModelPacketSender()->process();412 _entityScriptingInterface.getEntityPacketSender()->process();
413 }413 }
414 }414 }
415 415
@@ -524,13 +524,13 @@ void ScriptEngine::run() { · 108 unmodified lines
524 }524 }
525 }525 }
526 526
527 if (_modelsScriptingInterface.getModelPacketSender()->serversExist()) {527 if (_entityScriptingInterface.getEntityPacketSender()->serversExist()) {
528 // release the queue of edit voxel messages.528 // release the queue of edit entity messages.
529 _modelsScriptingInterface.getModelPacketSender()->releaseQueuedMessages();529 _entityScriptingInterface.getEntityPacketSender()->releaseQueuedMessages();
530 530
531 // since we're in non-threaded mode, call process so that the packets are sent531 // since we're in non-threaded mode, call process so that the packets are sent
532 if (!_modelsScriptingInterface.getModelPacketSender()->isThreaded()) {532 if (!_entityScriptingInterface.getEntityPacketSender()->isThreaded()) {
533 _modelsScriptingInterface.getModelPacketSender()->process();533 _entityScriptingInterface.getEntityPacketSender()->process();
534 }534 }
535 }535 }
536 536