diff options
| author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-01-29 14:06:10 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:20:41 +0300 |
| commit | f4de5841f7bbfa1773ecd824d366a8bea49515a9 (patch) | |
| tree | 16ee18c3f36b549e15fbf25c3e2cdfb2b5628b00 /drape/overlay_handle.hpp | |
| parent | 2317f55b5a9460654f0916f6b85d7fa23837d3be (diff) | |
Improved displacement algorithm and overlays rendering
Diffstat (limited to 'drape/overlay_handle.hpp')
| -rw-r--r-- | drape/overlay_handle.hpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/drape/overlay_handle.hpp b/drape/overlay_handle.hpp index 0da93b7e5f..0553891a60 100644 --- a/drape/overlay_handle.hpp +++ b/drape/overlay_handle.hpp @@ -14,11 +14,11 @@ #include "base/buffer_vector.hpp" -#include "std/chrono.hpp" - namespace dp { +//#define DEBUG_OVERLAYS_OUTPUT + enum OverlayRank { OverlayRank0 = 0, @@ -90,7 +90,9 @@ public: int GetOverlayRank() const { return m_overlayRank; } void SetOverlayRank(int overlayRank) { m_overlayRank = overlayRank; } - bool IsMinVisibilityTimeUp() const; +#ifdef DEBUG_OVERLAYS_OUTPUT + virtual string GetOverlayDebugInfo() { return ""; } +#endif protected: FeatureID const m_id; @@ -101,8 +103,6 @@ protected: double m_extendingSize; double m_pivotZ; - steady_clock::time_point m_visibilityTimestamp; - typedef pair<BindingInfo, MutateRegion> TOffsetNode; TOffsetNode const & GetOffsetNode(uint8_t bufferID) const; @@ -137,14 +137,23 @@ public: m2::PointD const & gbPivot, m2::PointD const & pxSize, uint64_t priority, + string const & debugStr, bool isBillboard = false); virtual m2::RectD GetPixelRect(ScreenBase const & screen, bool perspective) const override; virtual void GetPixelShape(ScreenBase const & screen, Rects & rects, bool perspective) const override; +#ifdef DEBUG_OVERLAYS_OUTPUT + virtual string GetOverlayDebugInfo() override; +#endif + private: m2::PointD m_gbPivot; m2::PointD m_pxHalfSize; + +#ifdef DEBUG_OVERLAYS_OUTPUT + string m_debugStr; +#endif }; uint64_t CalculateOverlayPriority(int minZoomLevel, uint8_t rank, float depth); |