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
254254
255255 restoreSizeAndPosition();
256256 loadScripts();
257+
258+ QFontDatabase fontDatabase;
259+ fontDatabase.addApplicationFont("resources/styles/Inconsolata.otf");
260+
257261 _window->setVisible(true);
258262 _glWidget->setFocusPolicy(Qt::StrongFocus);
259263 _glWidget->setFocus();
@@ -3248,15 +3252,15 @@ void Application::displayStats() { · 2988 unmodified lines
32483252 statsHorizontalOffset += 5;
32493253
32503254 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);
32523256 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);
32543258 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);
32563260 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);
32583262 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);
32603264
32613265 statsVerticalOffset = 0;
32623266 statsHorizontalOffset += 196;
@@ -3302,13 +3306,13 @@ void Application::displayStats() { · 39 unmodified lines
33023306 statsHorizontalOffset += 5;
33033307
33043308 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);
33063310 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);
33083312 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);
33103314 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);
33123316
33133317 statsVerticalOffset = 0;
33143318 statsHorizontalOffset += 246;
@@ -3336,13 +3340,13 @@ void Application::displayStats() { · 21 unmodified lines
33363340 statsHorizontalOffset += 5;
33373341
33383342 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);
33403344 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);
33423346 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);
33443348 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);
33463350
33473351 statsVerticalOffset = 0;
33483352 statsHorizontalOffset = _glWidget->width() - 451;
@@ -3354,7 +3358,7 @@ void Application::displayStats() { · 5 unmodified lines
33543358 voxelStats.str("");
33553359 voxelStats << "Voxels Memory Nodes: " << VoxelTreeElement::getTotalMemoryUsage() / 1000000.f << "MB";
33563360 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);
33583362
33593363 voxelStats.str("");
33603364 voxelStats <<
@@ -3364,21 +3368,21 @@ void Application::displayStats() { · 3 unmodified lines
33643368 ? voxelStats << " / GPU: " << _voxels.getVoxelMemoryUsageGPU() / 1000000.f << "MB"
33653369 : "";
33663370 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);
33683372
33693373 // Voxel Rendering
33703374 voxelStats.str("");
33713375 voxelStats.precision(4);
33723376 voxelStats << "Voxel Rendering Slots Max: " << _voxels.getMaxVoxels() / 1000.f << "K";
33733377 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);
33753379
33763380 voxelStats.str("");
33773381 voxelStats.precision(4);
33783382 voxelStats << "Drawn: " << _voxels.getVoxelsWritten() / 1000.f << "K " <<
33793383 "Abandoned: " << _voxels.getAbandonedVoxels() / 1000.f << "K ";
33803384 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);
33823386
33833387 // iterate all the current voxel stats, and list their sending modes, and total voxel counts
33843388 std::stringstream sendingMode("");
@@ -3417,7 +3421,7 @@ void Application::displayStats() { · 32 unmodified lines
34173421 sendingMode << " <SCENE STABLE>";
34183422 }
34193423 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);
34213425
34223426 // Incoming packets
34233427 voxelStats.str("");
@@ -3439,7 +3443,7 @@ void Application::displayStats() { · 15 unmodified lines
34393443 }
34403444 }
34413445 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);
34433447
34443448 statsVerticalOffset += PELS_PER_LINE;
34453449
@@ -3451,14 +3455,14 @@ void Application::displayStats() { · 5 unmodified lines
34513455 voxelStats.str("");
34523456 voxelStats << "Server voxels: " << serversTotalString.toLocal8Bit().constData();
34533457 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);
34553459
34563460 voxelStats.str("");
34573461 voxelStats <<
34583462 "Internal: " << serversInternalString.toLocal8Bit().constData() << " " <<
34593463 "Leaves: " << serversLeavesString.toLocal8Bit().constData() << "";
34603464 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);
34623466
34633467 unsigned long localTotal = VoxelTreeElement::getNodeCount();
34643468 unsigned long localInternal = VoxelTreeElement::getInternalNodeCount();
@@ -3471,14 +3475,14 @@ void Application::displayStats() { · 6 unmodified lines
34713475 voxelStats.str("");
34723476 voxelStats << "Local voxels: " << localTotalString.toLocal8Bit().constData();
34733477 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);
34753479
34763480 voxelStats.str("");
34773481 voxelStats <<
34783482 "Internal: " << localInternalString.toLocal8Bit().constData() << " " <<
34793483 "Leaves: " << localLeavesString.toLocal8Bit().constData() << "";
34803484 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);
34823486 }
34833487
34843488 void 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