diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-26 20:11:07 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-26 20:11:07 +0300 |
commit | 07675230038a24dd251581591379c8fe5cc7bfd1 (patch) | |
tree | 1e4633730515af717ba93aef111f855de5cc9b38 /src/resources/atlas | |
parent | 17f34f00d37432dae207be3d55ec531a738eb065 (diff) | |
download | manaplus-07675230038a24dd251581591379c8fe5cc7bfd1.tar.gz manaplus-07675230038a24dd251581591379c8fe5cc7bfd1.tar.bz2 manaplus-07675230038a24dd251581591379c8fe5cc7bfd1.tar.xz manaplus-07675230038a24dd251581591379c8fe5cc7bfd1.zip |
Add memory count functions into MapLayer and SpecailLayer.
Also change all memory count functions into const methods.
Diffstat (limited to 'src/resources/atlas')
-rw-r--r-- | src/resources/atlas/atlasitem.h | 2 | ||||
-rw-r--r-- | src/resources/atlas/atlasresource.cpp | 6 | ||||
-rw-r--r-- | src/resources/atlas/atlasresource.h | 4 | ||||
-rw-r--r-- | src/resources/atlas/textureatlas.h | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/resources/atlas/atlasitem.h b/src/resources/atlas/atlasitem.h index 3a9f05f8d..a5d4d9116 100644 --- a/src/resources/atlas/atlasitem.h +++ b/src/resources/atlas/atlasitem.h @@ -43,7 +43,7 @@ struct AtlasItem final : public MemoryCounter A_DELETE_COPY(AtlasItem) - int calcMemoryLocal() override final + int calcMemoryLocal() const override final { return sizeof(AtlasItem) + name.capacity(); diff --git a/src/resources/atlas/atlasresource.cpp b/src/resources/atlas/atlasresource.cpp index d48394698..9ecc32692 100644 --- a/src/resources/atlas/atlasresource.cpp +++ b/src/resources/atlas/atlasresource.cpp @@ -71,17 +71,17 @@ void AtlasResource::decRef() AtlasManager::moveToDeleted(this); } -int AtlasResource::calcMemoryLocal() +int AtlasResource::calcMemoryLocal() const { return sizeof(AtlasResource) + Resource::calcMemoryLocal() + atlases.capacity() * sizeof(TextureAtlas*); } -int AtlasResource::calcMemoryChilds(const int level) +int AtlasResource::calcMemoryChilds(const int level) const { int sz = 0; - FOR_EACH (std::vector<TextureAtlas*>::iterator, it, atlases) + FOR_EACH (std::vector<TextureAtlas*>::const_iterator, it, atlases) { TextureAtlas *const atlas = *it; sz += atlas->calcMemory(level + 1); diff --git a/src/resources/atlas/atlasresource.h b/src/resources/atlas/atlasresource.h index 7dddc6728..5753c77e3 100644 --- a/src/resources/atlas/atlasresource.h +++ b/src/resources/atlas/atlasresource.h @@ -44,9 +44,9 @@ class AtlasResource final : public Resource void decRef() override final; - int calcMemoryLocal() override final; + int calcMemoryLocal() const override final; - int calcMemoryChilds(const int level) override final; + int calcMemoryChilds(const int level) const override final; std::vector<TextureAtlas*> atlases; }; diff --git a/src/resources/atlas/textureatlas.h b/src/resources/atlas/textureatlas.h index aefa831d1..fce101f64 100644 --- a/src/resources/atlas/textureatlas.h +++ b/src/resources/atlas/textureatlas.h @@ -54,16 +54,16 @@ struct TextureAtlas final : public MemoryCounter A_DELETE_COPY(TextureAtlas) - int calcMemoryLocal() override final + int calcMemoryLocal() const override final { return sizeof(TextureAtlas) + items.capacity() * sizeof(AtlasItem*); } - int calcMemoryChilds(const int level) override final + int calcMemoryChilds(const int level) const override final { int sz = 0; - FOR_EACH (std::vector<AtlasItem*>::iterator, it, items) + FOR_EACH (std::vector<AtlasItem*>::const_iterator, it, items) { AtlasItem *const item = *it; sz += item->calcMemory(level + 1); |