diff options
author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2017-05-16 14:42:32 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-16 14:42:32 +0300 |
commit | d2f79bd2c7004af2d1459e8d5b7748763f241a54 (patch) | |
tree | 64300bccb750e59f7c3a05800eafcd5c3b3f89cb /drape_frontend/drape_engine.hpp | |
parent | aa6703383e8d4c2ff8445e8b3c27728846cdab4b (diff) | |
parent | 086d6f9cf247cea07cff6bc33d5567dc7c64806b (diff) |
Merge pull request #6040 from rokuz/es3-supportbeta-810
Added OpenGL ES3 support
Diffstat (limited to 'drape_frontend/drape_engine.hpp')
-rw-r--r-- | drape_frontend/drape_engine.hpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp index 50510f95cf..64e9b5924e 100644 --- a/drape_frontend/drape_engine.hpp +++ b/drape_frontend/drape_engine.hpp @@ -13,6 +13,7 @@ #include "drape/pointers.hpp" #include "drape/texture_manager.hpp" +#include "drape/viewport.hpp" #include "traffic/traffic_info.hpp" @@ -27,23 +28,25 @@ #include "std/map.hpp" #include "std/mutex.hpp" -namespace dp { class OGLContextFactory; } +namespace dp +{ +class OGLContextFactory; +} // namespace dp namespace df { - class UserMarksProvider; class MapDataProvider; -class Viewport; class DrapeEngine { public: struct Params { - Params(ref_ptr<dp::OGLContextFactory> factory, + Params(dp::ApiVersion apiVersion, + ref_ptr<dp::OGLContextFactory> factory, ref_ptr<StringsBundle> stringBundle, - Viewport const & viewport, + dp::Viewport const & viewport, MapDataProvider const & model, Hints const & hints, double vs, @@ -60,7 +63,8 @@ public: bool isAutozoomEnabled, bool simplifiedTrafficColors, OverlaysShowStatsCallback && overlaysShowStatsCallback) - : m_factory(factory) + : m_apiVersion(apiVersion) + , m_factory(factory) , m_stringsBundle(stringBundle) , m_viewport(viewport) , m_model(model) @@ -81,9 +85,10 @@ public: , m_overlaysShowStatsCallback(move(overlaysShowStatsCallback)) {} + dp::ApiVersion m_apiVersion; ref_ptr<dp::OGLContextFactory> m_factory; ref_ptr<StringsBundle> m_stringsBundle; - Viewport m_viewport; + dp::Viewport m_viewport; MapDataProvider m_model; Hints m_hints; double m_vs; @@ -216,7 +221,7 @@ private: drape_ptr<RequestedTiles> m_requestedTiles; location::TMyPositionModeChanged m_myPositionModeChanged; - Viewport m_viewport; + dp::Viewport m_viewport; TModelViewListenerFn m_modelViewChanged; TUserPositionChangedFn m_userPositionChanged; |