Mario Zechner 2 vuotta sitten
vanhempi
commit
a57f1b85b6

+ 15 - 15
spine-c/spine-c/src/spine/AnimationState.c

@@ -676,18 +676,18 @@ void _spAnimationState_applyRotateTimeline(spAnimationState *self, spTimeline *t
 			lastTotal = timelinesRotation[i];
 			lastDiff = timelinesRotation[i + 1];
 		}
-        loops = lastTotal - FMOD(lastTotal, 360);
-        total = diff + loops;
-        current = diff >= 0, dir = lastTotal >= 0;
-        if (ABS(lastDiff) <= 90 && SIGNUM(lastDiff) != SIGNUM(diff)) {
-            if (ABS(lastTotal - loops) > 180) {
-                total += 360 * SIGNUM(lastTotal);
-                dir = current;
-            } else if (loops != 0)
-                total -= 360 * SIGNUM(lastTotal);
-            else
-                dir = current;
-        }
+		loops = lastTotal - FMOD(lastTotal, 360);
+		total = diff + loops;
+		current = diff >= 0, dir = lastTotal >= 0;
+		if (ABS(lastDiff) <= 90 && SIGNUM(lastDiff) != SIGNUM(diff)) {
+			if (ABS(lastTotal - loops) > 180) {
+				total += 360 * SIGNUM(lastTotal);
+				dir = current;
+			} else if (loops != 0)
+				total -= 360 * SIGNUM(lastTotal);
+			else
+				dir = current;
+		}
 		if (dir != current) total += 360 * SIGNUM(lastTotal);
 		timelinesRotation[i] = total;
 	}
@@ -1037,9 +1037,9 @@ float spTrackEntry_getAnimationTime(spTrackEntry *entry) {
 }
 
 void spTrackEntry_resetRotationDirections(spTrackEntry *entry) {
-    FREE(entry->timelinesRotation);
-    entry->timelinesRotation = NULL;
-    entry->timelinesRotationCount = 0;
+	FREE(entry->timelinesRotation);
+	entry->timelinesRotation = NULL;
+	entry->timelinesRotationCount = 0;
 }
 
 float spTrackEntry_getTrackComplete(spTrackEntry *entry) {

+ 12 - 12
spine-cpp/spine-cpp/src/spine/AnimationState.cpp

@@ -745,18 +745,18 @@ void AnimationState::applyRotateTimeline(RotateTimeline *rotateTimeline, Skeleto
 			lastTotal = timelinesRotation[i];
 			lastDiff = timelinesRotation[i + 1];
 		}
-        float loops = lastTotal - MathUtil::fmod(lastTotal, 360.f);
-        total = diff + loops;
-        bool current = diff >= 0, dir = lastTotal >= 0;
-        if (MathUtil::abs(lastDiff) <= 90 && MathUtil::sign(lastDiff) != MathUtil::sign(diff)) {
-            if (MathUtil::abs(lastTotal - loops) > 180) {
-                total += 360.f * MathUtil::sign(lastTotal);
-                dir = current;
-            } else if (loops != 0)
-                total -= 360.f * MathUtil::sign(lastTotal);
-            else
-                dir = current;
-        }
+		float loops = lastTotal - MathUtil::fmod(lastTotal, 360.f);
+		total = diff + loops;
+		bool current = diff >= 0, dir = lastTotal >= 0;
+		if (MathUtil::abs(lastDiff) <= 90 && MathUtil::sign(lastDiff) != MathUtil::sign(diff)) {
+			if (MathUtil::abs(lastTotal - loops) > 180) {
+				total += 360.f * MathUtil::sign(lastTotal);
+				dir = current;
+			} else if (loops != 0)
+				total -= 360.f * MathUtil::sign(lastTotal);
+			else
+				dir = current;
+		}
 		if (dir != current) {
 			total += 360 * MathUtil::sign(lastTotal);
 		}

+ 2 - 2
spine-sfml/cpp/src/spine/spine-sfml.cpp

@@ -123,7 +123,7 @@ namespace spine {
 				uvs = &regionAttachment->getUVs();
 				indices = &quadIndices;
 				indicesCount = 6;
-                texture = (Texture *) ((AtlasRegion*)regionAttachment->getRegion())->page->texture;
+				texture = (Texture *) ((AtlasRegion *) regionAttachment->getRegion())->page->texture;
 
 			} else if (attachment->getRTTI().isExactly(MeshAttachment::rtti)) {
 				MeshAttachment *mesh = (MeshAttachment *) attachment;
@@ -140,7 +140,7 @@ namespace spine {
 				uvs = &mesh->getUVs();
 				indices = &mesh->getTriangles();
 				indicesCount = mesh->getTriangles().size();
-                texture = (Texture *) ((AtlasRegion*)mesh->getRegion())->page->texture;
+				texture = (Texture *) ((AtlasRegion *) mesh->getRegion())->page->texture;
 
 			} else if (attachment->getRTTI().isExactly(ClippingAttachment::rtti)) {
 				ClippingAttachment *clip = (ClippingAttachment *) slot.getAttachment();