From 1219d0995969138f14d923ad134f4ccfa836e2b2 Mon Sep 17 00:00:00 2001 From: badlogic Date: Thu, 13 Aug 2020 14:53:32 +0200 Subject: [PATCH] Closes #1703, expose atlas regions via Atlas::getRegions() Also removed Atlas::abortAtlas(). --- spine-cpp/spine-cpp/include/spine/Atlas.h | 4 ++-- spine-cpp/spine-cpp/src/spine/Atlas.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spine-cpp/spine-cpp/include/spine/Atlas.h b/spine-cpp/spine-cpp/include/spine/Atlas.h index 257942d69..5ab09f98d 100644 --- a/spine-cpp/spine-cpp/include/spine/Atlas.h +++ b/spine-cpp/spine-cpp/include/spine/Atlas.h @@ -115,6 +115,8 @@ public: Vector &getPages(); + Vector &getRegions(); + private: Vector _pages; Vector _regions; @@ -149,8 +151,6 @@ private: static int equals(Str *str, const char *other); static int toInt(Str *str); - - static Atlas *abortAtlas(Atlas *atlas); }; } diff --git a/spine-cpp/spine-cpp/src/spine/Atlas.cpp b/spine-cpp/spine-cpp/src/spine/Atlas.cpp index bd5484b6f..e658c9c1e 100644 --- a/spine-cpp/spine-cpp/src/spine/Atlas.cpp +++ b/spine-cpp/spine-cpp/src/spine/Atlas.cpp @@ -98,6 +98,10 @@ Vector &Atlas::getPages() { return _pages; } +Vector &Atlas::getRegions() { + return _regions; +} + void Atlas::load(const char *begin, int length, const char *dir, bool createTexture) { static const char *formatNames[] = {"", "Alpha", "Intensity", "LuminanceAlpha", "RGB565", "RGBA4444", "RGB888", "RGBA8888"}; static const char *textureFilterNames[] = {"", "Nearest", "Linear", "MipMap", "MipMapNearestNearest", "MipMapLinearNearest",