History

Merge pull request #2869 from huffman/19630

Code Review for Job #19630

Philip Rosedale committed 12 years ago

Commit d54ff7a2 parents 18251d7 cc952f96 files · +317 −1Browse files

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

Unified · Split

interface/src/Application.cpp+5−0
@@ -170,6 +170,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 169 unmodified lines
170 _packetsPerSecond(0),170 _packetsPerSecond(0),
171 _bytesPerSecond(0),171 _bytesPerSecond(0),
172 _previousScriptLocation(),172 _previousScriptLocation(),
173 _nodeBoundsDisplay(this),
173 _runningScriptsWidget(new RunningScriptsWidget(_window)),174 _runningScriptsWidget(new RunningScriptsWidget(_window)),
174 _runningScriptsWidgetWasVisible(false)175 _runningScriptsWidgetWasVisible(false)
175{176{
@@ -2527,6 +2528,9 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 2351 unmodified lines
2527 2528
2528 // restore default, white specular2529 // restore default, white specular
2529 glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR);2530 glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR);
2531
2532 _nodeBoundsDisplay.draw();
2533
2530 }2534 }
2531 2535
2532 bool mirrorMode = (whichCamera.getInterpolatedMode() == CAMERA_MODE_MIRROR);2536 bool mirrorMode = (whichCamera.getInterpolatedMode() == CAMERA_MODE_MIRROR);
@@ -2760,6 +2764,7 @@ void Application::displayOverlay() { · 227 unmodified lines
2760 ? 80 : 20;2764 ? 80 : 20;
2761 drawText(_glWidget->width() - 100, _glWidget->height() - timerBottom, 0.30f, 0.0f, 0, frameTimer, WHITE_TEXT);2765 drawText(_glWidget->width() - 100, _glWidget->height() - timerBottom, 0.30f, 0.0f, 0, frameTimer, WHITE_TEXT);
2762 }2766 }
2767 _nodeBoundsDisplay.drawOverlay();
2763 2768
2764 // give external parties a change to hook in2769 // give external parties a change to hook in
2765 emit renderingOverlay();2770 emit renderingOverlay();

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