UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[cpp] Closes #1713, dark color was not set in Slot::setToSetupPose().

Browse Source
This commit is contained in:
badlogic 2020-08-13 14:54:34 +02:00
parent 993391602b
commit c47ea763fe
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-cpp/spine-cpp/include/spine/Atlas.h
View File

@ -115,6 +115,8 @@ public:
Vector<AtlasPage*> &getPages(); Vector<AtlasPage*> &getPages();
Vector<AtlasRegion*> &getRegions();
private: private:
Vector<AtlasPage *> _pages; Vector<AtlasPage *> _pages;
Vector<AtlasRegion *> _regions; Vector<AtlasRegion *> _regions;
@ -149,8 +151,6 @@ private:
static int equals(Str *str, const char *other); static int equals(Str *str, const char *other);
static int toInt(Str *str); static int toInt(Str *str);
static Atlas *abortAtlas(Atlas *atlas);
}; };
} }

4
spine-cpp/spine-cpp/src/spine/Atlas.cpp
View File

@ -98,6 +98,10 @@ Vector<AtlasPage*> &Atlas::getPages() {
return _pages; return _pages;
} }
Vector<AtlasRegion*> &Atlas::getRegions() {
return _regions;
}
void Atlas::load(const char *begin, int length, const char *dir, bool createTexture) { 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 *formatNames[] = {"", "Alpha", "Intensity", "LuminanceAlpha", "RGB565", "RGBA4444", "RGB888", "RGBA8888"};
static const char *textureFilterNames[] = {"", "Nearest", "Linear", "MipMap", "MipMapNearestNearest", "MipMapLinearNearest", static const char *textureFilterNames[] = {"", "Nearest", "Linear", "MipMap", "MipMapNearestNearest", "MipMapLinearNearest",