[cocos2dx] Fixed batchers, MSVC projects.

spine-cocos2dx/example/Classes/AppDelegate.cpp

@@ -39,6 +39,7 @@
 #include "SkeletonRendererSeparatorExample.h"
 #include <spine/Debug.h>
 #include "AppMacros.h"
+#include <spine/SkeletonTwoColorBatch.h>
 
 USING_NS_CC;
 using namespace std;
@@ -49,6 +50,8 @@ AppDelegate::AppDelegate () {
 }
 
 AppDelegate::~AppDelegate () {
+	SkeletonBatch::destroyInstance();
+	SkeletonTwoColorBatch::destroyInstance();
 	debugExtension.reportLeaks();
 }
 

spine-cocos2dx/example/Classes/CoinExample.cpp

@@ -45,7 +45,7 @@ bool CoinExample::init () {
 
 	skeletonNode = SkeletonAnimation::createWithBinaryFile("coin-pro.skel", "coin.atlas", 1);
 	skeletonNode->setAnimation(0, "rotate", true);
-	skeletonNode->setTwoColorTint(true);
+	// skeletonNode->setTwoColorTint(true);
 	
 	skeletonNode->setPosition(Vec2(_contentSize.width / 2, 100));
 	addChild(skeletonNode);

spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj

@@ -72,7 +72,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(EngineRoot)external;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\Classes;..;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END);$(SolutionDir)..\..\..\spine-c\spine-c\include;$(SolutionDir)..\..\src;$(IncludePath)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(EngineRoot)external;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\Classes;..;%(AdditionalIncludeDirectories);$(_COCOS_HEADER_WIN32_BEGIN);$(_COCOS_HEADER_WIN32_END);$(SolutionDir)..\..\..\spine-cpp\spine-cpp\include;$(SolutionDir)..\..\src;$(IncludePath)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -145,43 +145,68 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y
     </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Animation.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\AnimationState.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\AnimationStateData.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Atlas.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\AtlasAttachmentLoader.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Attachment.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\AttachmentLoader.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Bone.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\BoneData.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\BoundingBoxAttachment.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Color.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Event.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\EventData.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\extension.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\IkConstraint.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\IkConstraintData.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Json.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\MeshAttachment.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\PathAttachment.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\PathConstraint.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\PathConstraintData.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\PointAttachment.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\RegionAttachment.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Skeleton.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\SkeletonBinary.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\SkeletonBounds.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\SkeletonData.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\SkeletonJson.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Skin.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Slot.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\SlotData.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\TransformConstraint.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\TransformConstraintData.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\VertexAttachment.c" />
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\VertexEffect.c" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Animation.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\AnimationState.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\AnimationStateData.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Atlas.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\AtlasAttachmentLoader.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Attachment.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\AttachmentLoader.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\AttachmentTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Bone.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\BoneData.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\BoundingBoxAttachment.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\ClippingAttachment.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\ColorTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Constraint.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\CurveTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\DeformTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\DrawOrderTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Event.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\EventData.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\EventTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Extension.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\IkConstraint.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\IkConstraintData.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\IkConstraintTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Json.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\LinkedMesh.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\MathUtil.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\MeshAttachment.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PathAttachment.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PathConstraint.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PathConstraintData.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PathConstraintMixTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PathConstraintPositionTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PathConstraintSpacingTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PointAttachment.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\RegionAttachment.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\RotateTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\RTTI.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\ScaleTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\ShearTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Skeleton.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SkeletonBinary.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SkeletonBounds.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SkeletonClipping.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SkeletonData.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SkeletonJson.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Skin.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Slot.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SlotData.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SpineObject.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\TextureLoader.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Timeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\TransformConstraint.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\TransformConstraintData.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\TransformConstraintTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\TranslateTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Triangulator.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\TwoColorTimeline.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Updatable.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\VertexAttachment.cpp" />
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\VertexEffect.cpp" />
     <ClCompile Include="..\..\src\spine\AttachmentVertices.cpp" />
-    <ClCompile Include="..\..\src\spine\Cocos2dAttachmentLoader.cpp" />
     <ClCompile Include="..\..\src\spine\SkeletonAnimation.cpp" />
     <ClCompile Include="..\..\src\spine\SkeletonBatch.cpp" />
     <ClCompile Include="..\..\src\spine\SkeletonRenderer.cpp" />
@@ -189,28 +214,108 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y
     <ClCompile Include="..\..\src\spine\spine-cocos2dx.cpp" />
     <ClCompile Include="..\Classes\AppDelegate.cpp" />
     <ClCompile Include="..\Classes\BatchingExample.cpp" />
+    <ClCompile Include="..\Classes\CoinExample.cpp" />
     <ClCompile Include="..\Classes\GoblinsExample.cpp" />
     <ClCompile Include="..\Classes\RaptorExample.cpp" />
-    <ClCompile Include="..\Classes\SimpleCommand.cpp" />
+    <ClCompile Include="..\Classes\SkeletonRendererSeparatorExample.cpp" />
     <ClCompile Include="..\Classes\SpineboyExample.cpp" />
     <ClCompile Include="..\Classes\TankExample.cpp" />
     <ClCompile Include="main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\spine-c\spine-c\src\spine\Json.h" />
-    <ClInclude Include="..\..\..\spine-c\spine-c\src\spine\kvec.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Animation.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\AnimationState.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\AnimationStateData.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Atlas.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\AtlasAttachmentLoader.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Attachment.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\AttachmentLoader.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\AttachmentTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\AttachmentType.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\BlendMode.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Bone.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\BoneData.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\BoundingBoxAttachment.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\ClippingAttachment.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Color.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\ColorTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Constraint.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\ContainerUtil.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\CurveTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Debug.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\DeformTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\DrawOrderTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Event.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\EventData.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\EventTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Extension.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\HashMap.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\HasRendererObject.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\IkConstraint.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\IkConstraintData.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\IkConstraintTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Json.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\LinkedMesh.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\MathUtil.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\MeshAttachment.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\MixBlend.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\MixDirection.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PathAttachment.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PathConstraint.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PathConstraintData.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PathConstraintMixTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PathConstraintPositionTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PathConstraintSpacingTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PointAttachment.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Pool.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PositionMode.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\RegionAttachment.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\RotateMode.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\RotateTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\RTTI.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\ScaleTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\ShearTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Skeleton.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SkeletonBinary.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SkeletonBounds.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SkeletonClipping.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SkeletonData.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SkeletonJson.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Skin.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Slot.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SlotData.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SpacingMode.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\spine.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SpineObject.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\String.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TextureLoader.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Timeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TimelineType.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TransformConstraint.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TransformConstraintData.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TransformConstraintTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TransformMode.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TranslateTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Triangulator.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TwoColorTimeline.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Updatable.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Vector.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\VertexAttachment.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\VertexEffect.h" />
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Vertices.h" />
     <ClInclude Include="..\..\src\spine\AttachmentVertices.h" />
-    <ClInclude Include="..\..\src\spine\Cocos2dAttachmentLoader.h" />
     <ClInclude Include="..\..\src\spine\SkeletonAnimation.h" />
     <ClInclude Include="..\..\src\spine\SkeletonBatch.h" />
     <ClInclude Include="..\..\src\spine\SkeletonRenderer.h" />
+    <ClInclude Include="..\..\src\spine\SkeletonTwoColorBatch.h" />
     <ClInclude Include="..\..\src\spine\spine-cocos2dx.h" />
     <ClInclude Include="..\Classes\AppDelegate.h" />
     <ClInclude Include="..\Classes\AppMacros.h" />
     <ClInclude Include="..\Classes\BatchingExample.h" />
+    <ClInclude Include="..\Classes\CoinExample.h" />
     <ClInclude Include="..\Classes\GoblinsExample.h" />
     <ClInclude Include="..\Classes\RaptorExample.h" />
-    <ClInclude Include="..\Classes\SimpleCommand.h" />
+    <ClInclude Include="..\Classes\SkeletonRendererSeparatorExample.h" />
     <ClInclude Include="..\Classes\SpineboyExample.h" />
     <ClInclude Include="..\Classes\TankExample.h" />
     <ClInclude Include="main.h" />

spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj.filters

@@ -21,30 +21,9 @@
     <ClCompile Include="main.cpp">
       <Filter>win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\Classes\AppDelegate.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\BatchingExample.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\GoblinsExample.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\RaptorExample.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\SimpleCommand.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\SpineboyExample.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\spine\AttachmentVertices.cpp">
       <Filter>spine-cocos2dx</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\spine\Cocos2dAttachmentLoader.cpp">
-      <Filter>spine-cocos2dx</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\spine\SkeletonAnimation.cpp">
       <Filter>spine-cocos2dx</Filter>
     </ClCompile>
@@ -54,122 +33,242 @@
     <ClCompile Include="..\..\src\spine\SkeletonRenderer.cpp">
       <Filter>spine-cocos2dx</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\spine\SkeletonTwoColorBatch.cpp">
+      <Filter>spine-cocos2dx</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\spine\spine-cocos2dx.cpp">
       <Filter>spine-cocos2dx</Filter>
     </ClCompile>
-    <ClCompile Include="..\Classes\TankExample.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Animation.cpp">
+      <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Animation.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\AnimationState.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\AnimationState.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\AnimationStateData.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\AnimationStateData.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Atlas.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Atlas.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\AtlasAttachmentLoader.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\AtlasAttachmentLoader.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Attachment.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Attachment.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\AttachmentLoader.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\AttachmentLoader.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\AttachmentTimeline.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Bone.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Bone.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\BoneData.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\BoneData.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\BoundingBoxAttachment.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\BoundingBoxAttachment.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Event.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\ClippingAttachment.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\EventData.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\ColorTimeline.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\extension.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Constraint.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\IkConstraint.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\CurveTimeline.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\IkConstraintData.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\DeformTimeline.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Json.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\DrawOrderTimeline.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\MeshAttachment.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Event.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\PathAttachment.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\EventData.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\PathConstraint.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\EventTimeline.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\PathConstraintData.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Extension.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\RegionAttachment.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\IkConstraint.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Skeleton.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\IkConstraintData.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\SkeletonBinary.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\IkConstraintTimeline.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\SkeletonBounds.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Json.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\SkeletonData.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\LinkedMesh.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\SkeletonJson.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\MathUtil.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Skin.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\MeshAttachment.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Slot.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PathAttachment.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\SlotData.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PathConstraint.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\TransformConstraint.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PathConstraintData.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\TransformConstraintData.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PathConstraintMixTimeline.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\VertexAttachment.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PathConstraintPositionTimeline.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\Color.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PathConstraintSpacingTimeline.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\spine-c\spine-c\src\spine\PointAttachment.c">
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\PointAttachment.cpp">
       <Filter>spine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\spine\SkeletonTwoColorBatch.cpp">
-      <Filter>spine-cocos2dx</Filter>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\RegionAttachment.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\RotateTimeline.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\RTTI.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\ScaleTimeline.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\ShearTimeline.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Skeleton.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SkeletonBinary.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SkeletonBounds.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SkeletonClipping.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SkeletonData.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SkeletonJson.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Skin.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Slot.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SlotData.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\SpineObject.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\TextureLoader.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Timeline.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\TransformConstraint.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\TransformConstraintData.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\TransformConstraintTimeline.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\TranslateTimeline.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Triangulator.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\TwoColorTimeline.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Updatable.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\VertexAttachment.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\VertexEffect.cpp">
+      <Filter>spine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\AppDelegate.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\BatchingExample.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\CoinExample.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\GoblinsExample.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\RaptorExample.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\SkeletonRendererSeparatorExample.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\SpineboyExample.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\TankExample.cpp">
+      <Filter>src</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="main.h">
       <Filter>win32</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\spine\AttachmentVertices.h">
+      <Filter>spine-cocos2dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spine\SkeletonAnimation.h">
+      <Filter>spine-cocos2dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spine\SkeletonBatch.h">
+      <Filter>spine-cocos2dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spine\SkeletonRenderer.h">
+      <Filter>spine-cocos2dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spine\SkeletonTwoColorBatch.h">
+      <Filter>spine-cocos2dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\spine\spine-cocos2dx.h">
+      <Filter>spine-cocos2dx</Filter>
+    </ClInclude>
     <ClInclude Include="..\Classes\AppDelegate.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -179,43 +278,262 @@
     <ClInclude Include="..\Classes\BatchingExample.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\Classes\CoinExample.h">
+      <Filter>src</Filter>
+    </ClInclude>
     <ClInclude Include="..\Classes\GoblinsExample.h">
       <Filter>src</Filter>
     </ClInclude>
     <ClInclude Include="..\Classes\RaptorExample.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\Classes\SimpleCommand.h">
+    <ClInclude Include="..\Classes\SkeletonRendererSeparatorExample.h">
       <Filter>src</Filter>
     </ClInclude>
     <ClInclude Include="..\Classes\SpineboyExample.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spine\AttachmentVertices.h">
-      <Filter>spine-cocos2dx</Filter>
+    <ClInclude Include="..\Classes\TankExample.h">
+      <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spine\Cocos2dAttachmentLoader.h">
-      <Filter>spine-cocos2dx</Filter>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Animation.h">
+      <Filter>spine</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spine\SkeletonAnimation.h">
-      <Filter>spine-cocos2dx</Filter>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\AnimationState.h">
+      <Filter>spine</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spine\SkeletonBatch.h">
-      <Filter>spine-cocos2dx</Filter>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\AnimationStateData.h">
+      <Filter>spine</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spine\SkeletonRenderer.h">
-      <Filter>spine-cocos2dx</Filter>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Atlas.h">
+      <Filter>spine</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\spine\spine-cocos2dx.h">
-      <Filter>spine-cocos2dx</Filter>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\AtlasAttachmentLoader.h">
+      <Filter>spine</Filter>
     </ClInclude>
-    <ClInclude Include="..\Classes\TankExample.h">
-      <Filter>src</Filter>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Attachment.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\AttachmentLoader.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\AttachmentTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\AttachmentType.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\BlendMode.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Bone.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\BoneData.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\BoundingBoxAttachment.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\ClippingAttachment.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Color.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\ColorTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Constraint.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\ContainerUtil.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\CurveTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Debug.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\DeformTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\DrawOrderTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Event.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\EventData.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\EventTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Extension.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\HashMap.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\HasRendererObject.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\IkConstraint.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\IkConstraintData.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\IkConstraintTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Json.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\LinkedMesh.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\MathUtil.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\MeshAttachment.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\MixBlend.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\MixDirection.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PathAttachment.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PathConstraint.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PathConstraintData.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PathConstraintMixTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PathConstraintPositionTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PathConstraintSpacingTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PointAttachment.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Pool.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\PositionMode.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\RegionAttachment.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\RotateMode.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\RotateTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\RTTI.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\ScaleTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\ShearTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Skeleton.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SkeletonBinary.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SkeletonBounds.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SkeletonClipping.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SkeletonData.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SkeletonJson.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Skin.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Slot.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SlotData.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SpacingMode.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\spine.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\SpineObject.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\String.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TextureLoader.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Timeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TimelineType.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TransformConstraint.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TransformConstraintData.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TransformConstraintTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TransformMode.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TranslateTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Triangulator.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\TwoColorTimeline.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Updatable.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Vector.h">
+      <Filter>spine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\VertexAttachment.h">
+      <Filter>spine</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\spine-c\spine-c\src\spine\Json.h">
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\VertexEffect.h">
       <Filter>spine</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\spine-c\spine-c\src\spine\kvec.h">
+    <ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Vertices.h">
       <Filter>spine</Filter>
     </ClInclude>
   </ItemGroup>

spine-cocos2dx/src/spine/SkeletonBatch.cpp

@@ -106,7 +106,7 @@ unsigned short* SkeletonBatch::allocateIndices(uint32_t numIndices) {
 	if (_indices.getCapacity() - _indices.size() < numIndices) {
 		unsigned short* oldData = _indices.buffer();
 		int oldSize = _indices.size();
-		_indices.setSize(_indices.size() + numIndices, 0);
+		_indices.ensureCapacity(_indices.size() + numIndices);
 		unsigned short* newData = _indices.buffer();
 		for (uint32_t i = 0; i < this->_nextFreeCommand; i++) {
 			TrianglesCommand* command = _commandsPool[i];
@@ -117,7 +117,8 @@ unsigned short* SkeletonBatch::allocateIndices(uint32_t numIndices) {
 		}
 	}
 	
-	unsigned short* indices = _indices.buffer() + _indices.size() - numIndices;
+	unsigned short* indices = _indices.buffer() + _indices.size();
+	_indices.setSize(_indices.size() + numIndices, 0);
 	return indices;
 }
 

spine-cocos2dx/src/spine/SkeletonTwoColorBatch.cpp

@@ -163,7 +163,7 @@ void SkeletonTwoColorBatch::destroyInstance () {
 	}
 }
 
-SkeletonTwoColorBatch::SkeletonTwoColorBatch () {
+SkeletonTwoColorBatch::SkeletonTwoColorBatch () : _vertexBuffer(0), _indexBuffer(0) {
 	for (unsigned int i = 0; i < INITIAL_SIZE; i++) {
 		_commandsPool.push_back(new TwoColorTrianglesCommand());
 	}
@@ -198,8 +198,8 @@ SkeletonTwoColorBatch::~SkeletonTwoColorBatch () {
 		_commandsPool[i] = nullptr;
 	}
 	_twoColorTintShader->release();
-	delete _vertexBuffer;
-	delete _indexBuffer;
+	delete[] _vertexBuffer;
+	delete[] _indexBuffer;
 }
 
 void SkeletonTwoColorBatch::update (float delta) {	
@@ -233,7 +233,7 @@ unsigned short* SkeletonTwoColorBatch::allocateIndices(uint32_t numIndices) {
 	if (_indices.getCapacity() - _indices.size() < numIndices) {
 		unsigned short* oldData = _indices.buffer();
 		int oldSize =_indices.size();
-		_indices.setSize(_indices.size() + numIndices, 0);
+		_indices.ensureCapacity(_indices.size() + numIndices);
 		unsigned short* newData = _indices.buffer();
 		for (uint32_t i = 0; i < this->_nextFreeCommand; i++) {
 			TwoColorTrianglesCommand* command = _commandsPool[i];
@@ -244,7 +244,8 @@ unsigned short* SkeletonTwoColorBatch::allocateIndices(uint32_t numIndices) {
 		}
 	}
 	
-	unsigned short* indices = _indices.buffer() + _indices.size() - numIndices;
+	unsigned short* indices = _indices.buffer() + _indices.size();
+	_indices.setSize(_indices.size() + numIndices, 0);
 	return indices;
 }
 

spine-cocos2dx/src/spine/spine-cocos2dx.cpp

@@ -110,7 +110,7 @@ static void unloadTexture (void* texture) {
 	((Texture2D*)texture)->release();
 }
 
-void Cocos2dTextureLoader::load(AtlasPage& page, const String& path) {
+void Cocos2dTextureLoader::load(AtlasPage& page, const spine::String& path) {
 	Texture2D* texture = Director::getInstance()->getTextureCache()->addImage(path.buffer());
 	CCASSERT(texture != nullptr, "Invalid image");
 	texture->retain();
@@ -132,7 +132,7 @@ Cocos2dExtension::Cocos2dExtension() : DefaultSpineExtension() { }
 	
 Cocos2dExtension::~Cocos2dExtension() { }
 
-char *Cocos2dExtension::_readFile(const String &path, int *length) {
+char *Cocos2dExtension::_readFile(const spine::String &path, int *length) {
 	Data data = FileUtils::getInstance()->getDataFromFile(FileUtils::getInstance()->fullPathForFilename(path.buffer()));
 	if (data.isNull()) return 0;
 	

spine-cpp/spine-cpp/include/spine/SpineObject.h

@@ -32,7 +32,7 @@
 #define Spine_Object_h
 
 #include <new>
-#include <cstddef>
+#include <stddef.h>
 
 namespace spine {
 class String;

spine-cpp/spine-cpp/src/spine/MathUtil.cpp

@@ -31,7 +31,7 @@
 #include <spine/MathUtil.h>
 #include <math.h>
 #include <random>
-#include <cstdlib>
+#include <stdlib.h>
 
 using namespace spine;