History

Merge remote-tracking branch 'upstream/master' into 19734

samcake committed 12 years ago

Commit abacefa2 parents fca3a6a b7b46b0101 files · +3286 −466Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+13−6
@@ -13,7 +13,6 @@ · 12 unmodified lines
13#include <QtCore/QEventLoop>13#include <QtCore/QEventLoop>
14#include <QtCore/QTimer>14#include <QtCore/QTimer>
15#include <QtCore/QThread>15#include <QtCore/QThread>
16#include <QtNetwork/QNetworkAccessManager>
17#include <QtNetwork/QNetworkRequest>16#include <QtNetwork/QNetworkRequest>
18#include <QtNetwork/QNetworkReply>17#include <QtNetwork/QNetworkReply>
19#include <QScriptEngine>18#include <QScriptEngine>
@@ -23,6 +22,7 @@ · 3 unmodified lines
23#include <AvatarData.h>22#include <AvatarData.h>
24#include <CollisionInfo.h>23#include <CollisionInfo.h>
25#include <ModelsScriptingInterface.h>24#include <ModelsScriptingInterface.h>
25#include <NetworkAccessManager.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>
@@ -33,6 +33,7 @@ · 4 unmodified lines
33 33
34#include "AnimationObject.h"34#include "AnimationObject.h"
35#include "MenuItemProperties.h"35#include "MenuItemProperties.h"
36#include "MIDIEvent.h"
36#include "LocalVoxels.h"37#include "LocalVoxels.h"
37#include "ScriptEngine.h"38#include "ScriptEngine.h"
38#include "XMLHttpRequestClass.h"39#include "XMLHttpRequestClass.h"
@@ -149,8 +150,8 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, · 110 unmodified lines
149 emit errorMessage("ERROR Loading file:" + fileName);150 emit errorMessage("ERROR Loading file:" + fileName);
150 }151 }
151 } else {152 } else {
152 QNetworkAccessManager* networkManager = new QNetworkAccessManager(this);153 NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
153 QNetworkReply* reply = networkManager->get(QNetworkRequest(url));154 QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
154 qDebug() << "Downloading included script at" << url;155 qDebug() << "Downloading included script at" << url;
155 QEventLoop loop;156 QEventLoop loop;
156 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));157 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
@@ -225,6 +226,7 @@ void ScriptEngine::init() { · 68 unmodified lines
225 226
226 // register various meta-types227 // register various meta-types
227 registerMetaTypes(&_engine);228 registerMetaTypes(&_engine);
229 registerMIDIMetaTypes(&_engine);
228 registerVoxelMetaTypes(&_engine);230 registerVoxelMetaTypes(&_engine);
229 registerEventTypes(&_engine);231 registerEventTypes(&_engine);
230 registerMenuItemProperties(&_engine);232 registerMenuItemProperties(&_engine);
@@ -263,6 +265,8 @@ void ScriptEngine::init() { · 32 unmodified lines
263 qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue);265 qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue);
264 qScriptRegisterMetaType( &_engine, injectorToScriptValue_InputController, injectorFromScriptValue_InputController);266 qScriptRegisterMetaType( &_engine, injectorToScriptValue_InputController, injectorFromScriptValue_InputController);
265 267
268 qScriptRegisterMetaType(&_engine, animationDetailsToScriptValue, animationDetailsFromScriptValue);
269
266 registerGlobalObject("Script", this);270 registerGlobalObject("Script", this);
267 registerGlobalObject("Audio", &_audioScriptingInterface);271 registerGlobalObject("Audio", &_audioScriptingInterface);
268 registerGlobalObject("Controller", _controllerScriptingInterface);272 registerGlobalObject("Controller", _controllerScriptingInterface);
@@ -478,7 +482,10 @@ void ScriptEngine::run() { · 209 unmodified lines
478 482
479 // pack a placeholder value for sequence number for now, will be packed when destination node is known483 // pack a placeholder value for sequence number for now, will be packed when destination node is known
480 int numPreSequenceNumberBytes = audioPacket.size();484 int numPreSequenceNumberBytes = audioPacket.size();
481 packetStream << (quint16)0;485 packetStream << (quint16) 0;
486
487 // assume scripted avatar audio is mono and set channel flag to zero
488 packetStream << (quint8) 0;
482 489
483 // use the orientation and position of this avatar for the source of this audio490 // use the orientation and position of this avatar for the source of this audio
484 packetStream.writeRawData(reinterpret_cast<const char*>(&_avatarData->getPosition()), sizeof(glm::vec3));491 packetStream.writeRawData(reinterpret_cast<const char*>(&_avatarData->getPosition()), sizeof(glm::vec3));
@@ -655,8 +662,8 @@ void ScriptEngine::include(const QString& includeFile) { · 170 unmodified lines
655 QString includeContents;662 QString includeContents;
656 663
657 if (url.scheme() == "http" || url.scheme() == "ftp") {664 if (url.scheme() == "http" || url.scheme() == "ftp") {
658 QNetworkAccessManager* networkManager = new QNetworkAccessManager(this);665 NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
659 QNetworkReply* reply = networkManager->get(QNetworkRequest(url));666 QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
660 qDebug() << "Downloading included script at" << includeFile;667 qDebug() << "Downloading included script at" << includeFile;
661 QEventLoop loop;668 QEventLoop loop;
662 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));669 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));