History

stats font & color changes, styling audio & bandwidth meters

Lucas Crisman committed 12 years ago

Commit a2f8a611 parent 0a944885 files · +67 −51Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Application.cpp+27−23
@@ -254,6 +254,10 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 253 unmodified lines
254 254
255 restoreSizeAndPosition();255 restoreSizeAndPosition();
256 loadScripts();256 loadScripts();
257
258 QFontDatabase fontDatabase;
259 fontDatabase.addApplicationFont("resources/styles/Inconsolata.otf");
260
257 _window->setVisible(true);261 _window->setVisible(true);
258 _glWidget->setFocusPolicy(Qt::StrongFocus);262 _glWidget->setFocusPolicy(Qt::StrongFocus);
259 _glWidget->setFocus();263 _glWidget->setFocus();
@@ -3248,15 +3252,15 @@ void Application::displayStats() { · 2988 unmodified lines
3248 statsHorizontalOffset += 5;3252 statsHorizontalOffset += 5;
3249 3253
3250 statsVerticalOffset += PELS_PER_LINE;3254 statsVerticalOffset += PELS_PER_LINE;
3251 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0f, 0, serverNodes, .93f, .93f, .93f);3255 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0f, 2, serverNodes, .93f, .93f, .93f);
3252 statsVerticalOffset += PELS_PER_LINE;3256 statsVerticalOffset += PELS_PER_LINE;
3253 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0f, 0, avatarNodes, .93f, .93f, .93f);3257 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0f, 2, avatarNodes, .93f, .93f, .93f);
3254 statsVerticalOffset += PELS_PER_LINE;3258 statsVerticalOffset += PELS_PER_LINE;
3255 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, framesPerSecond);3259 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, framesPerSecond, .93f, .93f, .93f);
3256 statsVerticalOffset += PELS_PER_LINE;3260 statsVerticalOffset += PELS_PER_LINE;
3257 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, packetsPerSecond);3261 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, packetsPerSecond, .93f, .93f, .93f);
3258 statsVerticalOffset += PELS_PER_LINE;3262 statsVerticalOffset += PELS_PER_LINE;
3259 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, averageMegabitsPerSecond);3263 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, averageMegabitsPerSecond, .93f, .93f, .93f);
3260 3264
3261 statsVerticalOffset = 0;3265 statsVerticalOffset = 0;
3262 statsHorizontalOffset += 196;3266 statsHorizontalOffset += 196;
@@ -3302,13 +3306,13 @@ void Application::displayStats() { · 39 unmodified lines
3302 statsHorizontalOffset += 5;3306 statsHorizontalOffset += 5;
3303 3307
3304 statsVerticalOffset += PELS_PER_LINE;3308 statsVerticalOffset += PELS_PER_LINE;
3305 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, audioPing);3309 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, audioPing, .93f, .93f, .93f);
3306 statsVerticalOffset += PELS_PER_LINE;3310 statsVerticalOffset += PELS_PER_LINE;
3307 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, avatarPing);3311 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, avatarPing, .93f, .93f, .93f);
3308 statsVerticalOffset += PELS_PER_LINE;3312 statsVerticalOffset += PELS_PER_LINE;
3309 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, voxelAvgPing);3313 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, voxelAvgPing, .93f, .93f, .93f);
3310 statsVerticalOffset += PELS_PER_LINE;3314 statsVerticalOffset += PELS_PER_LINE;
3311 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, voxelMaxPing);3315 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, voxelMaxPing, .93f, .93f, .93f);
3312 3316
3313 statsVerticalOffset = 0;3317 statsVerticalOffset = 0;
3314 statsHorizontalOffset += 246;3318 statsHorizontalOffset += 246;
@@ -3336,13 +3340,13 @@ void Application::displayStats() { · 21 unmodified lines
3336 statsHorizontalOffset += 5;3340 statsHorizontalOffset += 5;
3337 3341
3338 statsVerticalOffset += PELS_PER_LINE;3342 statsVerticalOffset += PELS_PER_LINE;
3339 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, avatarPosition);3343 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, avatarPosition, .93f, .93f, .93f);
3340 statsVerticalOffset += PELS_PER_LINE;3344 statsVerticalOffset += PELS_PER_LINE;
3341 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, avatarVelocity);3345 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, avatarVelocity, .93f, .93f, .93f);
3342 statsVerticalOffset += PELS_PER_LINE;3346 statsVerticalOffset += PELS_PER_LINE;
3343 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, avatarBodyYaw);3347 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, avatarBodyYaw, .93f, .93f, .93f);
3344 statsVerticalOffset += PELS_PER_LINE;3348 statsVerticalOffset += PELS_PER_LINE;
3345 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, avatarMixerStats);3349 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, avatarMixerStats, .93f, .93f, .93f);
3346 3350
3347 statsVerticalOffset = 0;3351 statsVerticalOffset = 0;
3348 statsHorizontalOffset = _glWidget->width() - 451;3352 statsHorizontalOffset = _glWidget->width() - 451;
@@ -3354,7 +3358,7 @@ void Application::displayStats() { · 5 unmodified lines
3354 voxelStats.str("");3358 voxelStats.str("");
3355 voxelStats << "Voxels Memory Nodes: " << VoxelTreeElement::getTotalMemoryUsage() / 1000000.f << "MB";3359 voxelStats << "Voxels Memory Nodes: " << VoxelTreeElement::getTotalMemoryUsage() / 1000000.f << "MB";
3356 statsVerticalOffset += PELS_PER_LINE;3360 statsVerticalOffset += PELS_PER_LINE;
3357 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());3361 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, (char*)voxelStats.str().c_str(), .93f, .93f, .93f);
3358 3362
3359 voxelStats.str("");3363 voxelStats.str("");
3360 voxelStats << 3364 voxelStats <<
@@ -3364,21 +3368,21 @@ void Application::displayStats() { · 3 unmodified lines
3364 ? voxelStats << " / GPU: " << _voxels.getVoxelMemoryUsageGPU() / 1000000.f << "MB"3368 ? voxelStats << " / GPU: " << _voxels.getVoxelMemoryUsageGPU() / 1000000.f << "MB"
3365 : "";3369 : "";
3366 statsVerticalOffset += PELS_PER_LINE;3370 statsVerticalOffset += PELS_PER_LINE;
3367 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());3371 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, (char*)voxelStats.str().c_str(), .93f, .93f, .93f);
3368 3372
3369 // Voxel Rendering3373 // Voxel Rendering
3370 voxelStats.str("");3374 voxelStats.str("");
3371 voxelStats.precision(4);3375 voxelStats.precision(4);
3372 voxelStats << "Voxel Rendering Slots Max: " << _voxels.getMaxVoxels() / 1000.f << "K";3376 voxelStats << "Voxel Rendering Slots Max: " << _voxels.getMaxVoxels() / 1000.f << "K";
3373 statsVerticalOffset += PELS_PER_LINE;3377 statsVerticalOffset += PELS_PER_LINE;
3374 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());3378 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, (char*)voxelStats.str().c_str(), .93f, .93f, .93f);
3375 3379
3376 voxelStats.str("");3380 voxelStats.str("");
3377 voxelStats.precision(4);3381 voxelStats.precision(4);
3378 voxelStats << "Drawn: " << _voxels.getVoxelsWritten() / 1000.f << "K " <<3382 voxelStats << "Drawn: " << _voxels.getVoxelsWritten() / 1000.f << "K " <<
3379 "Abandoned: " << _voxels.getAbandonedVoxels() / 1000.f << "K ";3383 "Abandoned: " << _voxels.getAbandonedVoxels() / 1000.f << "K ";
3380 statsVerticalOffset += PELS_PER_LINE;3384 statsVerticalOffset += PELS_PER_LINE;
3381 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());3385 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, (char*)voxelStats.str().c_str(), .93f, .93f, .93f);
3382 3386
3383 // iterate all the current voxel stats, and list their sending modes, and total voxel counts3387 // iterate all the current voxel stats, and list their sending modes, and total voxel counts
3384 std::stringstream sendingMode("");3388 std::stringstream sendingMode("");
@@ -3417,7 +3421,7 @@ void Application::displayStats() { · 32 unmodified lines
3417 sendingMode << " <SCENE STABLE>";3421 sendingMode << " <SCENE STABLE>";
3418 }3422 }
3419 statsVerticalOffset += PELS_PER_LINE;3423 statsVerticalOffset += PELS_PER_LINE;
3420 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)sendingMode.str().c_str());3424 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, (char*)sendingMode.str().c_str(), .93f, .93f, .93f);
3421 3425
3422 // Incoming packets3426 // Incoming packets
3423 voxelStats.str("");3427 voxelStats.str("");
@@ -3439,7 +3443,7 @@ void Application::displayStats() { · 15 unmodified lines
3439 }3443 }
3440 }3444 }
3441 statsVerticalOffset += PELS_PER_LINE;3445 statsVerticalOffset += PELS_PER_LINE;
3442 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());3446 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, (char*)voxelStats.str().c_str(), .93f, .93f, .93f);
3443 3447
3444 statsVerticalOffset += PELS_PER_LINE;3448 statsVerticalOffset += PELS_PER_LINE;
3445 3449
@@ -3451,14 +3455,14 @@ void Application::displayStats() { · 5 unmodified lines
3451 voxelStats.str("");3455 voxelStats.str("");
3452 voxelStats << "Server voxels: " << serversTotalString.toLocal8Bit().constData();3456 voxelStats << "Server voxels: " << serversTotalString.toLocal8Bit().constData();
3453 statsVerticalOffset += PELS_PER_LINE;3457 statsVerticalOffset += PELS_PER_LINE;
3454 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());3458 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, (char*)voxelStats.str().c_str(), .93f, .93f, .93f);
3455 3459
3456 voxelStats.str("");3460 voxelStats.str("");
3457 voxelStats <<3461 voxelStats <<
3458 "Internal: " << serversInternalString.toLocal8Bit().constData() << " " <<3462 "Internal: " << serversInternalString.toLocal8Bit().constData() << " " <<
3459 "Leaves: " << serversLeavesString.toLocal8Bit().constData() << "";3463 "Leaves: " << serversLeavesString.toLocal8Bit().constData() << "";
3460 statsVerticalOffset += PELS_PER_LINE;3464 statsVerticalOffset += PELS_PER_LINE;
3461 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());3465 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, (char*)voxelStats.str().c_str(), .93f, .93f, .93f);
3462 3466
3463 unsigned long localTotal = VoxelTreeElement::getNodeCount();3467 unsigned long localTotal = VoxelTreeElement::getNodeCount();
3464 unsigned long localInternal = VoxelTreeElement::getInternalNodeCount();3468 unsigned long localInternal = VoxelTreeElement::getInternalNodeCount();
@@ -3471,14 +3475,14 @@ void Application::displayStats() { · 6 unmodified lines
3471 voxelStats.str("");3475 voxelStats.str("");
3472 voxelStats << "Local voxels: " << localTotalString.toLocal8Bit().constData();3476 voxelStats << "Local voxels: " << localTotalString.toLocal8Bit().constData();
3473 statsVerticalOffset += PELS_PER_LINE;3477 statsVerticalOffset += PELS_PER_LINE;
3474 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());3478 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, (char*)voxelStats.str().c_str(), .93f, .93f, .93f);
3475 3479
3476 voxelStats.str("");3480 voxelStats.str("");
3477 voxelStats <<3481 voxelStats <<
3478 "Internal: " << localInternalString.toLocal8Bit().constData() << " " <<3482 "Internal: " << localInternalString.toLocal8Bit().constData() << " " <<
3479 "Leaves: " << localLeavesString.toLocal8Bit().constData() << "";3483 "Leaves: " << localLeavesString.toLocal8Bit().constData() << "";
3480 statsVerticalOffset += PELS_PER_LINE;3484 statsVerticalOffset += PELS_PER_LINE;
3481 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());3485 drawtext(statsHorizontalOffset, statsVerticalOffset, 0.10f, 0, 1.0, 2, (char*)voxelStats.str().c_str(), .93f, .93f, .93f);
3482}3486}
3483 3487
3484void Application::renderThrustAtVoxel(const glm::vec3& thrust) {3488void Application::renderThrustAtVoxel(const glm::vec3& thrust) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t