History

Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities

ZappoMan committed 12 years ago

Commit ec0c3502 parents 5e5af9c 3729428102 files · +3073 −410Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 102 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 <EntityScriptingInterface.h>24#include <EntityScriptingInterface.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"
@@ -141,8 +142,8 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, · 102 unmodified lines
141 emit errorMessage("ERROR Loading file:" + fileName);142 emit errorMessage("ERROR Loading file:" + fileName);
142 }143 }
143 } else {144 } else {
144 QNetworkAccessManager* networkManager = new QNetworkAccessManager(this);145 NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
145 QNetworkReply* reply = networkManager->get(QNetworkRequest(url));146 QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
146 qDebug() << "Downloading included script at" << url;147 qDebug() << "Downloading included script at" << url;
147 QEventLoop loop;148 QEventLoop loop;
148 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));149 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
@@ -217,6 +218,7 @@ void ScriptEngine::init() { · 68 unmodified lines
217 218
218 // register various meta-types219 // register various meta-types
219 registerMetaTypes(&_engine);220 registerMetaTypes(&_engine);
221 registerMIDIMetaTypes(&_engine);
220 registerVoxelMetaTypes(&_engine);222 registerVoxelMetaTypes(&_engine);
221 registerEventTypes(&_engine);223 registerEventTypes(&_engine);
222 registerMenuItemProperties(&_engine);224 registerMenuItemProperties(&_engine);
@@ -254,6 +256,8 @@ void ScriptEngine::init() { · 31 unmodified lines
254 256
255 qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue);257 qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue);
256 258
259 qScriptRegisterMetaType(&_engine, animationDetailsToScriptValue, animationDetailsFromScriptValue);
260
257 registerGlobalObject("Script", this);261 registerGlobalObject("Script", this);
258 registerGlobalObject("Audio", &_audioScriptingInterface);262 registerGlobalObject("Audio", &_audioScriptingInterface);
259 registerGlobalObject("Controller", _controllerScriptingInterface);263 registerGlobalObject("Controller", _controllerScriptingInterface);
@@ -469,7 +473,10 @@ void ScriptEngine::run() { · 209 unmodified lines
469 473
470 // pack a placeholder value for sequence number for now, will be packed when destination node is known474 // pack a placeholder value for sequence number for now, will be packed when destination node is known
471 int numPreSequenceNumberBytes = audioPacket.size();475 int numPreSequenceNumberBytes = audioPacket.size();
472 packetStream << (quint16)0;476 packetStream << (quint16) 0;
477
478 // assume scripted avatar audio is mono and set channel flag to zero
479 packetStream << (quint8) 0;
473 480
474 // use the orientation and position of this avatar for the source of this audio481 // use the orientation and position of this avatar for the source of this audio
475 packetStream.writeRawData(reinterpret_cast<const char*>(&_avatarData->getPosition()), sizeof(glm::vec3));482 packetStream.writeRawData(reinterpret_cast<const char*>(&_avatarData->getPosition()), sizeof(glm::vec3));
@@ -646,8 +653,8 @@ void ScriptEngine::include(const QString& includeFile) { · 170 unmodified lines
646 QString includeContents;653 QString includeContents;
647 654
648 if (url.scheme() == "http" || url.scheme() == "ftp") {655 if (url.scheme() == "http" || url.scheme() == "ftp") {
649 QNetworkAccessManager* networkManager = new QNetworkAccessManager(this);656 NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
650 QNetworkReply* reply = networkManager->get(QNetworkRequest(url));657 QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
651 qDebug() << "Downloading included script at" << includeFile;658 qDebug() << "Downloading included script at" << includeFile;
652 QEventLoop loop;659 QEventLoop loop;
653 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));660 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));