History

repair bad merge

ZappoMan committed 13 years ago

Commit a43615e1 parent 44772891 file · +7 −0Browse files

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

Unified · Split

interface/src/Application.cpp+7−0
@@ -2914,6 +2914,9 @@ void Application::displaySide(Camera& whichCamera) { · 2913 unmodified lines
2914 // Setup 3D lights (after the camera transform, so that they are positioned in world space)2914 // Setup 3D lights (after the camera transform, so that they are positioned in world space)
2915 setupWorldLight(whichCamera);2915 setupWorldLight(whichCamera);
2916 2916
2917 // prepare the glow effect
2918 _glowEffect.prepare();
2919
2917 if (_renderStarsOn->isChecked()) {2920 if (_renderStarsOn->isChecked()) {
2918 if (!_stars.getFileLoaded()) {2921 if (!_stars.getFileLoaded()) {
2919 _stars.readInput(STAR_FILE, STAR_CACHE_FILE, 0);2922 _stars.readInput(STAR_FILE, STAR_CACHE_FILE, 0);
@@ -3042,6 +3045,7 @@ void Application::displaySide(Camera& whichCamera) { · 122 unmodified lines
3042 _myAvatar.getHead().setLookAtPosition(_myCamera.getPosition());3045 _myAvatar.getHead().setLookAtPosition(_myCamera.getPosition());
3043 }3046 }
3044 _myAvatar.render(_lookingInMirror->isChecked(), _renderAvatarBalls->isChecked());3047 _myAvatar.render(_lookingInMirror->isChecked(), _renderAvatarBalls->isChecked());
3048
3045 _myAvatar.setDisplayingLookatVectors(_renderLookatOn->isChecked());3049 _myAvatar.setDisplayingLookatVectors(_renderLookatOn->isChecked());
3046 3050
3047 if (_renderLookatIndicatorOn->isChecked() && _isLookingAtOtherAvatar) {3051 if (_renderLookatIndicatorOn->isChecked() && _isLookingAtOtherAvatar) {
@@ -3076,6 +3080,9 @@ void Application::displaySide(Camera& whichCamera) { · 28 unmodified lines
3076 }3080 }
3077 3081
3078 renderFollowIndicator();3082 renderFollowIndicator();
3083
3084 // render the glow effect
3085 _glowEffect.render();
3079}3086}
3080 3087
3081void Application::displayOverlay() {3088void Application::displayOverlay() {

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