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

[c][cpp] Fix formatting

Browse Source
This commit is contained in:
Mario Zechner 2024-06-28 15:38:51 +02:00
parent a58346ff64
commit 35d76de559
5 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-c/spine-c/src/spine/SkeletonClipping.c
View File

@ -164,7 +164,7 @@ _clip(spSkeletonClipping *self, float x1, float y1, float x2, float y2, float x3
float s2 = ey * (edgeX - inputX2) > ex * (edgeY - inputY2); float s2 = ey * (edgeX - inputX2) > ex * (edgeY - inputY2);
float s1 = ey * (edgeX - inputX) - ex * (edgeY - inputY); float s1 = ey * (edgeX - inputX) - ex * (edgeY - inputY);
if (s1 > 0) { if (s1 > 0) {
if (s2) { // v1 inside, v2 inside if (s2) {// v1 inside, v2 inside
spFloatArray_add(output, inputX2); spFloatArray_add(output, inputX2);
spFloatArray_add(output, inputY2); spFloatArray_add(output, inputY2);
continue; continue;
@ -178,7 +178,7 @@ _clip(spSkeletonClipping *self, float x1, float y1, float x2, float y2, float x3
spFloatArray_add(output, inputX2); spFloatArray_add(output, inputX2);
spFloatArray_add(output, inputY2); spFloatArray_add(output, inputY2);
} }
} else if (s2) { // v1 outside, v2 inside } else if (s2) {// v1 outside, v2 inside
float ix = inputX2 - inputX, iy = inputY2 - inputY, t = s1 / (ix * ey - iy * ex); float ix = inputX2 - inputX, iy = inputY2 - inputY, t = s1 / (ix * ey - iy * ex);
if (t >= 0 && t <= 1) { if (t >= 0 && t <= 1) {
spFloatArray_add(output, inputX + ix * t); spFloatArray_add(output, inputX + ix * t);

2
spine-cpp/spine-cpp-lite/spine-cpp-lite.cpp
View File

@ -851,7 +851,7 @@ spine_render_command spine_skeleton_drawable_render(spine_skeleton_drawable draw
uint32_t darkColor = 0xff000000; uint32_t darkColor = 0xff000000;
if (slot.hasDarkColor()) { if (slot.hasDarkColor()) {
Color &slotDarkColor = slot.getDarkColor(); Color &slotDarkColor = slot.getDarkColor();
darkColor = 0xff000000 | (static_cast<uint8_t>(slotDarkColor.r * 255) << 16)| (static_cast<uint8_t>(slotDarkColor.g * 255) << 8)| static_cast<uint8_t>(slotDarkColor.b * 255); darkColor = 0xff000000 | (static_cast<uint8_t>(slotDarkColor.r * 255) << 16) | (static_cast<uint8_t>(slotDarkColor.g * 255) << 8) | static_cast<uint8_t>(slotDarkColor.b * 255);
} }
if (clipper.isClipping()) { if (clipper.isClipping()) {

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

@ -307,7 +307,7 @@ bool SkeletonClipping::clip(float x1, float y1, float x2, float y2, float x3, fl
float s2 = ey * (edgeX - inputX2) > ex * (edgeY - inputY2); float s2 = ey * (edgeX - inputX2) > ex * (edgeY - inputY2);
float s1 = ey * (edgeX - inputX) - ex * (edgeY - inputY); float s1 = ey * (edgeX - inputX) - ex * (edgeY - inputY);
if (s1 > 0) { if (s1 > 0) {
if (s2) { // v1 inside, v2 inside if (s2) {// v1 inside, v2 inside
output->add(inputX2); output->add(inputX2);
output->add(inputY2); output->add(inputY2);
continue; continue;
@ -321,7 +321,7 @@ bool SkeletonClipping::clip(float x1, float y1, float x2, float y2, float x3, fl
output->add(inputX2); output->add(inputX2);
output->add(inputY2); output->add(inputY2);
} }
} else if (s2) { // v1 outside, v2 inside } else if (s2) {// v1 outside, v2 inside
float ix = inputX2 - inputX, iy = inputY2 - inputY, t = s1 / (ix * ey - iy * ex); float ix = inputX2 - inputX, iy = inputY2 - inputY, t = s1 / (ix * ey - iy * ex);
if (t >= 0 && t <= 1) { if (t >= 0 && t <= 1) {
output->add(inputX + ix * t); output->add(inputX + ix * t);