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
170170 _packetsPerSecond(0),
171171 _bytesPerSecond(0),
172172 _previousScriptLocation(),
173+ _nodeBoundsDisplay(this),
173174 _runningScriptsWidget(new RunningScriptsWidget(_window)),
174175 _runningScriptsWidgetWasVisible(false)
175176 {
@@ -2527,6 +2528,9 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 2351 unmodified lines
25272528
25282529 // restore default, white specular
25292530 glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR);
2531+
2532+ _nodeBoundsDisplay.draw();
2533+
25302534 }
25312535
25322536 bool mirrorMode = (whichCamera.getInterpolatedMode() == CAMERA_MODE_MIRROR);
@@ -2760,6 +2764,7 @@ void Application::displayOverlay() { · 227 unmodified lines
27602764 ? 80 : 20;
27612765 drawText(_glWidget->width() - 100, _glWidget->height() - timerBottom, 0.30f, 0.0f, 0, frameTimer, WHITE_TEXT);
27622766 }
2767+ _nodeBoundsDisplay.drawOverlay();
27632768
27642769 // give external parties a change to hook in
27652770 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