Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-29 14:10:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

repair bad merge

Browse source
This commit is contained in:
ZappoMan 2013-08-14 13:20:22 -07:00
parent 4477289501
commit a43615e9dc
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -2914,6 +2914,9 @@ void Application::displaySide(Camera& whichCamera) {
// Setup 3D lights (after the camera transform, so that they are positioned in world space) // Setup 3D lights (after the camera transform, so that they are positioned in world space)
setupWorldLight(whichCamera); setupWorldLight(whichCamera);
// prepare the glow effect
_glowEffect.prepare();
if (_renderStarsOn->isChecked()) { if (_renderStarsOn->isChecked()) {
if (!_stars.getFileLoaded()) { if (!_stars.getFileLoaded()) {
_stars.readInput(STAR_FILE, STAR_CACHE_FILE, 0); _stars.readInput(STAR_FILE, STAR_CACHE_FILE, 0);
@ -3042,6 +3045,7 @@ void Application::displaySide(Camera& whichCamera) {
_myAvatar.getHead().setLookAtPosition(_myCamera.getPosition()); _myAvatar.getHead().setLookAtPosition(_myCamera.getPosition());
} }
_myAvatar.render(_lookingInMirror->isChecked(), _renderAvatarBalls->isChecked()); _myAvatar.render(_lookingInMirror->isChecked(), _renderAvatarBalls->isChecked());
_myAvatar.setDisplayingLookatVectors(_renderLookatOn->isChecked()); _myAvatar.setDisplayingLookatVectors(_renderLookatOn->isChecked());
if (_renderLookatIndicatorOn->isChecked() && _isLookingAtOtherAvatar) { if (_renderLookatIndicatorOn->isChecked() && _isLookingAtOtherAvatar) {
@ -3076,6 +3080,9 @@ void Application::displaySide(Camera& whichCamera) {
} }
renderFollowIndicator(); renderFollowIndicator();
// render the glow effect
_glowEffect.render();
} }
void Application::displayOverlay() { void Application::displayOverlay() {