From 023cd887cebb52cd05a345afdbaccec2fc665f26 Mon Sep 17 00:00:00 2001 From: rachytski Date: Tue, 8 Mar 2011 22:49:59 +0200 Subject: [PATCH] default clear color is now (187, 187, 187, 255). color was chosen to be equal to (11, 11, 11, 15) in 4bpp format. --- map/drawer_yg.hpp | 2 +- map/framework.hpp | 12 ++---------- yg/geometry_batcher.hpp | 2 +- yg/renderer.hpp | 2 +- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/map/drawer_yg.hpp b/map/drawer_yg.hpp index 3f5c726dd2..e1167513a7 100644 --- a/map/drawer_yg.hpp +++ b/map/drawer_yg.hpp @@ -103,7 +103,7 @@ public: void beginFrame(); void endFrame(); - void clear(yg::Color const & c = yg::Color(192, 192, 192, 255), bool clearRT = true, float depth = 1.0f, bool clearDepth = true); + void clear(yg::Color const & c = yg::Color(187, 187, 187, 255), bool clearRT = true, float depth = 1.0f, bool clearDepth = true); void onSize(int w, int h); diff --git a/map/framework.hpp b/map/framework.hpp index 9219ab5684..7f74e4e851 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -409,7 +409,7 @@ public: m_currentBenchmark++; e->drawer()->screen()->beginFrame(); - e->drawer()->screen()->clear(/*yg::Color(255, 0, 0, 255)*/); + e->drawer()->screen()->clear(); m2::PointD ptShift = m_renderQueue.renderState().coordSystemShift(false); @@ -423,15 +423,7 @@ public: pDrawer->screen()->blit(m_renderQueue.renderState().m_actualTarget, m_renderQueue.renderState().m_actualScreen, - currentScreen, - yg::Color(0, 255, 0, 255), - m2::RectI(0, 0, - m_renderQueue.renderState().m_actualTarget->width(), - m_renderQueue.renderState().m_actualTarget->height()), - m2::RectU(0, 0, - m_renderQueue.renderState().m_actualTarget->width(), - m_renderQueue.renderState().m_actualTarget->height())); - + currentScreen); m_informationDisplay.doDraw(pDrawer); diff --git a/yg/geometry_batcher.hpp b/yg/geometry_batcher.hpp index 4f1f9cc7d6..f664c28b73 100644 --- a/yg/geometry_batcher.hpp +++ b/yg/geometry_batcher.hpp @@ -113,7 +113,7 @@ namespace yg void enableClipRect(bool flag); void setClipRect(m2::RectI const & rect); - void clear(yg::Color const & c = yg::Color(192, 192, 192, 255), bool clearRT = true, float depth = 1.0, bool clearDepth = true); + void clear(yg::Color const & c = yg::Color(187, 187, 187, 255), bool clearRT = true, float depth = 1.0, bool clearDepth = true); /// @} diff --git a/yg/renderer.hpp b/yg/renderer.hpp index 70859cf0a2..d2661bc888 100644 --- a/yg/renderer.hpp +++ b/yg/renderer.hpp @@ -75,7 +75,7 @@ namespace yg /// @warning this function respects the clipping rect set and enabled(!) /// by the setClipRect/enableClipRect. Whether the clipping is /// not enabled - the entire currently bound render surface is used. - void clear(yg::Color const & c = yg::Color(192, 192, 192, 255), bool clearRT = true, float depth = 1.0, bool clearDepth = true); + void clear(yg::Color const & c = yg::Color(187, 187, 187, 255), bool clearRT = true, float depth = 1.0, bool clearDepth = true); void onSize(unsigned width, unsigned height);