From b7ba0bc6ae862ea9dc86718261ad4cfd932df3d1 Mon Sep 17 00:00:00 2001 From: rachytski Date: Mon, 29 Oct 2012 14:14:04 +0300 Subject: [PATCH] removed dead code. --- yg/geometry_batcher.cpp | 48 ------------------------------ yg/geometry_batcher.hpp | 3 -- yg/skin.cpp | 65 ++++------------------------------------- yg/skin.hpp | 5 ---- 4 files changed, 5 insertions(+), 116 deletions(-) diff --git a/yg/geometry_batcher.cpp b/yg/geometry_batcher.cpp index a6cd3fce34..f2e8702c9a 100644 --- a/yg/geometry_batcher.cpp +++ b/yg/geometry_batcher.cpp @@ -147,54 +147,6 @@ namespace yg } } - void GeometryBatcher::setAdditionalSkinPage(shared_ptr const & p) - { - if (m_skin != 0) - { - m_skin->setAdditionalPage(p); - int pagesCount = m_skin->getPagesCount(); - m_pipelines.resize(pagesCount + 1); - - /// additional page are fixed-content page, and shouldn't be modified by this screen. - /*m_skin->addOverflowFn(bind(&GeometryBatcher::flush, this, _1), 100); - - m_skin->addClearPageFn(bind(&GeometryBatcher::flush, this, _1), 100); - m_skin->addClearPageFn(bind(&GeometryBatcher::freeTexture, this, _1), 99);*/ - - for (size_t i = 0; i < 1; ++i) - { - m_pipelines[i + pagesCount].m_useGuiResources = m_useGuiResources; - m_pipelines[i + pagesCount].m_currentVertex = 0; - m_pipelines[i + pagesCount].m_currentIndex = 0; - - m_pipelines[i + pagesCount].m_hasStorage = false; - m_pipelines[i + pagesCount].m_type = p->type(); - - m_pipelines[i + pagesCount].m_maxVertices = 0; - m_pipelines[i + pagesCount].m_maxIndices = 0; - - m_pipelines[i + pagesCount].m_vertices = 0; - m_pipelines[i + pagesCount].m_indices = 0; - } - } - } - - void GeometryBatcher::clearAdditionalSkinPage() - { - if (m_skin != 0) - { - size_t pagesCount = m_skin->getPagesCount(); - size_t additionalPagesCount = m_skin->getAdditionalPagesCount(); - - m_skin->clearAdditionalPage(); - - for (unsigned i = pagesCount; i < pagesCount + additionalPagesCount; ++i) - freePipeline(i); - - m_pipelines.resize(m_skin->getPagesCount()); - } - } - void GeometryBatcher::setSkin(shared_ptr skin) { m_skin = skin; diff --git a/yg/geometry_batcher.hpp b/yg/geometry_batcher.hpp index 6d5bc91493..0814bf80b6 100644 --- a/yg/geometry_batcher.hpp +++ b/yg/geometry_batcher.hpp @@ -211,9 +211,6 @@ namespace yg void enterBackground(); void enterForeground(); - void setAdditionalSkinPage(shared_ptr const & v); - void clearAdditionalSkinPage(); - void setDisplayList(DisplayList * displayList); void flush(); diff --git a/yg/skin.cpp b/yg/skin.cpp index 106914a2b5..24db2c783d 100644 --- a/yg/skin.cpp +++ b/yg/skin.cpp @@ -80,21 +80,13 @@ namespace yg return 0; id_pair_t p = unpackID(id); - if (p.first < m_pages.size()) - return m_pages[p.first]->fromID(p.second); - else - return m_additionalPages[p.first - m_pages.size()]->fromID(p.second); + + ASSERT(p.first < m_pages.size(), ()); + return m_pages[p.first]->fromID(p.second); } uint32_t Skin::mapSymbol(char const * symbolName) { - for (uint8_t i = 0; i < m_additionalPages.size(); ++i) - { - uint32_t res = m_additionalPages[i]->findSymbol(symbolName); - if (res != invalidPageHandle()) - return packID(i + m_pages.size(), res); - } - for (uint8_t i = 0; i < m_pages.size(); ++i) { uint32_t res = m_pages[i]->findSymbol(symbolName); @@ -109,13 +101,6 @@ namespace yg { uint32_t res = invalidPageHandle(); - for (uint8_t i = 0; i < m_additionalPages.size(); ++i) - { - res = m_additionalPages[i]->findColor(c); - if (res != invalidPageHandle()) - return packID(i + m_pages.size(), res); - } - for (uint8_t i = 0; i < m_pages.size(); ++i) { res = m_pages[i]->findColor(c); @@ -133,13 +118,6 @@ namespace yg { uint32_t res = invalidPageHandle(); - for (uint8_t i = 0; i < m_additionalPages.size(); ++i) - { - res = m_additionalPages[i]->findPenInfo(penInfo); - if (res != invalidPageHandle()) - return packID(i + m_pages.size(), res); - } - for (uint8_t i = 0; i < m_pages.size(); ++i) { res = m_pages[i]->findPenInfo(penInfo); @@ -157,13 +135,6 @@ namespace yg { uint32_t res = invalidPageHandle(); - for (uint8_t i = 0; i < m_additionalPages.size(); ++i) - { - res = m_additionalPages[i]->findCircleInfo(circleInfo); - if (res != invalidPageHandle()) - return packID(i + m_pages.size(), res); - } - for (uint8_t i = 0; i < m_pages.size(); ++i) { res = m_pages[i]->findCircleInfo(circleInfo); @@ -216,13 +187,6 @@ namespace yg { uint32_t res = invalidPageHandle(); - for (uint8_t i = 0; i < m_additionalPages.size(); ++i) - { - res = m_additionalPages[i]->findGlyph(gk); - if (res != invalidPageHandle()) - return packID(i + m_pages.size(), res); - } - for (uint8_t i = 0; i < m_pages.size(); ++i) { res = m_pages[i]->findGlyph(gk); @@ -238,10 +202,8 @@ namespace yg shared_ptr const & Skin::getPage(int i) const { - if (i < m_pages.size()) - return m_pages[i]; - else - return m_additionalPages[i - m_pages.size()]; + ASSERT(i < m_pages.size(), ()); + return m_pages[i]; } size_t Skin::getPagesCount() const @@ -249,11 +211,6 @@ namespace yg return m_pages.size(); } - size_t Skin::getAdditionalPagesCount() const - { - return m_additionalPages.size(); - } - void Skin::addClearPageFn(clearPageFn fn, int priority) { m_clearPageFns.push(std::pair(priority, fn)); @@ -347,21 +304,9 @@ namespace yg { } - void Skin::setAdditionalPage(shared_ptr const & page) - { - m_additionalPages.clear(); - m_additionalPages.push_back(page); - m_additionalPages[0]->setPipelineID(0 + m_pages.size()); - } - void Skin::clearHandles() { for (unsigned i = 0; i < m_pages.size(); ++i) m_pages[i]->clear(); } - - void Skin::clearAdditionalPage() - { - m_additionalPages.clear(); - } } diff --git a/yg/skin.hpp b/yg/skin.hpp index c0297cfed2..d1c8ec0add 100644 --- a/yg/skin.hpp +++ b/yg/skin.hpp @@ -44,7 +44,6 @@ namespace yg private: TSkinPages m_pages; - TSkinPages m_additionalPages; uint8_t m_dynamicPage; uint8_t m_textPage; @@ -128,7 +127,6 @@ namespace yg shared_ptr const & getPage(int i) const; size_t getPagesCount() const; - size_t getAdditionalPagesCount() const; uint32_t invalidHandle() const; uint32_t invalidPageHandle() const; @@ -136,9 +134,6 @@ namespace yg uint8_t textPage() const; uint8_t dynamicPage() const; - void setAdditionalPage(shared_ptr const & pages); - void clearAdditionalPage(); - void clearHandles(); void memoryWarning();