Update to work with Axmol 2.1

Author: rh101

src/spine/SkeletonAnimation.h

@@ -57,11 +57,11 @@ namespace spine {
 		static SkeletonAnimation *createWithBinaryFile(const std::string &skeletonBinaryFile, const std::string &atlasFile, float scale = 1);
 
 		// Use createWithJsonFile instead
-		AX_DEPRECATED_ATTRIBUTE static SkeletonAnimation *createWithFile(const std::string &skeletonJsonFile, Atlas *atlas, float scale = 1) {
+		AX_DEPRECATED(2.1) static SkeletonAnimation *createWithFile(const std::string &skeletonJsonFile, Atlas *atlas, float scale = 1) {
 			return SkeletonAnimation::createWithJsonFile(skeletonJsonFile, atlas, scale);
 		}
 		// Use createWithJsonFile instead
-		AX_DEPRECATED_ATTRIBUTE static SkeletonAnimation *createWithFile(const std::string &skeletonJsonFile, const std::string &atlasFile, float scale = 1) {
+		AX_DEPRECATED(2.1) static SkeletonAnimation *createWithFile(const std::string &skeletonJsonFile, const std::string &atlasFile, float scale = 1) {
 			return SkeletonAnimation::createWithJsonFile(skeletonJsonFile, atlasFile, scale);
 		}
 

src/spine/SkeletonRenderer.cpp

@@ -31,7 +31,7 @@
 #include <spine/Extension.h>
 #include <spine/spine-axmol.h>
 
-USING_NS_AX;
+using namespace ax;
 
 namespace spine {
 
@@ -528,21 +528,19 @@ namespace spine {
 
 		// Draw bounding rectangle
 		if (_debugBoundingRect) {
-			drawNode->setLineWidth(2.0f);
 			const axmol::Rect brect = getBoundingBox();
 			const Vec2 points[4] =
 					{
 							brect.origin,
 							{brect.origin.x + brect.size.width, brect.origin.y},
 							{brect.origin.x + brect.size.width, brect.origin.y + brect.size.height},
 							{brect.origin.x, brect.origin.y + brect.size.height}};
-			drawNode->drawPoly(points, 4, true, Color4F::GREEN);
+			drawNode->drawPoly(points, 4, true, Color4B::GREEN, 2.0f);
 		}
 
 		if (_debugSlots) {
 			// Slots.
 			// DrawPrimitives::setDrawColor4B(0, 0, 255, 255);
-			drawNode->setLineWidth(2.0f);
 			V3F_C4B_T2F_Quad quad;
 			for (int i = 0, n = (int)_skeleton->getSlots().size(); i < n; i++) {
 				Slot *slot = _skeleton->getDrawOrder()[i];
@@ -563,33 +561,31 @@ namespace spine {
 								{worldVertices[2], worldVertices[3]},
 								{worldVertices[4], worldVertices[5]},
 								{worldVertices[6], worldVertices[7]}};
-				drawNode->drawPoly(points, 4, true, Color4F::BLUE);
+				drawNode->drawPoly(points, 4, true, Color4B::BLUE, 2.0f);
 			}
 		}
 
 		if (_debugBones) {
 			// Bone lengths.
-			drawNode->setLineWidth(2.0f);
 			for (int i = 0, n = (int)_skeleton->getBones().size(); i < n; i++) {
 				Bone *bone = _skeleton->getBones()[i];
 				if (!bone->isActive()) continue;
 				float x = bone->getData().getLength() * bone->getA() + bone->getWorldX();
 				float y = bone->getData().getLength() * bone->getC() + bone->getWorldY();
-				drawNode->drawLine(Vec2(bone->getWorldX(), bone->getWorldY()), Vec2(x, y), Color4F::RED);
+				drawNode->drawLine(Vec2(bone->getWorldX(), bone->getWorldY()), Vec2(x, y), Color4B::RED, 2.0f);
 			}
 			// Bone origins.
-			auto color = Color4F::BLUE;// Root bone is blue.
+			auto color = Color4B::BLUE;// Root bone is blue.
 			for (int i = 0, n = (int)_skeleton->getBones().size(); i < n; i++) {
 				Bone *bone = _skeleton->getBones()[i];
 				if (!bone->isActive()) continue;
 				drawNode->drawPoint(Vec2(bone->getWorldX(), bone->getWorldY()), 4, color);
-				if (i == 0) color = Color4F::GREEN;
+				if (i == 0) color = Color4B::GREEN;
 			}
 		}
 
 		if (_debugMeshes) {
 			// Meshes.
-			drawNode->setLineWidth(2.0f);
 			for (int i = 0, n = (int)_skeleton->getSlots().size(); i < n; ++i) {
 				Slot *slot = _skeleton->getDrawOrder()[i];
 				if (!slot->getBone().isActive()) continue;
@@ -607,7 +603,7 @@ namespace spine {
 									worldCoord + (idx0 * 2),
 									worldCoord + (idx1 * 2),
 									worldCoord + (idx2 * 2)};
-					drawNode->drawPoly(v, 3, true, Color4F::YELLOW);
+					drawNode->drawPoly(v, 3, true, Color4B::YELLOW, 2.0f);
 				}
 				VLA_FREE(worldCoord);
 			}