Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 08:36:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

re-write Agent to use new QCA infrastructure

Browse source
This commit is contained in:
Stephen Birarda 2013-12-03 11:34:54 -08:00
parent 3301796997
commit 182c69c7b8
2 changed files with 41 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
assignment-client/src/Agent.cpp
View file

@ -6,7 +6,9 @@
// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. // Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
// //
#include <QtCore/QCoreApplication>
#include <QtCore/QEventLoop> #include <QtCore/QEventLoop>
#include <QtCore/QTimer>
#include <QtNetwork/QNetworkAccessManager> #include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkRequest> #include <QtNetwork/QNetworkRequest>
#include <QtNetwork/QNetworkReply> #include <QtNetwork/QNetworkReply>
@ -17,19 +19,12 @@
#include <VoxelConstants.h> #include <VoxelConstants.h>
#include "Agent.h" #include "Agent.h"
#include "voxels/VoxelScriptingInterface.h"
Agent::Agent(const unsigned char* dataBuffer, int numBytes) : Agent::Agent(const unsigned char* dataBuffer, int numBytes) :
Assignment(dataBuffer, numBytes), ThreadedAssignment(dataBuffer, numBytes)
_shouldStop(false)
{ {
} }
void Agent::stop() {
_shouldStop = true;
}
QScriptValue vec3toScriptValue(QScriptEngine *engine, const glm::vec3 &vec3) { QScriptValue vec3toScriptValue(QScriptEngine *engine, const glm::vec3 &vec3) {
QScriptValue obj = engine->newObject(); QScriptValue obj = engine->newObject();
obj.setProperty("x", vec3.x); obj.setProperty("x", vec3.x);
@ -44,6 +39,16 @@ void vec3FromScriptValue(const QScriptValue &object, glm::vec3 &vec3) {
vec3.z = object.property("z").toVariant().toFloat(); vec3.z = object.property("z").toVariant().toFloat();
} }
void Agent::processDatagram(const QByteArray& dataByteArray, const HifiSockAddr& senderSockAddr) {
if (dataByteArray.data()[0] == PACKET_TYPE_VOXEL_JURISDICTION) {
_voxelScriptingInterface.getJurisdictionListener()->queueReceivedPacket(senderSockAddr,
(unsigned char*) dataByteArray.data(),
dataByteArray.size());
} else {
NodeList::getInstance()->processNodeData(senderSockAddr, (unsigned char*) dataByteArray.data(), dataByteArray.size());
}
}
void Agent::run() { void Agent::run() {
NodeList* nodeList = NodeList::getInstance(); NodeList* nodeList = NodeList::getInstance();
nodeList->setOwnerType(NODE_TYPE_AGENT); nodeList->setOwnerType(NODE_TYPE_AGENT);
@ -76,8 +81,7 @@ void Agent::run() {
QScriptValue agentValue = engine.newQObject(this); QScriptValue agentValue = engine.newQObject(this);
engine.globalObject().setProperty("Agent", agentValue); engine.globalObject().setProperty("Agent", agentValue);
VoxelScriptingInterface voxelScripter; QScriptValue voxelScripterValue = engine.newQObject(&_voxelScriptingInterface);
QScriptValue voxelScripterValue = engine.newQObject(&voxelScripter);
engine.globalObject().setProperty("Voxels", voxelScripterValue); engine.globalObject().setProperty("Voxels", voxelScripterValue);
QScriptValue treeScaleValue = engine.newVariant(QVariant(TREE_SCALE)); QScriptValue treeScaleValue = engine.newVariant(QVariant(TREE_SCALE));
@ -86,7 +90,7 @@ void Agent::run() {
const unsigned int VISUAL_DATA_CALLBACK_USECS = (1.0 / 60.0) * 1000 * 1000; const unsigned int VISUAL_DATA_CALLBACK_USECS = (1.0 / 60.0) * 1000 * 1000;
// let the VoxelPacketSender know how frequently we plan to call it // let the VoxelPacketSender know how frequently we plan to call it
voxelScripter.getVoxelPacketSender()->setProcessCallIntervalHint(VISUAL_DATA_CALLBACK_USECS); _voxelScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(VISUAL_DATA_CALLBACK_USECS);
qDebug() << "Downloaded script:" << scriptContents << "\n"; qDebug() << "Downloaded script:" << scriptContents << "\n";
QScriptValue result = engine.evaluate(scriptContents); QScriptValue result = engine.evaluate(scriptContents);
@ -100,46 +104,40 @@ void Agent::run() {
timeval startTime; timeval startTime;
gettimeofday(&startTime, NULL); gettimeofday(&startTime, NULL);
timeval lastDomainServerCheckIn = {};
HifiSockAddr senderSockAddr;
unsigned char receivedData[MAX_PACKET_SIZE];
ssize_t receivedBytes;
int thisFrame = 0; int thisFrame = 0;
NodeList::getInstance()->startSilentNodeRemovalThread(); QTimer* domainServerTimer = new QTimer(this);
connect(domainServerTimer, SIGNAL(timeout()), this, SLOT(checkInWithDomainServerOrExit()));
domainServerTimer->start(DOMAIN_SERVER_CHECK_IN_USECS / 1000);
while (!_shouldStop) { QTimer* silentNodeTimer = new QTimer(this);
connect(silentNodeTimer, SIGNAL(timeout()), nodeList, SLOT(removeSilentNodes()));
// if we're not hearing from the domain-server we should stop running silentNodeTimer->start(NODE_SILENCE_THRESHOLD_USECS / 1000);
if (NodeList::getInstance()->getNumNoReplyDomainCheckIns() == MAX_SILENT_DOMAIN_SERVER_CHECK_INS) {
break; QTimer* pingNodesTimer = new QTimer(this);
} connect(pingNodesTimer, SIGNAL(timeout()), nodeList, SLOT(pingInactiveNodes()));
pingNodesTimer->start(PING_INACTIVE_NODE_INTERVAL_USECS / 1000);
// send a check in packet to the domain server if DOMAIN_SERVER_CHECK_IN_USECS has elapsed
if (usecTimestampNow() - usecTimestamp(&lastDomainServerCheckIn) >= DOMAIN_SERVER_CHECK_IN_USECS) { while (!_isFinished) {
gettimeofday(&lastDomainServerCheckIn, NULL);
NodeList::getInstance()->sendDomainServerCheckIn();
}
int usecToSleep = usecTimestamp(&startTime) + (thisFrame++ * VISUAL_DATA_CALLBACK_USECS) - usecTimestampNow(); int usecToSleep = usecTimestamp(&startTime) + (thisFrame++ * VISUAL_DATA_CALLBACK_USECS) - usecTimestampNow();
if (usecToSleep > 0) { if (usecToSleep > 0) {
usleep(usecToSleep); usleep(usecToSleep);
} }
if (voxelScripter.getVoxelPacketSender()->voxelServersExist()) { QCoreApplication::processEvents();
if (_voxelScriptingInterface.getVoxelPacketSender()->voxelServersExist()) {
timeval thisSend = {}; timeval thisSend = {};
gettimeofday(&thisSend, NULL); gettimeofday(&thisSend, NULL);
// allow the scripter's call back to setup visual data // allow the scripter's call back to setup visual data
emit willSendVisualDataCallback(); emit willSendVisualDataCallback();
// release the queue of edit voxel messages. // release the queue of edit voxel messages.
voxelScripter.getVoxelPacketSender()->releaseQueuedMessages(); _voxelScriptingInterface.getVoxelPacketSender()->releaseQueuedMessages();
// since we're in non-threaded mode, call process so that the packets are sent // since we're in non-threaded mode, call process so that the packets are sent
voxelScripter.getVoxelPacketSender()->process(); _voxelScriptingInterface.getVoxelPacketSender()->process();
} }
if (engine.hasUncaughtException()) { if (engine.hasUncaughtException()) {
@ -147,21 +145,6 @@ void Agent::run() {
qDebug() << "Uncaught exception at line" << line << ":" << engine.uncaughtException().toString() << "\n"; qDebug() << "Uncaught exception at line" << line << ":" << engine.uncaughtException().toString() << "\n";
} }
while (nodeList->getNodeSocket().hasPendingDatagrams() &&
(receivedBytes = nodeList->getNodeSocket().readDatagram((char*) receivedBytes,
MAX_PACKET_SIZE,
senderSockAddr.getAddressPointer(),
senderSockAddr.getPortPointer()))
&& packetVersionMatch(receivedData)) {
if (receivedData[0] == PACKET_TYPE_VOXEL_JURISDICTION) {
voxelScripter.getJurisdictionListener()->queueReceivedPacket(senderSockAddr,
receivedData,
receivedBytes);
} else {
NodeList::getInstance()->processNodeData(senderSockAddr, receivedData, receivedBytes);
}
}
} }
NodeList::getInstance()->stopSilentNodeRemovalThread();
} }

15
assignment-client/src/Agent.h
View file

@ -15,23 +15,24 @@
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QUrl> #include <QtCore/QUrl>
#include <Assignment.h> #include <ThreadedAssignment.h>
class Agent : public Assignment { #include "voxels/VoxelScriptingInterface.h"
class Agent : public ThreadedAssignment {
Q_OBJECT Q_OBJECT
public: public:
Agent(const unsigned char* dataBuffer, int numBytes); Agent(const unsigned char* dataBuffer, int numBytes);
void run();
public slots: public slots:
void stop(); void run();
void processDatagram(const QByteArray& dataByteArray, const HifiSockAddr& senderSockAddr);
signals: signals:
void willSendAudioDataCallback(); void willSendAudioDataCallback();
void willSendVisualDataCallback(); void willSendVisualDataCallback();
private: private:
static QScriptValue AudioInjectorConstructor(QScriptContext *context, QScriptEngine *engine); VoxelScriptingInterface _voxelScriptingInterface;
bool volatile _shouldStop;
}; };
#endif /* defined(__hifi__Agent__) */ #endif /* defined(__hifi__Agent__) */