Forráskód Böngészése

[cpp][c] Fix warnings on Clang

Mario Zechner 1 hónapja
szülő
commit
a2c752d855

+ 2 - 2
spine-c/src/extensions.cpp

@@ -385,7 +385,7 @@ spine_animation_state_events spine_skeleton_drawable_get_animation_state_events(
 int32_t spine_animation_state_events_get_num_events(spine_animation_state_events events) {
 	if (!events) return 0;
 	EventListener *listener = (EventListener *) events;
-	return listener->events.size();
+	return (int32_t) listener->events.size();
 }
 
 int32_t spine_animation_state_events_get_event_type(spine_animation_state_events events, int32_t index) {
@@ -484,7 +484,7 @@ spine_skin_entries spine_skin_get_entries(spine_skin skin) {
 		int index = 0;
 		while (entries.hasNext()) {
 			Skin::AttachmentMap::Entry &entry = entries.next();
-			result->entries[index].slotIndex = entry._slotIndex;
+			result->entries[index].slotIndex = (int32_t) entry._slotIndex;
 			result->entries[index].name = SpineExtension::strdup(entry._name.buffer(), __FILE__, __LINE__);
 			result->entries[index].attachment = (spine_attachment) entry._attachment;
 			index++;

+ 1 - 1
spine-cpp/src/spine/PathConstraint.cpp

@@ -208,7 +208,7 @@ void PathConstraint::update(Skeleton &skeleton, Physics physics) {
 			bone->_c = sin * a + cos * c;
 			bone->_d = sin * b + cos * d;
 		}
-		bone->modifyWorld(u);
+		bone->modifyWorld((int) u);
 	}
 }
 

+ 4 - 4
spine-cpp/src/spine/SkeletonBinary.cpp

@@ -116,7 +116,7 @@ SkeletonData *SkeletonBinary::readSkeletonDataFile(const String &path) {
 		String nameWithoutExtension(filename);
 		const char *lastDot = strrchr(nameWithoutExtension.buffer(), '.');
 		if (lastDot) {
-			int length = lastDot - nameWithoutExtension.buffer();
+			int length = (int) (lastDot - nameWithoutExtension.buffer());
 			nameWithoutExtension = nameWithoutExtension.substring(0, length);
 		}
 		skeletonData->_name = nameWithoutExtension;
@@ -449,7 +449,7 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons
 
 		/* Skins. */
 		{
-			int i = skeletonData->_skins.size();
+			int i = (int) skeletonData->_skins.size();
 			Array<Skin *> &skins = skeletonData->_skins.setSize(n = i + input.readInt(true), NULL);
 			for (; i < n; i++) {
 				Skin *skin = readSkin(input, *skeletonData, false, nonessential);
@@ -464,7 +464,7 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons
 
 		/* Linked meshes. */
 		Array<LinkedMesh *> &items = _linkedMeshes;
-		for (int i = 0, n = items.size(); i < n; i++) {
+		for (int i = 0, n = (int) items.size(); i < n; i++) {
 			LinkedMesh *linkedMesh = items[i];
 			Skin *skin = skeletonData->_skins[linkedMesh->_skinIndex];
 			Attachment *parent = skin->getAttachment(linkedMesh->_slotIndex, linkedMesh->_parent);
@@ -692,7 +692,7 @@ Attachment *SkeletonBinary::readAttachment(DataInput &input, Skin &skin, int slo
 			int verticesLength = readVertices(input, vertices, bones, (flags & 64) != 0);
 			Array<float> lengths;
 			lengths.setSize(verticesLength / 6, 0);
-			for (int i = 0, n = lengths.size(); i < n; i++) lengths[i] = input.readFloat() * scale;
+			for (int i = 0, n = (int) lengths.size(); i < n; i++) lengths[i] = input.readFloat() * scale;
 			int color = nonessential ? input.readInt() : 0;
 
 			PathAttachment *path = _attachmentLoader->newPathAttachment(skin, name);

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

@@ -769,7 +769,7 @@ void SkeletonJson::readVertices(Json *map, VertexAttachment *attachment, size_t
 	Vertices bonesAndWeights;
 	bonesAndWeights._weights.ensureCapacity(verticesLength * 3 * 3);
 	bonesAndWeights._bones.ensureCapacity(verticesLength * 3);
-	for (int i = 0, n = vertices.size(); i < n;) {
+	for (int i = 0, n = (int) vertices.size(); i < n;) {
 		int boneCount = (int) vertices[i++];
 		bonesAndWeights._bones.add(boneCount);
 		for (int nn = i + (boneCount << 2); i < nn; i += 4) {
@@ -1324,7 +1324,7 @@ Animation *SkeletonJson::readAnimation(Json *map, SkeletonData *skeletonData) {
 	Json *drawOrder = Json::getItem(map, "drawOrder");
 	if (drawOrder) {
 		DrawOrderTimeline *timeline = new (__FILE__, __LINE__) DrawOrderTimeline(drawOrder->_size);
-		int slotCount = skeletonData->_slots.size();
+		int slotCount = (int) skeletonData->_slots.size();
 		int frame = 0;
 		for (Json *keyMap = drawOrder->_child; keyMap; keyMap = keyMap->_next, ++frame) {
 			Array<int> drawOrder2;