diff options
author | rachytski <siarhei.rachytski@gmail.com> | 2012-11-09 17:40:13 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:46:45 +0300 |
commit | bcc94857d7b9f092148dea4a2a9b90c592f43a75 (patch) | |
tree | 7bf4c63e9b28fd0b00dfdcffcada9bb2c637b935 /qt | |
parent | 771f47410fa67f271cf425a2b1a9a0ed6119b4ea (diff) |
renamed yg into graphics.
Diffstat (limited to 'qt')
-rw-r--r-- | qt/draw_widget.cpp | 12 | ||||
-rw-r--r-- | qt/qt.pro | 2 | ||||
-rw-r--r-- | qt/widgets.cpp | 12 | ||||
-rw-r--r-- | qt/widgets.hpp | 22 |
4 files changed, 24 insertions, 24 deletions
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index dbb5eca908..3da8b3b89a 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -6,7 +6,7 @@ #include "../gui/controller.hpp" -#include "../yg/internal/opengl.hpp" +#include "../graphics/internal/opengl.hpp" #include "../platform/settings.hpp" #include "../platform/platform.hpp" @@ -217,10 +217,10 @@ namespace qt shared_ptr<qt::gl::RenderContext> primaryRC(new qt::gl::RenderContext(this)); - yg::ResourceManager::Params rmParams; - rmParams.m_rtFormat = yg::Data8Bpp; - rmParams.m_texFormat = yg::Data8Bpp; - rmParams.m_texRtFormat = yg::Data4Bpp; + graphics::ResourceManager::Params rmParams; + rmParams.m_rtFormat = graphics::Data8Bpp; + rmParams.m_texFormat = graphics::Data8Bpp; + rmParams.m_texRtFormat = graphics::Data4Bpp; rmParams.m_videoMemoryLimit = GetPlatform().VideoMemoryLimit(); RenderPolicy::Params rpParams; @@ -239,7 +239,7 @@ namespace qt { m_framework->SetRenderPolicy(CreateRenderPolicy(rpParams)); } - catch (yg::gl::platform_unsupported const & e) + catch (graphics::gl::platform_unsupported const & e) { LOG(LERROR, ("OpenGL platform is unsupported, reason: ", e.what())); /// @todo Show "Please Update Drivers" dialog and close the program. @@ -1,6 +1,6 @@ # Main application in qt. ROOT_DIR = .. -DEPENDENCIES = map gui search storage indexer yg platform anim geometry coding base \ +DEPENDENCIES = map gui search storage indexer graphics platform anim geometry coding base \ bzip2 freetype expat fribidi tomcrypt jansson version protobuf include($$ROOT_DIR/common.pri) diff --git a/qt/widgets.cpp b/qt/widgets.cpp index 3e3c82ad20..903663b2bf 100644 --- a/qt/widgets.cpp +++ b/qt/widgets.cpp @@ -2,17 +2,17 @@ #include "../qt_tstfrm/widgets_impl.hpp" -#include "../map/drawer_yg.hpp" +#include "../map/drawer.hpp" #include "../platform/platform.hpp" -#include "../yg/rendercontext.hpp" -#include "../yg/internal/opengl.hpp" +#include "../graphics/rendercontext.hpp" +#include "../graphics/internal/opengl.hpp" namespace qt { - template class GLDrawWidgetT<DrawerYG>; + template class GLDrawWidgetT<Drawer>; GLDrawWidget::GLDrawWidget(QWidget * pParent) : base_type(pParent) @@ -35,12 +35,12 @@ namespace qt { } - shared_ptr<yg::gl::RenderContext> const & GLDrawWidget::renderContext() + shared_ptr<graphics::gl::RenderContext> const & GLDrawWidget::renderContext() { return m_renderContext; } - shared_ptr<yg::ResourceManager> const & GLDrawWidget::resourceManager() + shared_ptr<graphics::ResourceManager> const & GLDrawWidget::resourceManager() { return m_resourceManager; } diff --git a/qt/widgets.hpp b/qt/widgets.hpp index 505cac429b..e48d52c112 100644 --- a/qt/widgets.hpp +++ b/qt/widgets.hpp @@ -2,12 +2,12 @@ //#include "../qt_tstfrm/widgets.hpp" /*#include "../map/qgl_render_context.hpp" -#include "../yg/resource_manager.hpp" +#include "../graphics/resource_manager.hpp" -class DrawerYG; +class Drawer; class VideoTimer; -namespace yg +namespace graphics { namespace gl { @@ -17,25 +17,25 @@ namespace yg namespace qt { - /// Widget uses yg for drawing. - class GLDrawWidget : public GLDrawWidgetT<DrawerYG> + /// Widget uses our graphics library for drawing. + class GLDrawWidget : public GLDrawWidgetT<Drawer> { - typedef GLDrawWidgetT<DrawerYG> base_type; - shared_ptr<yg::gl::RenderContext> m_renderContext; + typedef GLDrawWidgetT<Drawer> base_type; + shared_ptr<graphics::gl::RenderContext> m_renderContext; protected: - shared_ptr<yg::ResourceManager> m_resourceManager; + shared_ptr<graphics::ResourceManager> m_resourceManager; public: - typedef DrawerYG drawer_t; + typedef Drawer drawer_t; GLDrawWidget(QWidget * pParent); ~GLDrawWidget(); - shared_ptr<yg::gl::RenderContext> const & renderContext(); - shared_ptr<yg::ResourceManager> const & resourceManager(); + shared_ptr<graphics::gl::RenderContext> const & renderContext(); + shared_ptr<graphics::ResourceManager> const & resourceManager(); shared_ptr<drawer_t> const & GetDrawer() const; |