Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:35:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Philip Rosedale 2013-07-08 16:17:51 -07:00
commit 95ac0a891f
3 changed files with 63 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
interface/src/Application.cpp
View file

@ -483,30 +483,41 @@ void Application::resizeGL(int width, int height) {
glLoadIdentity(); glLoadIdentity();
} }
void Application::broadcastToNodes(unsigned char* data, size_t bytes, const char type) { void Application::controlledBroadcastToNodes(unsigned char* broadcastData, size_t dataBytes,
const char* nodeTypes, int numNodeTypes) {
Application* self = getInstance();
for (int i = 0; i < numNodeTypes; ++i) {
int n = NodeList::getInstance()->broadcastToNodes(data, bytes, &type, 1); // Intercept data to voxel server when voxels are disabled
if (nodeTypes[i] == NODE_TYPE_VOXEL_SERVER && ! self->_renderVoxels->isChecked()) {
continue;
}
BandwidthMeter::ChannelIndex channel; // Perform the broadcast for one type
switch (type) { int nReceivingNodes = NodeList::getInstance()->broadcastToNodes(broadcastData, dataBytes, & nodeTypes[i], 1);
case NODE_TYPE_AGENT:
case NODE_TYPE_AVATAR_MIXER: // Feed number of bytes to corresponding channel of the bandwidth meter, if any (done otherwise)
channel = BandwidthMeter::AVATARS; BandwidthMeter::ChannelIndex channel;
break; switch (nodeTypes[i]) {
case NODE_TYPE_VOXEL_SERVER: case NODE_TYPE_AGENT:
channel = BandwidthMeter::VOXELS; case NODE_TYPE_AVATAR_MIXER:
break; channel = BandwidthMeter::AVATARS;
default: break;
return; case NODE_TYPE_VOXEL_SERVER:
channel = BandwidthMeter::VOXELS;
break;
default:
continue;
}
self->_bandwidthMeter.outputStream(channel).updateValue(nReceivingNodes * dataBytes);
} }
getInstance()->_bandwidthMeter.outputStream(channel).updateValue(n * bytes);
} }
void Application::sendVoxelServerAddScene() { void Application::sendVoxelServerAddScene() {
char message[100]; char message[100];
sprintf(message,"%c%s",'Z',"add scene"); sprintf(message,"%c%s",'Z',"add scene");
int messageSize = strlen(message) + 1; int messageSize = strlen(message) + 1;
broadcastToNodes((unsigned char*)message, messageSize, NODE_TYPE_VOXEL_SERVER); controlledBroadcastToNodes((unsigned char*)message, messageSize, & NODE_TYPE_VOXEL_SERVER, 1);
} }
void Application::keyPressEvent(QKeyEvent* event) { void Application::keyPressEvent(QKeyEvent* event) {
@ -877,16 +888,16 @@ void Application::wheelEvent(QWheelEvent* event) {
} }
} }
void sendPingPackets() { void Application::sendPingPackets() {
char nodeTypesOfInterest[] = {NODE_TYPE_VOXEL_SERVER, NODE_TYPE_AUDIO_MIXER, NODE_TYPE_AVATAR_MIXER}; char nodeTypesOfInterest[] = {NODE_TYPE_VOXEL_SERVER, NODE_TYPE_AUDIO_MIXER, NODE_TYPE_AVATAR_MIXER};
long long currentTime = usecTimestampNow(); long long currentTime = usecTimestampNow();
char pingPacket[1 + sizeof(currentTime)]; unsigned char pingPacket[1 + sizeof(currentTime)];
pingPacket[0] = PACKET_HEADER_PING; pingPacket[0] = PACKET_HEADER_PING;
memcpy(&pingPacket[1], &currentTime, sizeof(currentTime)); memcpy(&pingPacket[1], &currentTime, sizeof(currentTime));
NodeList::getInstance()->broadcastToNodes((unsigned char*)pingPacket, 1 + sizeof(currentTime), nodeTypesOfInterest, 3); getInstance()->controlledBroadcastToNodes(pingPacket, 1 + sizeof(currentTime),
nodeTypesOfInterest, sizeof(nodeTypesOfInterest));
} }
// Every second, check the frame rates and other stuff // Every second, check the frame rates and other stuff
@ -987,7 +998,7 @@ void Application::sendAvatarVoxelURLMessage(const QUrl& url) {
message.append((const char*)&ownerID, sizeof(ownerID)); message.append((const char*)&ownerID, sizeof(ownerID));
message.append(url.toEncoded()); message.append(url.toEncoded());
broadcastToNodes((unsigned char*)message.data(), message.size(), NODE_TYPE_AVATAR_MIXER); controlledBroadcastToNodes((unsigned char*)message.data(), message.size(), & NODE_TYPE_AVATAR_MIXER, 1);
} }
void Application::processAvatarVoxelURLMessage(unsigned char *packetData, size_t dataBytes) { void Application::processAvatarVoxelURLMessage(unsigned char *packetData, size_t dataBytes) {
@ -1220,7 +1231,7 @@ void Application::sendVoxelEditMessage(PACKET_HEADER header, VoxelDetail& detail
int sizeOut; int sizeOut;
if (createVoxelEditMessage(header, 0, 1, &detail, bufferOut, sizeOut)){ if (createVoxelEditMessage(header, 0, 1, &detail, bufferOut, sizeOut)){
Application::broadcastToNodes(bufferOut, sizeOut, NODE_TYPE_VOXEL_SERVER); Application::controlledBroadcastToNodes(bufferOut, sizeOut, & NODE_TYPE_VOXEL_SERVER, 1);
delete[] bufferOut; delete[] bufferOut;
} }
} }
@ -1301,7 +1312,7 @@ bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) {
// if we have room don't have room in the buffer, then send the previously generated message first // if we have room don't have room in the buffer, then send the previously generated message first
if (args->bufferInUse + codeAndColorLength > MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE) { if (args->bufferInUse + codeAndColorLength > MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE) {
broadcastToNodes(args->messageBuffer, args->bufferInUse, NODE_TYPE_VOXEL_SERVER); controlledBroadcastToNodes(args->messageBuffer, args->bufferInUse, & NODE_TYPE_VOXEL_SERVER, 1);
args->bufferInUse = sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int); // reset args->bufferInUse = sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int); // reset
} }
@ -1382,7 +1393,7 @@ void Application::importVoxels() {
// If we have voxels left in the packet, then send the packet // If we have voxels left in the packet, then send the packet
if (args.bufferInUse > (sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int))) { if (args.bufferInUse > (sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int))) {
broadcastToNodes(args.messageBuffer, args.bufferInUse, NODE_TYPE_VOXEL_SERVER); controlledBroadcastToNodes(args.messageBuffer, args.bufferInUse, & NODE_TYPE_VOXEL_SERVER, 1);
} }
if (calculatedOctCode) { if (calculatedOctCode) {
@ -1434,7 +1445,7 @@ void Application::pasteVoxels() {
// If we have voxels left in the packet, then send the packet // If we have voxels left in the packet, then send the packet
if (args.bufferInUse > (sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int))) { if (args.bufferInUse > (sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int))) {
broadcastToNodes(args.messageBuffer, args.bufferInUse, NODE_TYPE_VOXEL_SERVER); controlledBroadcastToNodes(args.messageBuffer, args.bufferInUse, & NODE_TYPE_VOXEL_SERVER, 1);
} }
if (calculatedOctCode) { if (calculatedOctCode) {
@ -1512,6 +1523,8 @@ void Application::initMenu() {
(_logOn = toolsMenu->addAction("Log"))->setCheckable(true); (_logOn = toolsMenu->addAction("Log"))->setCheckable(true);
_logOn->setChecked(false); _logOn->setChecked(false);
_logOn->setShortcut(Qt::CTRL | Qt::Key_L); _logOn->setShortcut(Qt::CTRL | Qt::Key_L);
(_oscilloscopeOn = toolsMenu->addAction("Audio Oscilloscope"))->setCheckable(true);
_oscilloscopeOn->setChecked(true);
(_bandwidthDisplayOn = toolsMenu->addAction("Bandwidth Display"))->setCheckable(true); (_bandwidthDisplayOn = toolsMenu->addAction("Bandwidth Display"))->setCheckable(true);
_bandwidthDisplayOn->setChecked(true); _bandwidthDisplayOn->setChecked(true);
toolsMenu->addAction("Bandwidth Details", this, SLOT(bandwidthDetails())); toolsMenu->addAction("Bandwidth Details", this, SLOT(bandwidthDetails()));
@ -1981,9 +1994,10 @@ void Application::updateAvatar(float deltaTime) {
endOfBroadcastStringWrite += packNodeId(endOfBroadcastStringWrite, nodeList->getOwnerID()); endOfBroadcastStringWrite += packNodeId(endOfBroadcastStringWrite, nodeList->getOwnerID());
endOfBroadcastStringWrite += _myAvatar.getBroadcastData(endOfBroadcastStringWrite); endOfBroadcastStringWrite += _myAvatar.getBroadcastData(endOfBroadcastStringWrite);
broadcastToNodes(broadcastString, endOfBroadcastStringWrite - broadcastString, NODE_TYPE_VOXEL_SERVER); const char nodeTypesOfInterest[] = { NODE_TYPE_VOXEL_SERVER, NODE_TYPE_AVATAR_MIXER };
broadcastToNodes(broadcastString, endOfBroadcastStringWrite - broadcastString, NODE_TYPE_AVATAR_MIXER); controlledBroadcastToNodes(broadcastString, endOfBroadcastStringWrite - broadcastString,
nodeTypesOfInterest, sizeof(nodeTypesOfInterest));
// once in a while, send my voxel url // once in a while, send my voxel url
const float AVATAR_VOXEL_URL_SEND_INTERVAL = 1.0f; // seconds const float AVATAR_VOXEL_URL_SEND_INTERVAL = 1.0f; // seconds
@ -2338,8 +2352,9 @@ void Application::displayOverlay() {
#ifndef _WIN32 #ifndef _WIN32
_audio.render(_glWidget->width(), _glWidget->height()); _audio.render(_glWidget->width(), _glWidget->height());
_audioScope.render(20, _glWidget->height() - 200); if (_oscilloscopeOn->isChecked()) {
//_audio.renderEchoCompare(); // PER: Will turn back on to further test echo _audioScope.render(20, _glWidget->height() - 200);
}
#endif #endif
//noiseTest(_glWidget->width(), _glWidget->height()); //noiseTest(_glWidget->width(), _glWidget->height());

8
interface/src/Application.h
View file

@ -154,12 +154,15 @@ private slots:
private: private:
static void broadcastToNodes(unsigned char* data, size_t bytes, const char type); static void controlledBroadcastToNodes(unsigned char* broadcastData, size_t dataBytes,
const char* nodeTypes, int numNodeTypes);
static void sendVoxelServerAddScene(); static void sendVoxelServerAddScene();
static bool sendVoxelsOperation(VoxelNode* node, void* extraData); static bool sendVoxelsOperation(VoxelNode* node, void* extraData);
static void sendVoxelEditMessage(PACKET_HEADER header, VoxelDetail& detail);
static void sendAvatarVoxelURLMessage(const QUrl& url); static void sendAvatarVoxelURLMessage(const QUrl& url);
static void processAvatarVoxelURLMessage(unsigned char *packetData, size_t dataBytes); static void processAvatarVoxelURLMessage(unsigned char *packetData, size_t dataBytes);
static void sendVoxelEditMessage(PACKET_HEADER header, VoxelDetail& detail); static void sendPingPackets();
void initMenu(); void initMenu();
void updateFrustumRenderModeAction(); void updateFrustumRenderModeAction();
@ -227,6 +230,7 @@ private:
QAction* _manualFirstPerson; // Whether to force first-person mode QAction* _manualFirstPerson; // Whether to force first-person mode
QAction* _manualThirdPerson; // Whether to force third-person mode QAction* _manualThirdPerson; // Whether to force third-person mode
QAction* _logOn; // Whether to show on-screen log QAction* _logOn; // Whether to show on-screen log
QAction* _oscilloscopeOn; // Whether to show the oscilloscope
QAction* _bandwidthDisplayOn; // Whether to show on-screen bandwidth bars QAction* _bandwidthDisplayOn; // Whether to show on-screen bandwidth bars
QActionGroup* _voxelModeActions; // The group of voxel edit mode actions QActionGroup* _voxelModeActions; // The group of voxel edit mode actions
QAction* _addVoxelMode; // Whether add voxel mode is enabled QAction* _addVoxelMode; // Whether add voxel mode is enabled

13
interface/src/BandwidthMeter.cpp
View file

@ -68,6 +68,12 @@ void BandwidthMeter::Stream::updateValue(double amount) {
timeval now; timeval now;
gettimeofday(& now, NULL); gettimeofday(& now, NULL);
double dt = diffclock(& _prevTime, & now); double dt = diffclock(& _prevTime, & now);
// Ignore this value when timer imprecision yields dt = 0
if (dt == 0.0) {
return;
}
memcpy(& _prevTime, & now, sizeof(timeval)); memcpy(& _prevTime, & now, sizeof(timeval));
// Compute approximate average // Compute approximate average
@ -225,6 +231,13 @@ void BandwidthMeter::render(int screenWidth, int screenHeight) {
textYlowerLine, fmtBuf); textYlowerLine, fmtBuf);
glPopMatrix(); glPopMatrix();
// After rendering, indicate that no data has been sent/received since the last feed.
// This way, the meters fall when not continuously fed.
for (int i = 0; i < N_CHANNELS; ++i) {
inputStream(ChannelIndex(i)).updateValue(0);
outputStream(ChannelIndex(i)).updateValue(0);
}
} }