UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 09:16:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ue] Fix shadowed variables on Clang/GCC.

Browse Source
This commit is contained in:
Mario Zechner 2024-08-07 14:09:20 +02:00
parent b47c739516
commit eb2802e366
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spine-cpp/spine-cpp/src/spine/Skeleton.cpp
View File

@ -462,10 +462,9 @@ void Skeleton::getBounds(float &outX, float &outY, float &outWidth,
getBounds(outX, outY, outWidth, outHeight, outVertexBuffer, NULL); getBounds(outX, outY, outWidth, outHeight, outVertexBuffer, NULL);
} }
static unsigned short quadIndices[] = {0, 1, 2, 2, 3, 0};
void Skeleton::getBounds(float &outX, float &outY, float &outWidth, void Skeleton::getBounds(float &outX, float &outY, float &outWidth,
float &outHeight, Vector<float> &outVertexBuffer, SkeletonClipping *clipper) { float &outHeight, Vector<float> &outVertexBuffer, SkeletonClipping *clipper) {
static unsigned short quadIndices[] = {0, 1, 2, 2, 3, 0};
float minX = FLT_MAX; float minX = FLT_MAX;
float minY = FLT_MAX; float minY = FLT_MAX;
float maxX = -FLT_MAX; float maxX = -FLT_MAX;

BIN
spine-flutter/lib/assets/libspine_flutter.wasm
View File

Binary file not shown.

4
spine-ue/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineAtlasAsset.cpp
View File

@ -102,7 +102,7 @@ class UETextureLoader : public TextureLoader {
} }
}; };
UETextureLoader textureLoader; UETextureLoader _spineUETextureLoader;
Atlas *USpineAtlasAsset::GetAtlas() { Atlas *USpineAtlasAsset::GetAtlas() {
if (!atlas) { if (!atlas) {
@ -113,7 +113,7 @@ Atlas *USpineAtlasAsset::GetAtlas() {
std::string t = TCHAR_TO_UTF8(*rawData); std::string t = TCHAR_TO_UTF8(*rawData);
atlas = new (__FILE__, __LINE__) atlas = new (__FILE__, __LINE__)
Atlas(t.c_str(), strlen(t.c_str()), "", &textureLoader); Atlas(t.c_str(), strlen(t.c_str()), "", &_spineUETextureLoader);
} }
return this->atlas; return this->atlas;
} }