diff --git a/.gitignore b/.gitignore index dd35815332..d20445b51b 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,8 @@ iphone/Maps/Maps.xcodeproj/*.pbxuser iphone/Maps/Maps.xcodeproj/*.perspectivev3 data/*.idx data/*.dat +data/*.dat.geom +data/*.dat.trg data/*.map data/*.osm data/*.bz2 diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm index a901bbac8b..f947969772 100644 --- a/iphone/Maps/Classes/EAGLView.mm +++ b/iphone/Maps/Classes/EAGLView.mm @@ -89,7 +89,8 @@ drawer = shared_ptr(new DrawerYG(resourceManager, GetPlatform().SkinName(), !GetPlatform().IsMultiSampled())); drawer->setFrameBuffer(frameBuffer); - frameBuffer->setRenderTarget(renderBuffer); +// frameBuffer->onSize(renderBuffer->width(), renderBuffer->height()); +// frameBuffer->setRenderTarget(renderBuffer); windowHandle = shared_ptr(new iphone::WindowHandle(self)); windowHandle->setDrawer(drawer); diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 6c506a623a..9c0289ec02 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -71,6 +71,8 @@ typedef FrameWork frame m_framework->initializeGL([(EAGLView*)self.view renderContext], resourceManager); + // to perform a proper resize + [(EAGLView*)self.view layoutSubviews]; m_framework->ShowAll(); } diff --git a/map/render_queue_routine.cpp b/map/render_queue_routine.cpp index 010b7e20f0..dd5ed5fe55 100644 --- a/map/render_queue_routine.cpp +++ b/map/render_queue_routine.cpp @@ -71,6 +71,7 @@ void RenderQueueRoutine::processResize(ScreenBase const & /*frameScreen*/) } m_threadDrawer->onSize(texW, texH); + m_threadDrawer->screen()->frameBuffer()->onSize(texW, texH); m_renderState->m_actualTarget.reset(); m_renderState->m_actualTarget = make_shared_ptr(new yg::gl::RawRGBA8Texture(texW, texH)); diff --git a/yg/framebuffer.cpp b/yg/framebuffer.cpp index 5bb981078b..23f0206b1a 100644 --- a/yg/framebuffer.cpp +++ b/yg/framebuffer.cpp @@ -40,7 +40,7 @@ namespace yg frameBufferStack.pop_back(); } - FrameBuffer::FrameBuffer(bool defaultFB /*= false*/) + FrameBuffer::FrameBuffer(bool defaultFB /*= false*/) : m_width(0), m_height(0) { if (defaultFB) m_id = 0; diff --git a/yg/skin_page.cpp b/yg/skin_page.cpp index 38001910c6..1bb35df262 100644 --- a/yg/skin_page.cpp +++ b/yg/skin_page.cpp @@ -81,7 +81,6 @@ namespace yg m_isDynamic(true), m_pageID(pageID) { - static_cast(m_texture.get())->randomize(/*yg::Color(255, 0, 0, 255)*/); m_packer = m2::Packer(m_texture->width(), m_texture->height(), 0x00FFFFFF - 1), /// clear handles will be called only upon handles overflow, /// as the texture overflow is processed separately