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

Allow SkeletonBinary and SkeletonJson to own externally created AttachmentLoader (#1846)

Browse Source
This commit is contained in:
RH 2021-04-29 22:07:16 +10:00 committed by Harald Csaszar
parent 5cb54bdf9c
commit fb3ca1702e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-cpp/spine-cpp/include/spine/SkeletonBinary.h
View File

@ -80,7 +80,7 @@ namespace spine {
explicit SkeletonBinary(Atlas* atlasArray); explicit SkeletonBinary(Atlas* atlasArray);
explicit SkeletonBinary(AttachmentLoader* attachmentLoader); explicit SkeletonBinary(AttachmentLoader* attachmentLoader, bool ownsLoader = false);
~SkeletonBinary(); ~SkeletonBinary();

2
spine-cpp/spine-cpp/include/spine/SkeletonJson.h
View File

@ -63,7 +63,7 @@ class SP_API SkeletonJson : public SpineObject {
public: public:
explicit SkeletonJson(Atlas *atlas); explicit SkeletonJson(Atlas *atlas);
explicit SkeletonJson(AttachmentLoader *attachmentLoader); explicit SkeletonJson(AttachmentLoader *attachmentLoader, bool ownsLoader = false);
~SkeletonJson(); ~SkeletonJson();

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

@ -80,8 +80,8 @@ SkeletonBinary::SkeletonBinary(Atlas *atlasArray) : _attachmentLoader(
} }
SkeletonBinary::SkeletonBinary(AttachmentLoader *attachmentLoader) : _attachmentLoader(attachmentLoader), _error(), SkeletonBinary::SkeletonBinary(AttachmentLoader* attachmentLoader, bool ownsLoader) : _attachmentLoader(attachmentLoader), _error(),
_scale(1), _ownsLoader(false) _scale(1), _ownsLoader(ownsLoader)
{ {
assert(_attachmentLoader != NULL); assert(_attachmentLoader != NULL);
} }

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

@ -108,8 +108,8 @@ SkeletonJson::SkeletonJson(Atlas *atlas) : _attachmentLoader(new(__FILE__, __LIN
_scale(1), _ownsLoader(true) _scale(1), _ownsLoader(true)
{} {}
SkeletonJson::SkeletonJson(AttachmentLoader *attachmentLoader) : _attachmentLoader(attachmentLoader), _scale(1), SkeletonJson::SkeletonJson(AttachmentLoader *attachmentLoader, bool ownsLoader) : _attachmentLoader(attachmentLoader), _scale(1),
_ownsLoader(false) _ownsLoader(ownsLoader)
{ {
assert(_attachmentLoader != NULL); assert(_attachmentLoader != NULL);
} }