diff --git a/spine-cocos2dx/example/Classes/AppDelegate.cpp b/spine-cocos2dx/example/Classes/AppDelegate.cpp index 711327a54..73f22b75e 100644 --- a/spine-cocos2dx/example/Classes/AppDelegate.cpp +++ b/spine-cocos2dx/example/Classes/AppDelegate.cpp @@ -39,6 +39,7 @@ #include "SkeletonRendererSeparatorExample.h" #include #include "AppMacros.h" +#include USING_NS_CC; using namespace std; @@ -49,6 +50,8 @@ AppDelegate::AppDelegate () { } AppDelegate::~AppDelegate () { + SkeletonBatch::destroyInstance(); + SkeletonTwoColorBatch::destroyInstance(); debugExtension.reportLeaks(); } diff --git a/spine-cocos2dx/example/Classes/CoinExample.cpp b/spine-cocos2dx/example/Classes/CoinExample.cpp index 2c2718cf2..bc8e3d6e5 100644 --- a/spine-cocos2dx/example/Classes/CoinExample.cpp +++ b/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); diff --git a/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj b/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj index 3711efd27..b0532496a 100644 --- a/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj +++ b/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj @@ -72,7 +72,7 @@ Disabled - $(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) + $(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) 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) false EnableFastChecks @@ -145,43 +145,68 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -189,28 +214,108 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + diff --git a/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj.filters b/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj.filters index 78febbba7..2cb17e876 100644 --- a/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj.filters +++ b/spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj.filters @@ -21,30 +21,9 @@ win32 - - src - - - src - - - src - - - src - - - src - - - src - spine-cocos2dx - - spine-cocos2dx - spine-cocos2dx @@ -54,149 +33,227 @@ spine-cocos2dx + + spine-cocos2dx + spine-cocos2dx - + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + src - - spine + + src - - spine + + src - - spine + + src - - spine + + src - - spine + + src - - spine + + src - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine-cocos2dx + + src win32 - - src - - - src - - - src - - - src - - - src - - - src - - - src - spine-cocos2dx - - spine-cocos2dx - spine-cocos2dx @@ -206,16 +263,277 @@ spine-cocos2dx + + spine-cocos2dx + spine-cocos2dx + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + src - + spine - + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + + spine + + spine diff --git a/spine-cocos2dx/src/spine/SkeletonBatch.cpp b/spine-cocos2dx/src/spine/SkeletonBatch.cpp index 2a6b1231b..855a9af35 100644 --- a/spine-cocos2dx/src/spine/SkeletonBatch.cpp +++ b/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; } diff --git a/spine-cocos2dx/src/spine/SkeletonTwoColorBatch.cpp b/spine-cocos2dx/src/spine/SkeletonTwoColorBatch.cpp index 86f2d60a9..b370ed875 100644 --- a/spine-cocos2dx/src/spine/SkeletonTwoColorBatch.cpp +++ b/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; } diff --git a/spine-cocos2dx/src/spine/spine-cocos2dx.cpp b/spine-cocos2dx/src/spine/spine-cocos2dx.cpp index 2d52e0c09..8a2c78bcb 100644 --- a/spine-cocos2dx/src/spine/spine-cocos2dx.cpp +++ b/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; diff --git a/spine-cpp/spine-cpp/include/spine/SpineObject.h b/spine-cpp/spine-cpp/include/spine/SpineObject.h index 53c9b72d2..7dde2b975 100644 --- a/spine-cpp/spine-cpp/include/spine/SpineObject.h +++ b/spine-cpp/spine-cpp/include/spine/SpineObject.h @@ -32,7 +32,7 @@ #define Spine_Object_h #include -#include +#include namespace spine { class String; diff --git a/spine-cpp/spine-cpp/src/spine/MathUtil.cpp b/spine-cpp/spine-cpp/src/spine/MathUtil.cpp index 3a3136ef4..fab2ef3a3 100644 --- a/spine-cpp/spine-cpp/src/spine/MathUtil.cpp +++ b/spine-cpp/spine-cpp/src/spine/MathUtil.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include using namespace spine;