[c][cpp] Fix all warnings on Clang, more physics constraints porting

EsotericSoftware · Jan 3, 2024 · 8c79c7c · 8c79c7c
1 parent a190bc8
commit 8c79c7c
Show file tree

Hide file tree

Showing 49 changed files with 637 additions and 386 deletions.
diff --git a/spine-c/spine-c/include/spine/AnimationState.h b/spine-c/spine-c/include/spine/AnimationState.h
@@ -149,7 +149,7 @@ SP_API float spTrackEntry_getTrackComplete(spTrackEntry *entry);
 SP_API void spAnimationState_clearNext(spAnimationState *self, spTrackEntry *entry);
 
 /** Use this to dispose static memory before your app exits to appease your memory leak detector*/
-SP_API void spAnimationState_disposeStatics();
+SP_API void spAnimationState_disposeStatics(void);
 
 #ifdef __cplusplus
 }

diff --git a/spine-c/spine-c/include/spine/Atlas.h b/spine-c/spine-c/include/spine/Atlas.h
@@ -110,7 +110,7 @@ struct spAtlasRegion {
 	spAtlasRegion *next;
 };
 
-SP_API spAtlasRegion *spAtlasRegion_create();
+SP_API spAtlasRegion *spAtlasRegion_create(void);
 
 SP_API void spAtlasRegion_dispose(spAtlasRegion *self);
 

diff --git a/spine-c/spine-c/include/spine/Bone.h b/spine-c/spine-c/include/spine/Bone.h
@@ -58,7 +58,7 @@ struct spBone {
 
 SP_API void spBone_setYDown(int/*bool*/yDown);
 
-SP_API int/*bool*/spBone_isYDown();
+SP_API int/*bool*/spBone_isYDown(void);
 
 /* @param parent May be 0. */
 SP_API spBone *spBone_create(spBoneData *data, struct spSkeleton *skeleton, spBone *parent);

diff --git a/spine-c/spine-c/include/spine/Color.h b/spine-c/spine-c/include/spine/Color.h
@@ -41,7 +41,7 @@ typedef struct spColor {
 } spColor;
 
 /* @param attachmentName May be 0 for no setup pose attachment. */
-SP_API spColor *spColor_create();
+SP_API spColor *spColor_create(void);
 
 SP_API void spColor_dispose(spColor *self);
 

diff --git a/spine-c/spine-c/include/spine/SkeletonBounds.h b/spine-c/spine-c/include/spine/SkeletonBounds.h
@@ -62,7 +62,7 @@ typedef struct spSkeletonBounds {
 	float minX, minY, maxX, maxY;
 } spSkeletonBounds;
 
-SP_API spSkeletonBounds *spSkeletonBounds_create();
+SP_API spSkeletonBounds *spSkeletonBounds_create(void);
 
 SP_API void spSkeletonBounds_dispose(spSkeletonBounds *self);
 

diff --git a/spine-c/spine-c/include/spine/SkeletonClipping.h b/spine-c/spine-c/include/spine/SkeletonClipping.h
@@ -52,7 +52,7 @@ typedef struct spSkeletonClipping {
 	spArrayFloatArray *clippingPolygons;
 } spSkeletonClipping;
 
-SP_API spSkeletonClipping *spSkeletonClipping_create();
+SP_API spSkeletonClipping *spSkeletonClipping_create(void);
 
 SP_API int spSkeletonClipping_clipStart(spSkeletonClipping *self, spSlot *slot, spClippingAttachment *clip);
 

diff --git a/spine-c/spine-c/include/spine/SkeletonData.h b/spine-c/spine-c/include/spine/SkeletonData.h
@@ -81,7 +81,7 @@ typedef struct spSkeletonData {
 	spPathConstraintData **pathConstraints;
 } spSkeletonData;
 
-SP_API spSkeletonData *spSkeletonData_create();
+SP_API spSkeletonData *spSkeletonData_create(void);
 
 SP_API void spSkeletonData_dispose(spSkeletonData *self);
 

diff --git a/spine-c/spine-c/include/spine/Triangulator.h b/spine-c/spine-c/include/spine/Triangulator.h
@@ -49,7 +49,7 @@ typedef struct spTriangulator {
 	spArrayShortArray *polygonIndicesPool;
 } spTriangulator;
 
-SP_API spTriangulator *spTriangulator_create();
+SP_API spTriangulator *spTriangulator_create(void);
 
 SP_API spShortArray *spTriangulator_triangulate(spTriangulator *self, spFloatArray *verticesArray);
 

diff --git a/spine-c/spine-c/include/spine/extension.h b/spine-c/spine-c/include/spine/extension.h
@@ -175,7 +175,7 @@ void *_spRealloc(void *ptr, size_t size);
 
 void _spFree(void *ptr);
 
-float _spRandom();
+float _spRandom(void);
 
 SP_API void _spSetMalloc(void *(*_malloc)(size_t size));
 
@@ -185,7 +185,7 @@ SP_API void _spSetRealloc(void *(*_realloc)(void *ptr, size_t size));
 
 SP_API void _spSetFree(void (*_free)(void *ptr));
 
-SP_API void _spSetRandom(float (*_random)());
+SP_API void _spSetRandom(float (*_random)(void));
 
 char *_spReadFile(const char *path, int *length);
 

diff --git a/spine-c/spine-c/src/spine/AnimationState.c b/spine-c/spine-c/src/spine/AnimationState.c
@@ -44,7 +44,7 @@ _SP_ARRAY_IMPLEMENT_TYPE(spTrackEntryArray, spTrackEntry *)
 
 static spAnimation *SP_EMPTY_ANIMATION = 0;
 
-void spAnimationState_disposeStatics() {
+void spAnimationState_disposeStatics(void) {
 	if (SP_EMPTY_ANIMATION) spAnimation_dispose(SP_EMPTY_ANIMATION);
 	SP_EMPTY_ANIMATION = 0;
 }

diff --git a/spine-c/spine-c/src/spine/Atlas.c b/spine-c/spine-c/src/spine/Atlas.c
@@ -115,7 +115,7 @@ void spAtlasPage_dispose(spAtlasPage *self) {
 
 /**/
 
-spAtlasRegion *spAtlasRegion_create() {
+spAtlasRegion *spAtlasRegion_create(void) {
 	spAtlasRegion *region = NEW(spAtlasRegion);
 	region->keyValues = spKeyValueArray_create(2);
 	return region;

diff --git a/spine-c/spine-c/src/spine/AttachmentLoader.c b/spine-c/spine-c/src/spine/AttachmentLoader.c
@@ -96,6 +96,6 @@ void _spAttachmentLoader_setError(spAttachmentLoader *self, const char *error1,
 
 void _spAttachmentLoader_setUnknownTypeError(spAttachmentLoader *self, spAttachmentType type) {
 	char buffer[16];
-	sprintf(buffer, "%d", type);
+	snprintf(buffer, 16,"%d", type);
 	_spAttachmentLoader_setError(self, "Unknown attachment type: ", buffer);
 }
diff --git a/spine-c/spine-c/src/spine/Bone.c b/spine-c/spine-c/src/spine/Bone.c
@@ -37,7 +37,7 @@ void spBone_setYDown(int value) {
 	yDown = value;
 }
 
-int spBone_isYDown() {
+int spBone_isYDown(void) {
 	return yDown;
 }
 
@@ -261,26 +261,31 @@ void spBone_updateAppliedTransform(spBone *self) {
 				break;
 			}
 			case SP_TRANSFORMMODE_NOSCALE:
-			case SP_TRANSFORMMODE_NOSCALEORREFLECTION:
-				cosine = COS_DEG(self->rotation), sine = SIN_DEG(self->rotation);
-				pa = (pa * cosine + pb * sine) / self->skeleton->scaleX;
-				pc = (pc * cosine + pd * sine) / self->skeleton->scaleY;
-				s = SQRT(pa * pa + pc * pc);
-				if (s > 0.00001f) s = 1 / s;
-				pa *= s;
-				pc *= s;
-				s = SQRT(pa * pa + pc * pc);
-				if (self->data->transformMode == SP_TRANSFORMMODE_NOSCALE &&
-					pid < 0 != (self->skeleton->scaleX < 0 != self->skeleton->scaleY < 0))
-					s = -s;
-				r = PI / 2 + ATAN2(pc, pa);
-				pb = COS(r) * s;
-				pd = SIN(r) * s;
-				pid = 1 / (pa * pd - pb * pc);
-				ia = pd * pid;
-				ib = pb * pid;
-				ic = pc * pid;
-				id = pa * pid;
+			case SP_TRANSFORMMODE_NOSCALEORREFLECTION: {
+                cosine = COS_DEG(self->rotation), sine = SIN_DEG(self->rotation);
+                pa = (pa * cosine + pb * sine) / self->skeleton->scaleX;
+                pc = (pc * cosine + pd * sine) / self->skeleton->scaleY;
+                s = SQRT(pa * pa + pc * pc);
+                if (s > 0.00001f) s = 1 / s;
+                pa *= s;
+                pc *= s;
+                s = SQRT(pa * pa + pc * pc);
+                if (self->data->transformMode == SP_TRANSFORMMODE_NOSCALE &&
+                    pid < 0 != (self->skeleton->scaleX < 0 != self->skeleton->scaleY < 0))
+                    s = -s;
+                r = PI / 2 + ATAN2(pc, pa);
+                pb = COS(r) * s;
+                pd = SIN(r) * s;
+                pid = 1 / (pa * pd - pb * pc);
+                ia = pd * pid;
+                ib = pb * pid;
+                ic = pc * pid;
+                id = pa * pid;
+                break;
+            }
+            case SP_TRANSFORMMODE_ONLYTRANSLATION:
+            case SP_TRANSFORMMODE_NORMAL:
+                break;
 		}
 		ra = ia * self->a - ib * self->c;
 		rb = ia * self->b - ib * self->d;

diff --git a/spine-c/spine-c/src/spine/Color.c b/spine-c/spine-c/src/spine/Color.c
@@ -30,7 +30,7 @@
 #include <spine/Color.h>
 #include <spine/extension.h>
 
-spColor *spColor_create() {
+spColor *spColor_create(void) {
 	return MALLOC(spColor, 1);
 }
 

diff --git a/spine-c/spine-c/src/spine/Json.c b/spine-c/spine-c/src/spine/Json.c
@@ -122,7 +122,6 @@ static const char *parse_number(Json *item, const char *num) {
 	if (*ptr == 'e' || *ptr == 'E') {
 		double exponent = 0;
 		int expNegative = 0;
-		int n = 0;
 		++ptr;
 
 		if (*ptr == '-') {
@@ -135,7 +134,6 @@ static const char *parse_number(Json *item, const char *num) {
 		while (*ptr >= '0' && *ptr <= '9') {
 			exponent = (exponent * 10.0) + (*ptr - '0');
 			++ptr;
-			++n;
 		}
 
 		if (expNegative)

diff --git a/spine-c/spine-c/src/spine/Sequence.c b/spine-c/spine-c/src/spine/Sequence.c
@@ -102,7 +102,7 @@ static char *string_append(char *str, const char *b) {
 
 static char *string_append_int(char *str, int value) {
 	char intStr[20];
-	sprintf(intStr, "%i", value);
+	snprintf(intStr, 20, "%i", value);
 	return string_append(str, intStr);
 }
 

diff --git a/spine-c/spine-c/src/spine/SkeletonBinary.c b/spine-c/spine-c/src/spine/SkeletonBinary.c
@@ -1325,7 +1325,7 @@ spSkeletonData *spSkeletonBinary_readSkeletonData(spSkeletonBinary *self, const
 	skeletonData = spSkeletonData_create();
 	lowHash = readInt(input);
 	highHash = readInt(input);
-	sprintf(buffer, "%x%x", highHash, lowHash);
+	snprintf(buffer, 32, "%x%x", highHash, lowHash);
 	buffer[31] = 0;
 	MALLOC_STR(skeletonData->hash, buffer);
 
@@ -1336,7 +1336,7 @@ spSkeletonData *spSkeletonBinary_readSkeletonData(spSkeletonBinary *self, const
 	} else {
 		if (!string_starts_with(skeletonData->version, SPINE_VERSION_STRING)) {
 			char errorMsg[255];
-			sprintf(errorMsg, "Skeleton version %s does not match runtime version %s", skeletonData->version, SPINE_VERSION_STRING);
+			snprintf(errorMsg, 255, "Skeleton version %s does not match runtime version %s", skeletonData->version, SPINE_VERSION_STRING);
 			_spSkeletonBinary_setError(self, errorMsg, NULL);
 			return NULL;
 		}

diff --git a/spine-c/spine-c/src/spine/SkeletonBounds.c b/spine-c/spine-c/src/spine/SkeletonBounds.c
@@ -89,7 +89,7 @@ typedef struct {
 	int capacity;
 } _spSkeletonBounds;
 
-spSkeletonBounds *spSkeletonBounds_create() {
+spSkeletonBounds *spSkeletonBounds_create(void) {
 	return SUPER(NEW(_spSkeletonBounds));
 }
 

diff --git a/spine-c/spine-c/src/spine/SkeletonClipping.c b/spine-c/spine-c/src/spine/SkeletonClipping.c
@@ -30,7 +30,7 @@
 #include <spine/SkeletonClipping.h>
 #include <spine/extension.h>
 
-spSkeletonClipping *spSkeletonClipping_create() {
+spSkeletonClipping *spSkeletonClipping_create(void) {
 	spSkeletonClipping *clipping = CALLOC(spSkeletonClipping, 1);
 
 	clipping->triangulator = spTriangulator_create();

diff --git a/spine-c/spine-c/src/spine/SkeletonData.c b/spine-c/spine-c/src/spine/SkeletonData.c
@@ -31,7 +31,7 @@
 #include <spine/extension.h>
 #include <string.h>
 
-spSkeletonData *spSkeletonData_create() {
+spSkeletonData *spSkeletonData_create(void) {
 	return NEW(spSkeletonData);
 }
 

diff --git a/spine-c/spine-c/src/spine/SkeletonJson.c b/spine-c/spine-c/src/spine/SkeletonJson.c
@@ -988,7 +988,7 @@ spSkeletonData *spSkeletonJson_readSkeletonData(spSkeletonJson *self, const char
 		MALLOC_STR(skeletonData->version, Json_getString(skeleton, "spine", "0"));
 		if (!string_starts_with(skeletonData->version, SPINE_VERSION_STRING)) {
 			char errorMsg[255];
-			sprintf(errorMsg, "Skeleton version %s does not match runtime version %s", skeletonData->version, SPINE_VERSION_STRING);
+			snprintf(errorMsg, 255, "Skeleton version %s does not match runtime version %s", skeletonData->version, SPINE_VERSION_STRING);
 			_spSkeletonJson_setError(self, 0, errorMsg, NULL);
 			return NULL;
 		}

diff --git a/spine-c/spine-c/src/spine/Triangulator.c b/spine-c/spine-c/src/spine/Triangulator.c
@@ -31,7 +31,7 @@
 #include <spine/extension.h>
 #include <stdio.h>
 
-spTriangulator *spTriangulator_create() {
+spTriangulator *spTriangulator_create(void) {
 	spTriangulator *triangulator = CALLOC(spTriangulator, 1);
 
 	triangulator->convexPolygons = spArrayFloatArray_create(16);

diff --git a/spine-c/spine-c/src/spine/extension.c b/spine-c/spine-c/src/spine/extension.c
@@ -30,7 +30,7 @@
 #include <spine/extension.h>
 #include <stdio.h>
 
-float _spInternalRandom() {
+float _spInternalRandom(void) {
 	return rand() / (float) RAND_MAX;
 }
 
@@ -42,7 +42,7 @@ static void *(*debugMallocFunc)(size_t size, const char *file, int line) = NULL;
 
 static void (*freeFunc)(void *ptr) = free;
 
-static float (*randomFunc)() = _spInternalRandom;
+static float (*randomFunc)(void) = _spInternalRandom;
 
 void *_spMalloc(size_t size, const char *file, int line) {
 	if (debugMallocFunc)
@@ -65,7 +65,7 @@ void _spFree(void *ptr) {
 	freeFunc(ptr);
 }
 
-float _spRandom() {
+float _spRandom(void) {
 	return randomFunc();
 }
 
@@ -85,7 +85,7 @@ void _spSetFree(void (*free)(void *ptr)) {
 	freeFunc = free;
 }
 
-void _spSetRandom(float (*random)()) {
+void _spSetRandom(float (*random)(void)) {
 	randomFunc = random;
 }
 

diff --git a/spine-cpp/spine-cpp/include/spine/CurveTimeline.h b/spine-cpp/spine-cpp/include/spine/CurveTimeline.h
@@ -76,6 +76,14 @@ namespace spine {
 
 		float getCurveValue(float time);
 
+        float getRelativeValue(float time, float alpha, MixBlend blend, float current, float setup);
+
+        float getAbsoluteValue(float time, float alpha, MixBlend blend, float current, float setup);
+
+        float getAbsoluteValue (float time, float alpha, MixBlend blend, float current, float setup, float value);
+
+        float getScaleValue (float time, float alpha, MixBlend blend, MixDirection direction, float current, float setup);
+
 	protected:
 		static const int ENTRIES = 2;
 		static const int VALUE = 1;

diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h b/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h
@@ -51,12 +51,12 @@ namespace spine {
 		/// Sets the time, mix and bend direction of the specified keyframe.
 		void setFrame(int frame, float time, float mix, float softness, int bendDirection, bool compress, bool stretch);
 
-		int getIkConstraintIndex() { return _ikConstraintIndex; }
+		int getIkConstraintIndex() { return _constraintIndex; }
 
-		void setIkConstraintIndex(int inValue) { _ikConstraintIndex = inValue; }
+		void setIkConstraintIndex(int inValue) { _constraintIndex = inValue; }
 
 	private:
-		int _ikConstraintIndex;
+		int _constraintIndex;
 
 		static const int ENTRIES = 6;
 		static const int MIX = 1;

diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
@@ -33,7 +33,6 @@
 #include <spine/CurveTimeline.h>
 
 namespace spine {
-#define SP_PATHCONSTRAINTMIXTIMELINE_ENTRIES 5
 
 	class SP_API PathConstraintMixTimeline : public CurveTimeline {
 		friend class SkeletonBinary;
@@ -52,12 +51,12 @@ namespace spine {
 		/// Sets the time and mixes of the specified keyframe.
 		void setFrame(int frameIndex, float time, float mixRotate, float mixX, float mixY);
 
-		int getPathConstraintIndex() { return _pathConstraintIndex; }
+		int getPathConstraintIndex() { return _constraintIndex; }
 
-		void setPathConstraintIndex(int inValue) { _pathConstraintIndex = inValue; }
+		void setPathConstraintIndex(int inValue) { _constraintIndex = inValue; }
 
 	private:
-		int _pathConstraintIndex;
+		int _constraintIndex;
 
 		static const int ENTRIES = 4;
 		static const int ROTATE = 1;

diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h
@@ -52,12 +52,12 @@ namespace spine {
 		apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend,
 			  MixDirection direction);
 
-		int getPathConstraintIndex() { return _pathConstraintIndex; }
+		int getPathConstraintIndex() { return _constraintIndex; }
 
-		void setPathConstraintIndex(int inValue) { _pathConstraintIndex = inValue; }
+		void setPathConstraintIndex(int inValue) { _constraintIndex = inValue; }
 
 	protected:
-		int _pathConstraintIndex;
+		int _constraintIndex;
 	};
 }