UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-15 11:31:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Harald Csaszar 2022-07-12 15:02:34 +02:00
commit d5bbfbcbbb
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-sfml/c/CMakeLists.txt
View File

@ -3,6 +3,8 @@
# #
set(DEPS_DIR "${CMAKE_CURRENT_LIST_DIR}/dependencies/") set(DEPS_DIR "${CMAKE_CURRENT_LIST_DIR}/dependencies/")
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CMAKE_OSX_ARCHITECTURES x86_64)
set(ONLY_ACTIVE_ARCH NO)
set(SFML_URL "https://www.sfml-dev.org/files/SFML-2.5.1-macOS-clang.tar.gz") set(SFML_URL "https://www.sfml-dev.org/files/SFML-2.5.1-macOS-clang.tar.gz")
set(SFML_DIR ${DEPS_DIR}/SFML-2.5.1-macos-clang) set(SFML_DIR ${DEPS_DIR}/SFML-2.5.1-macos-clang)
if (NOT EXISTS "${SFML_DIR}") if (NOT EXISTS "${SFML_DIR}")

2
spine-sfml/cpp/CMakeLists.txt
View File

@ -3,6 +3,8 @@
# #
set(DEPS_DIR "${CMAKE_CURRENT_LIST_DIR}/dependencies/") set(DEPS_DIR "${CMAKE_CURRENT_LIST_DIR}/dependencies/")
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CMAKE_OSX_ARCHITECTURES x86_64)
set(ONLY_ACTIVE_ARCH NO)
set(SFML_URL "https://www.sfml-dev.org/files/SFML-2.5.1-macOS-clang.tar.gz") set(SFML_URL "https://www.sfml-dev.org/files/SFML-2.5.1-macOS-clang.tar.gz")
set(SFML_DIR ${DEPS_DIR}/SFML-2.5.1-macos-clang) set(SFML_DIR ${DEPS_DIR}/SFML-2.5.1-macos-clang)
if (NOT EXISTS "${SFML_DIR}") if (NOT EXISTS "${SFML_DIR}")

8
spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AtlasUtilities.cs
View File

@ -193,6 +193,10 @@ namespace Spine.Unity.AttachmentTools {
region.index = -1; region.index = -1;
region.degrees = s.packed && s.packingRotation != SpritePackingRotation.None ? 90 : 0; region.degrees = s.packed && s.packingRotation != SpritePackingRotation.None ? 90 : 0;
// World space units
Bounds bounds = s.bounds;
Vector2 boundsMin = bounds.min, boundsMax = bounds.max;
// Texture space/pixel units // Texture space/pixel units
Rect spineRect = s.textureRect.SpineUnityFlipRect(s.texture.height); Rect spineRect = s.textureRect.SpineUnityFlipRect(s.texture.height);
Rect originalRect = s.rect; Rect originalRect = s.rect;
@ -200,8 +204,8 @@ namespace Spine.Unity.AttachmentTools {
region.originalWidth = (int)originalRect.width; region.originalWidth = (int)originalRect.width;
region.height = (int)spineRect.height; region.height = (int)spineRect.height;
region.originalHeight = (int)originalRect.height; region.originalHeight = (int)originalRect.height;
region.offsetX = s.textureRectOffset.x; region.offsetX = s.textureRectOffset.x + spineRect.width * (0.5f - InverseLerp(boundsMin.x, boundsMax.x, 0));
region.offsetY = s.textureRectOffset.y; region.offsetY = s.textureRectOffset.y + spineRect.height * (0.5f - InverseLerp(boundsMin.y, boundsMax.y, 0));
if (isolatedTexture) { if (isolatedTexture) {
region.u = 0; region.u = 0;