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

Formatting.

Browse Source
This commit is contained in:
Mario Zechner 2022-09-15 08:37:55 +02:00
parent 25719370c7
commit 669af9f6bb
9 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-c/spine-c/src/spine/AnimationState.c
View File

@ -595,7 +595,7 @@ _spAnimationState_setAttachment(spAnimationState *self, spSkeleton *skeleton, sp
/* @param target After the first and before the last entry. */
static int binarySearch1(float *values, int valuesLength, float target) {
int i;
int i;
for (i = 1; i < valuesLength; i++) {
if (values[i] > target) return (int) (i - 1);
}

28
spine-c/spine-c/src/spine/RegionAttachment.c
View File

@ -79,21 +79,21 @@ spRegionAttachment *spRegionAttachment_create(const char *name) {
}
void spRegionAttachment_updateRegion(spRegionAttachment *self) {
float regionScaleX, regionScaleY, localX, localY, localX2, localY2;
float radians, cosine, sine;
float localXCos, localXSin, localYCos, localYSin, localX2Cos, localX2Sin, localY2Cos, localY2Sin;
float regionScaleX, regionScaleY, localX, localY, localX2, localY2;
float radians, cosine, sine;
float localXCos, localXSin, localYCos, localYSin, localX2Cos, localX2Sin, localY2Cos, localY2Sin;
if (self->region == NULL) {
self->uvs[0] = 0;
self->uvs[1] = 0;
self->uvs[2] = 1;
self->uvs[3] = 1;
self->uvs[4] = 1;
self->uvs[5] = 0;
self->uvs[6] = 0;
self->uvs[7] = 0;
return;
}
if (self->region == NULL) {
self->uvs[0] = 0;
self->uvs[1] = 0;
self->uvs[2] = 1;
self->uvs[3] = 1;
self->uvs[4] = 1;
self->uvs[5] = 0;
self->uvs[6] = 0;
self->uvs[7] = 0;
return;
}
regionScaleX = self->width / self->region->originalWidth * self->scaleX;
regionScaleY = self->height / self->region->originalHeight * self->scaleY;

22
spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp
View File

@ -68,17 +68,17 @@ RegionAttachment::~RegionAttachment() {
}
void RegionAttachment::updateRegion() {
if (_region == NULL) {
_uvs[BLX] = 0;
_uvs[BLY] = 0;
_uvs[ULX] = 0;
_uvs[ULY] = 1;
_uvs[URX] = 1;
_uvs[URY] = 1;
_uvs[BRX] = 1;
_uvs[BRY] = 0;
return;
}
if (_region == NULL) {
_uvs[BLX] = 0;
_uvs[BLY] = 0;
_uvs[ULX] = 0;
_uvs[ULY] = 1;
_uvs[URX] = 1;
_uvs[URY] = 1;
_uvs[BRX] = 1;
_uvs[BRY] = 0;
return;
}
float regionScaleX = _width / _region->originalWidth * _scaleX;
float regionScaleY = _height / _region->originalHeight * _scaleY;

4
spine-godot/spine_godot/SpineSprite.cpp
View File

@ -555,7 +555,7 @@ void SpineSprite::update_meshes(Ref<SpineSkeleton> skeleton_ref) {
vertices->setSize(8, 0);
region->computeWorldVertices(*slot, *vertices, 0);
renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) region->getRendererObject())->page->getRendererObject();
renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) region->getRendererObject())->page->getRendererObject();
uvs = &region->getUVs();
indices = &quad_indices;
@ -569,7 +569,7 @@ void SpineSprite::update_meshes(Ref<SpineSkeleton> skeleton_ref) {
vertices->setSize(mesh->getWorldVerticesLength(), 0);
mesh->computeWorldVertices(*slot, *vertices);
renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) mesh->getRendererObject())->page->getRendererObject();
renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) mesh->getRendererObject())->page->getRendererObject();
uvs = &mesh->getUVs();
indices = &mesh->getTriangles();

2
spine-sfml/c/src/spine/spine-sfml.cpp
View File

@ -216,7 +216,7 @@ namespace spine {
uvs = mesh->uvs;
indices = mesh->triangles;
indicesCount = mesh->trianglesCount;
texture = (Texture *) ((spAtlasRegion *) mesh->rendererObject)->page->rendererObject;
texture = (Texture *) ((spAtlasRegion *) mesh->rendererObject)->page->rendererObject;
} else if (attachment->type == SP_ATTACHMENT_CLIPPING) {
spClippingAttachment *clip = (spClippingAttachment *) slot->attachment;

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

@ -136,11 +136,11 @@ namespace spine {
}
worldVertices.setSize(mesh->getWorldVerticesLength(), 0);
mesh->computeWorldVertices(slot, 0, mesh->getWorldVerticesLength(), worldVertices.buffer(), 0, 2);
mesh->computeWorldVertices(slot, 0, mesh->getWorldVerticesLength(), worldVertices.buffer(), 0, 2);
uvs = &mesh->getUVs();
indices = &mesh->getTriangles();
indicesCount = mesh->getTriangles().size();
texture = (Texture *) ((AtlasRegion *) mesh->getRendererObject())->page->getRendererObject();
texture = (Texture *) ((AtlasRegion *) mesh->getRendererObject())->page->getRendererObject();
} else if (attachment->getRTTI().isExactly(ClippingAttachment::rtti)) {
ClippingAttachment *clip = (ClippingAttachment *) slot.getAttachment();

2
spine-ts/spine-canvas/src/SkeletonRenderer.ts
View File

@ -66,7 +66,7 @@ export class SkeletonRenderer {
if (!bone.active) continue;
let attachment = slot.getAttachment();
if (!(attachment instanceof RegionAttachment)) continue;
if (!(attachment instanceof RegionAttachment)) continue;
attachment.computeWorldVertices(slot, worldVertices, 0, 2);
let region: TextureAtlasRegion = <TextureAtlasRegion>attachment.region;
let image: HTMLImageElement = (<CanvasTexture>region.page.texture).getImage() as HTMLImageElement;

4
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SSpineWidget.cpp
View File

@ -273,7 +273,7 @@ void SSpineWidget::UpdateMesh(int32 LayerId, FSlateWindowElementList &OutDrawEle
if (attachment->getRTTI().isExactly(RegionAttachment::rtti)) {
RegionAttachment *regionAttachment = (RegionAttachment *) attachment;
attachmentColor.set(regionAttachment->getColor());
attachmentColor.set(regionAttachment->getColor());
regionAttachment->computeWorldVertices(*slot, *attachmentVertices, 0, 2);
attachmentAtlasRegion = (AtlasRegion *) regionAttachment->getRendererObject();
attachmentIndices = quadIndices;
@ -282,7 +282,7 @@ void SSpineWidget::UpdateMesh(int32 LayerId, FSlateWindowElementList &OutDrawEle
numIndices = 6;
} else if (attachment->getRTTI().isExactly(MeshAttachment::rtti)) {
MeshAttachment *mesh = (MeshAttachment *) attachment;
attachmentColor.set(mesh->getColor());
attachmentColor.set(mesh->getColor());
mesh->computeWorldVertices(*slot, 0, mesh->getWorldVerticesLength(), attachmentVertices->buffer(), 0, 2);
attachmentAtlasRegion = (AtlasRegion *) mesh->getRendererObject();
attachmentIndices = mesh->getTriangles().buffer();

4
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp
View File

@ -235,7 +235,7 @@ void USpineSkeletonRendererComponent::UpdateMesh(Skeleton *Skeleton) {
continue;
}
attachmentColor.set(regionAttachment->getColor());
attachmentColor.set(regionAttachment->getColor());
regionAttachment->computeWorldVertices(*slot, *attachmentVertices, 0, 2);
attachmentAtlasRegion = (AtlasRegion *) regionAttachment->getRendererObject();
attachmentIndices = quadIndices;
@ -251,7 +251,7 @@ void USpineSkeletonRendererComponent::UpdateMesh(Skeleton *Skeleton) {
continue;
}
attachmentColor.set(mesh->getColor());
attachmentColor.set(mesh->getColor());
mesh->computeWorldVertices(*slot, 0, mesh->getWorldVerticesLength(), attachmentVertices->buffer(), 0, 2);
attachmentAtlasRegion = (AtlasRegion *) mesh->getRendererObject();
attachmentIndices = mesh->getTriangles().buffer();