diff options
| author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-03-02 18:07:17 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:52:56 +0300 |
| commit | 45426f3f16be2187f283e33ada9a1404ef9280ef (patch) | |
| tree | 68314be2a45c7459fbabef536aa2a17379cc8581 /drape | |
| parent | cf0b75e26ac9114df9334d2b5a06a9da360e36c7 (diff) | |
Removed unused code
Diffstat (limited to 'drape')
| -rw-r--r-- | drape/batcher.hpp | 4 | ||||
| -rw-r--r-- | drape/drape_common.pri | 1 | ||||
| -rw-r--r-- | drape/feature_geometry_decl.hpp | 28 | ||||
| -rw-r--r-- | drape/render_bucket.hpp | 1 |
4 files changed, 0 insertions, 34 deletions
diff --git a/drape/batcher.hpp b/drape/batcher.hpp index 69466d7670..1326de0372 100644 --- a/drape/batcher.hpp +++ b/drape/batcher.hpp @@ -1,7 +1,6 @@ #pragma once #include "drape/attribute_provider.hpp" -#include "drape/feature_geometry_decl.hpp" #include "drape/glstate.hpp" #include "drape/overlay_handle.hpp" #include "drape/pointers.hpp" @@ -50,9 +49,6 @@ public: void StartSession(TFlushFn const & flusher); void EndSession(); - // Begin/end processing of feature with FeatureGeometryId in the batcher. - void StartFeatureRecord(FeatureGeometryId feature, m2::RectD const & limitRect); - void EndFeatureRecord(); void SetFeatureMinZoom(int minZoom); private: diff --git a/drape/drape_common.pri b/drape/drape_common.pri index 109e217fab..7cb8e4da16 100644 --- a/drape/drape_common.pri +++ b/drape/drape_common.pri @@ -67,7 +67,6 @@ HEADERS += \ $$DRAPE_DIR/depth_constants.hpp \ $$DRAPE_DIR/drape_global.hpp \ $$DRAPE_DIR/dynamic_texture.hpp \ - $$DRAPE_DIR/feature_geometry_decl.hpp \ $$DRAPE_DIR/font_texture.hpp \ $$DRAPE_DIR/fribidi.hpp \ $$DRAPE_DIR/glconstants.hpp \ diff --git a/drape/feature_geometry_decl.hpp b/drape/feature_geometry_decl.hpp deleted file mode 100644 index 7299ac3ec7..0000000000 --- a/drape/feature_geometry_decl.hpp +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "indexer/feature_decl.hpp" - -namespace dp -{ - -struct FeatureGeometryId -{ - FeatureID m_featureId; - uint32_t m_shapeInd = 0; - - FeatureGeometryId() = default; - FeatureGeometryId(FeatureID feature, uint32_t shapeInd) - : m_featureId(feature) - , m_shapeInd(shapeInd) - {} - - bool IsValid() const { return m_featureId.IsValid(); } - bool operator<(FeatureGeometryId const & r) const - { - if (m_featureId != r.m_featureId) - return m_featureId < r.m_featureId; - return m_shapeInd < r.m_shapeInd; - } -}; - -} // namespace dp diff --git a/drape/render_bucket.hpp b/drape/render_bucket.hpp index d4688b4937..5669603a1d 100644 --- a/drape/render_bucket.hpp +++ b/drape/render_bucket.hpp @@ -1,6 +1,5 @@ #pragma once -#include "drape/feature_geometry_decl.hpp" #include "drape/pointers.hpp" #include "std/function.hpp" |