Introducing gpu::State and using it in the Model rendering path and more...
Showing the changes to interface/src/Application.cpp (1 of 37 files). Show all
Unified · Split
| @@ -2750,7 +2750,7 @@ void Application::updateShadowMap() { · 2749 unmodified lines | ||
| 2750 | 2750 | |
| 2751 | 2751 | { |
| 2752 | 2752 | PerformanceTimer perfTimer("avatarManager"); |
| 2753 | − DependencyManager::get<AvatarManager>()->renderAvatars(Avatar::SHADOW_RENDER_MODE); | |
| 2753 | + DependencyManager::get<AvatarManager>()->renderAvatars(RenderArgs::SHADOW_RENDER_MODE); | |
| 2754 | 2754 | } |
| 2755 | 2755 | |
| 2756 | 2756 | { |
| @@ -2997,6 +2997,8 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 240 unmodified lines | ||
| 2997 | 2997 | "Application::displaySide() ... entities..."); |
| 2998 | 2998 | if (renderCollisionHulls) { |
| 2999 | 2999 | _entities.render(RenderArgs::DEBUG_RENDER_MODE, renderSide); |
| 3000 | + } else if (theCamera.getMode() == CAMERA_MODE_MIRROR) { | |
| 3001 | + _entities.render(RenderArgs::MIRROR_RENDER_MODE, renderSide); | |
| 3000 | 3002 | } else { |
| 3001 | 3003 | _entities.render(RenderArgs::DEFAULT_RENDER_MODE, renderSide); |
| 3002 | 3004 | } |
| @@ -3021,8 +3023,8 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 18 unmodified lines | ||
| 3021 | 3023 | |
| 3022 | 3024 | { |
| 3023 | 3025 | PerformanceTimer perfTimer("avatars"); |
| 3024 | − DependencyManager::get<AvatarManager>()->renderAvatars(mirrorMode ? Avatar::MIRROR_RENDER_MODE : Avatar::NORMAL_RENDER_MODE, | |
| 3025 | − false, selfAvatarOnly); | |
| 3026 | + DependencyManager::get<AvatarManager>()->renderAvatars(mirrorMode ? RenderArgs::MIRROR_RENDER_MODE : RenderArgs::NORMAL_RENDER_MODE, | |
| 3027 | + false, selfAvatarOnly); | |
| 3026 | 3028 | } |
| 3027 | 3029 | |
| 3028 | 3030 | { |
| @@ -3038,7 +3040,7 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 9 unmodified lines | ||
| 3038 | 3040 | |
| 3039 | 3041 | { |
| 3040 | 3042 | PerformanceTimer perfTimer("avatarsPostLighting"); |
| 3041 | − DependencyManager::get<AvatarManager>()->renderAvatars(mirrorMode ? Avatar::MIRROR_RENDER_MODE : Avatar::NORMAL_RENDER_MODE, | |
| 3043 | + DependencyManager::get<AvatarManager>()->renderAvatars(mirrorMode ? RenderArgs::MIRROR_RENDER_MODE : RenderArgs::NORMAL_RENDER_MODE, | |
| 3042 | 3044 | true, selfAvatarOnly); |
| 3043 | 3045 | } |
| 3044 | 3046 | |