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

[cpp] Fix formatting.

Browse Source
This commit is contained in:
Mario Zechner 2021-12-15 16:30:29 +01:00
parent e18d054f31
commit bb81f31171
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ namespace spine {
AtlasAttachmentLoader::AtlasAttachmentLoader(Atlas *atlas) : AttachmentLoader(), _atlas(atlas) { AtlasAttachmentLoader::AtlasAttachmentLoader(Atlas *atlas) : AttachmentLoader(), _atlas(atlas) {
} }
bool loadSequence (Atlas *atlas, const String &basePath, Sequence *sequence) { bool loadSequence(Atlas *atlas, const String &basePath, Sequence *sequence) {
Vector<TextureRegion *> &regions = sequence->getRegions(); Vector<TextureRegion *> &regions = sequence->getRegions();
for (int i = 0, n = regions.size(); i < n; i++) { for (int i = 0, n = regions.size(); i < n; i++) {
String path = sequence->getPath(basePath, i); String path = sequence->getPath(basePath, i);
@ -61,7 +61,7 @@ namespace spine {
RegionAttachment *AtlasAttachmentLoader::newRegionAttachment(Skin &skin, const String &name, const String &path, Sequence *sequence) { RegionAttachment *AtlasAttachmentLoader::newRegionAttachment(Skin &skin, const String &name, const String &path, Sequence *sequence) {
SP_UNUSED(skin); SP_UNUSED(skin);
RegionAttachment *attachment = new(__FILE__, __LINE__) RegionAttachment(name); RegionAttachment *attachment = new (__FILE__, __LINE__) RegionAttachment(name);
if (sequence) { if (sequence) {
if (!loadSequence(_atlas, path, sequence)) return NULL; if (!loadSequence(_atlas, path, sequence)) return NULL;
} else { } else {

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

@ -40,11 +40,9 @@ Sequence::Sequence() : _id(Sequence::getNextID()),
_start(0), _start(0),
_digits(0), _digits(0),
_setupIndex(0) { _setupIndex(0) {
} }
Sequence::~Sequence() { Sequence::~Sequence() {
} }
Sequence *Sequence::copy() { Sequence *Sequence::copy() {
@ -61,7 +59,7 @@ Sequence *Sequence::copy() {
void Sequence::apply(Slot *slot, Attachment *attachment) { void Sequence::apply(Slot *slot, Attachment *attachment) {
int index = slot->getSequenceIndex(); int index = slot->getSequenceIndex();
if (index == -1) index = _setupIndex; if (index == -1) index = _setupIndex;
if (index >= (int)_regions.size()) index = _regions.size() - 1; if (index >= (int) _regions.size()) index = _regions.size() - 1;
TextureRegion *region = _regions[index]; TextureRegion *region = _regions[index];
if (attachment->getRTTI().isExactly(RegionAttachment::rtti)) { if (attachment->getRTTI().isExactly(RegionAttachment::rtti)) {

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

@ -103,8 +103,8 @@ void Slot::setAttachment(Attachment *inValue) {
!_attachment || !_attachment ||
!inValue->getRTTI().instanceOf(VertexAttachment::rtti) || !inValue->getRTTI().instanceOf(VertexAttachment::rtti) ||
!_attachment->getRTTI().instanceOf(VertexAttachment::rtti) || !_attachment->getRTTI().instanceOf(VertexAttachment::rtti) ||
static_cast<VertexAttachment *>(inValue)->getTimelineAttachment() != static_cast<VertexAttachment *>(inValue)->getTimelineAttachment() !=
static_cast<VertexAttachment *>(_attachment)->getTimelineAttachment()) { static_cast<VertexAttachment *>(_attachment)->getTimelineAttachment()) {
_deform.clear(); _deform.clear();
} }

2
spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp
View File

@ -150,7 +150,7 @@ void VertexAttachment::setWorldVerticesLength(size_t inValue) {
_worldVerticesLength = inValue; _worldVerticesLength = inValue;
} }
Attachment * VertexAttachment::getTimelineAttachment() { Attachment *VertexAttachment::getTimelineAttachment() {
return _timelineAttachment; return _timelineAttachment;
} }