History

Move various avatar render bits to post-lighting section.

Andrzej Kapolka committed 12 years ago

Commit 8d3eef71 parent 446c2197 files · +40 −30Browse files

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

Unified · Split

interface/src/Application.cpp+8−1
@@ -2910,7 +2910,8 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 2909 unmodified lines
2910 bool mirrorMode = (whichCamera.getInterpolatedMode() == CAMERA_MODE_MIRROR);2910 bool mirrorMode = (whichCamera.getInterpolatedMode() == CAMERA_MODE_MIRROR);
2911 {2911 {
2912 PerformanceTimer perfTimer("avatars");2912 PerformanceTimer perfTimer("avatars");
2913 _avatarManager.renderAvatars(mirrorMode ? Avatar::MIRROR_RENDER_MODE : Avatar::NORMAL_RENDER_MODE, selfAvatarOnly); 2913 _avatarManager.renderAvatars(mirrorMode ? Avatar::MIRROR_RENDER_MODE : Avatar::NORMAL_RENDER_MODE,
2914 false, selfAvatarOnly);
2914 }2915 }
2915 2916
2916 {2917 {
@@ -2918,6 +2919,12 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 1 unmodified line
2918 _deferredLightingEffect.render();2919 _deferredLightingEffect.render();
2919 }2920 }
2920 2921
2922 {
2923 PerformanceTimer perfTimer("avatarsPostLighting");
2924 _avatarManager.renderAvatars(mirrorMode ? Avatar::MIRROR_RENDER_MODE : Avatar::NORMAL_RENDER_MODE,
2925 true, selfAvatarOnly);
2926 }
2927
2921 //Render the sixense lasers2928 //Render the sixense lasers
2922 if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) {2929 if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) {
2923 _myAvatar->renderLaserPointers();2930 _myAvatar->renderLaserPointers();

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