diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index 9d6683a8c6..a4eb71b78f 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -5,11 +5,6 @@ #include "drape_frontend/visual_params.hpp" #include "drape_frontend/user_mark_shapes.hpp" -#ifdef USE_TEXTURE_IN_3D -#include "drape_frontend/framebuffer.hpp" -#include "drape_frontend/renderer3d.hpp" -#endif - #include "drape/debug_rect_renderer.hpp" #include "drape/shader_def.hpp" #include "drape/support_manager.hpp" @@ -50,10 +45,6 @@ FrontendRenderer::FrontendRenderer(Params const & params) , m_overlayTree(new dp::OverlayTree()) , m_enable3dInNavigation(false) , m_isBillboardRenderPass(false) -#ifdef USE_TEXTURE_IN_3D - , m_framebuffer(new Framebuffer()) - , m_renderer3d(new Renderer3d()) -#endif , m_viewport(params.m_viewport) , m_userEventStream(params.m_isCountryLoadedFn) , m_modelViewChangedFn(params.m_modelViewChangedFn) @@ -541,29 +532,6 @@ void FrontendRenderer::OnResize(ScreenBase const & screen) m_contextFactory->getDrawContext()->resize(viewportRect.SizeX(), viewportRect.SizeY()); RefreshProjection(screen); RefreshPivotTransform(screen); - -#ifdef USE_TEXTURE_IN_3D - if (screen.isPerspective()) - { - int width = screen.GetWidth(); - int height = screen.GetHeight(); - int const maxSide = max(width, height); - int const maxTextureSize = m_framebuffer->GetMaxSize(); - if (maxSide > maxTextureSize) - { - double const scale = maxTextureSize / static_cast(maxSide); - width = static_cast(width * scale); - height = static_cast(height * scale); - LOG(LINFO, ("Max texture size:", maxTextureSize, ", expanded screen size:", maxSide, - ", scale:", scale)); - } - m_viewport.SetViewport(0, 0, width, height); - - m_renderer3d->SetSize(viewportRect.SizeX(), viewportRect.SizeY()); - m_framebuffer->SetDefaultContext(m_contextFactory->getDrawContext()); - m_framebuffer->SetSize(width, height); - } -#endif } void FrontendRenderer::AddToRenderGroup(vector> & groups, @@ -719,13 +687,6 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView) #endif bool const isPerspective = modelView.isPerspective(); -#ifdef USE_TEXTURE_IN_3D - if (isPerspective) - { - m_framebuffer->SetDefaultContext(m_contextFactory->getDrawContext()); - m_framebuffer->Enable(); - } -#endif RenderGroupComparator comparator; sort(m_renderGroups.begin(), m_renderGroups.end(), bind(&RenderGroupComparator::operator (), &comparator, _1, _2)); @@ -834,11 +795,6 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView) if (isPerspective) { -#ifdef USE_TEXTURE_IN_3D - m_framebuffer->Disable(); - m_renderer3d->Render(modelView, m_framebuffer->GetTextureId(), make_ref(m_gpuProgramManager)); -#endif - m_isBillboardRenderPass = true; // TODO: Try to avoid code duplicate in billboard render pass. diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp index 0858e5968d..849a232ab2 100755 --- a/drape_frontend/frontend_renderer.hpp +++ b/drape_frontend/frontend_renderer.hpp @@ -36,8 +36,6 @@ #include "std/function.hpp" #include "std/map.hpp" -//#define USE_TEXTURE_IN_3D - namespace dp { class RenderBucket; @@ -49,11 +47,6 @@ namespace df class SelectionShape; -#ifdef USE_TEXTURE_IN_3D -class Framebuffer; -class Renderer3d; -#endif - struct TapInfo { m2::PointD const m_pixelPoint; @@ -237,10 +230,6 @@ private: bool m_enable3dInNavigation; bool m_isBillboardRenderPass; -#ifdef USE_TEXTURE_IN_3D - drape_ptr m_framebuffer; - drape_ptr m_renderer3d; -#endif Viewport m_viewport; UserEventStream m_userEventStream;