From 2899c21804f296cfa4981f2090acc3bd7538144f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=93=D1=80=D0=B5=D1=87=D1=83?= =?UTF-8?q?=D1=85=D0=B8=D0=BD?= Date: Tue, 22 Dec 2015 11:18:16 +0300 Subject: [PATCH] [omim] Removed obsolete files. --- iphone/Maps/Classes/RenderBuffer.hpp | 39 ----------- iphone/Maps/Classes/RenderBuffer.mm | 98 --------------------------- iphone/Maps/Classes/RenderContext.hpp | 32 --------- iphone/Maps/Classes/RenderContext.mm | 39 ----------- qt/widgets.hpp | 45 ------------ 5 files changed, 253 deletions(-) delete mode 100644 iphone/Maps/Classes/RenderBuffer.hpp delete mode 100644 iphone/Maps/Classes/RenderBuffer.mm delete mode 100644 iphone/Maps/Classes/RenderContext.hpp delete mode 100644 iphone/Maps/Classes/RenderContext.mm delete mode 100644 qt/widgets.hpp diff --git a/iphone/Maps/Classes/RenderBuffer.hpp b/iphone/Maps/Classes/RenderBuffer.hpp deleted file mode 100644 index 8c43178752..0000000000 --- a/iphone/Maps/Classes/RenderBuffer.hpp +++ /dev/null @@ -1,39 +0,0 @@ -#pragma once - -#include "RenderContext.hpp" -#include "std/shared_ptr.hpp" -#include "graphics/render_target.hpp" - -@class CAEAGLLayer; - -namespace iphone -{ - -class RenderBuffer : public graphics::RenderTarget -{ -private: - unsigned int m_id; - shared_ptr m_renderContext; - int m_width; - int m_height; - -public: - RenderBuffer(shared_ptr renderContext, CAEAGLLayer * layer); - RenderBuffer(shared_ptr renderContext, int width, int height); - ~RenderBuffer(); - - void makeCurrent(); - - unsigned int id() const; - - void present(); - - unsigned width() const; - unsigned height() const; - - void attachToFrameBuffer(); - void detachFromFrameBuffer(); - void coordMatrix(math::Matrix & m); -}; - -} diff --git a/iphone/Maps/Classes/RenderBuffer.mm b/iphone/Maps/Classes/RenderBuffer.mm deleted file mode 100644 index 8b02d36849..0000000000 --- a/iphone/Maps/Classes/RenderBuffer.mm +++ /dev/null @@ -1,98 +0,0 @@ -#import - -#include "RenderBuffer.hpp" -#include "graphics/opengl/opengl.hpp" -#include "graphics/coordinates.hpp" - -namespace iphone -{ - -RenderBuffer::RenderBuffer(shared_ptr renderContext, CAEAGLLayer * layer) - : m_renderContext(renderContext) -{ - OGLCHECK(glGenRenderbuffersOES(1, &m_id)); - makeCurrent(); - - BOOL res = [m_renderContext->getEAGLContext() renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:layer]; - - if (res == NO) - LOG(LINFO, ("renderbufferStorage:fromDrawable has failed!")); - - OGLCHECK(glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &m_width)); - OGLCHECK(glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &m_height)); -} - -RenderBuffer::RenderBuffer(shared_ptr renderContext, int width, int height) - : m_renderContext(renderContext) -{ - OGLCHECK(glGenRenderbuffersOES(1, &m_id)); - makeCurrent(); - - m_width = width; - m_height = height; - OGLCHECK(glRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_RGBA8_OES, m_width, m_height)); -} - -void RenderBuffer::makeCurrent() -{ - OGLCHECK(glBindRenderbufferOES(GL_RENDERBUFFER_OES, m_id)); -} - -RenderBuffer::~RenderBuffer() -{ - OGLCHECK(glDeleteRenderbuffersOES(1, &m_id)); -} - -unsigned int RenderBuffer::id() const -{ - return m_id; -} - -void RenderBuffer::present() -{ - makeCurrent(); - - const int maxTryCount = 100; - int tryCount = 0; - - while (!([m_renderContext->getEAGLContext() presentRenderbuffer:GL_RENDERBUFFER_OES]) - && (tryCount++ < maxTryCount)); - - if (tryCount == maxTryCount + 1) - NSLog(@"failed to present renderbuffer"); - else if (tryCount != 0) - NSLog(@"renderBuffer was presented from %d try", tryCount); -} - -unsigned RenderBuffer::width() const -{ - return m_width; -} - -unsigned RenderBuffer::height() const -{ - return m_height; -} - -void RenderBuffer::attachToFrameBuffer() -{ - OGLCHECK(glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, - GL_COLOR_ATTACHMENT0_OES, - GL_RENDERBUFFER_OES, - m_id)); -} - -void RenderBuffer::detachFromFrameBuffer() -{ - OGLCHECK(glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, - GL_COLOR_ATTACHMENT0_OES, - GL_RENDERBUFFER_OES, - 0)); -} - -void RenderBuffer::coordMatrix(math::Matrix & m) -{ - graphics::getOrthoMatrix(m, 0, width(), height(), 0, -graphics::maxDepth, graphics::maxDepth); -} - -} diff --git a/iphone/Maps/Classes/RenderContext.hpp b/iphone/Maps/Classes/RenderContext.hpp deleted file mode 100644 index 70125e7fac..0000000000 --- a/iphone/Maps/Classes/RenderContext.hpp +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "graphics/opengl/gl_render_context.hpp" -#include "std/shared_ptr.hpp" - - -namespace iphone -{ - class RenderContext : public graphics::gl::RenderContext - { - private: - /// Pointer to render context. - EAGLContext * m_context; - public: - /// Create rendering context. - RenderContext(); - /// Create shared render context. - RenderContext(RenderContext * renderContext); - /// Destroy render context - ~RenderContext(); - /// Make this rendering context current - void makeCurrent(); - /// create a shared render context - graphics::RenderContext * createShared(); - - EAGLContext * getEAGLContext(); - }; -} \ No newline at end of file diff --git a/iphone/Maps/Classes/RenderContext.mm b/iphone/Maps/Classes/RenderContext.mm deleted file mode 100644 index 11a5b91cda..0000000000 --- a/iphone/Maps/Classes/RenderContext.mm +++ /dev/null @@ -1,39 +0,0 @@ -#include "RenderContext.hpp" - -namespace iphone -{ - RenderContext::RenderContext() - { - m_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2]; - } - - RenderContext::RenderContext(RenderContext * renderContext) - { - m_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup:renderContext->m_context.sharegroup]; - } - - RenderContext::~RenderContext() - { - - } - - void RenderContext::makeCurrent() - { - [EAGLContext setCurrentContext:m_context]; - } - - graphics::RenderContext * RenderContext::createShared() - { - graphics::RenderContext * res = new RenderContext(this); - res->setResourceManager(resourceManager()); - return res; - } - - EAGLContext * RenderContext::getEAGLContext() - { - return m_context; - } -} - - - diff --git a/qt/widgets.hpp b/qt/widgets.hpp deleted file mode 100644 index 4ca77d0562..0000000000 --- a/qt/widgets.hpp +++ /dev/null @@ -1,45 +0,0 @@ -#pragma once - -//#include "../qt_tstfrm/widgets.hpp" -/*#include "../map/qgl_render_context.hpp" -#include "graphics/resource_manager.hpp" - -class Drawer; -class VideoTimer; - -namespace graphics -{ - namespace gl - { - class RenderContext; - } -} - -namespace qt -{ - /// Widget uses our graphics library for drawing. - class GLDrawWidget : public GLDrawWidgetT - { - - typedef GLDrawWidgetT base_type; - shared_ptr m_renderContext; - - protected: - - shared_ptr m_resourceManager; - - public: - typedef Drawer drawer_t; - - GLDrawWidget(QWidget * pParent); - ~GLDrawWidget(); - - shared_ptr const & renderContext(); - shared_ptr const & resourceManager(); - - shared_ptr const & GetDrawer() const; - - protected: - virtual void initializeGL(); - }; -}*/