UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-06 07:14:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix cocos2dx project and use of premultiplied alpha (#1484)

Browse Source 
* Fix project

* Take into account premultiplied alpha of cocos2dx texture
This commit is contained in:
Stefano Lanza 2019-09-10 14:11:58 +02:00 committed by Mario Zechner
parent 9483df76b5
commit df748dbe4b
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-cocos2dx/example/proj.win32/spine-cocos2d-x.vcxproj
View File

@ -153,7 +153,7 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y
<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\ConstraintData.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" />
@ -211,6 +211,7 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y
<ClCompile Include="..\Classes\BatchingExample.cpp" />
<ClCompile Include="..\Classes\CoinExample.cpp" />
<ClCompile Include="..\Classes\GoblinsExample.cpp" />
<ClCompile Include="..\Classes\MixAndMatchExample.cpp" />
<ClCompile Include="..\Classes\RaptorExample.cpp" />
<ClCompile Include="..\Classes\SkeletonRendererSeparatorExample.cpp" />
<ClCompile Include="..\Classes\SpineboyExample.cpp" />
@ -234,7 +235,6 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y
<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" />
@ -309,6 +309,7 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y
<ClInclude Include="..\Classes\BatchingExample.h" />
<ClInclude Include="..\Classes\CoinExample.h" />
<ClInclude Include="..\Classes\GoblinsExample.h" />
<ClInclude Include="..\Classes\MixAndMatchExample.h" />
<ClInclude Include="..\Classes\RaptorExample.h" />
<ClInclude Include="..\Classes\SkeletonRendererSeparatorExample.h" />
<ClInclude Include="..\Classes\SpineboyExample.h" />

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

@ -78,9 +78,6 @@
<ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\ColorTimeline.cpp">
<Filter>spine</Filter>
</ClCompile>
<ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\Constraint.cpp">
<Filter>spine</Filter>
</ClCompile>
<ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\CurveTimeline.cpp">
<Filter>spine</Filter>
</ClCompile>
@ -246,6 +243,12 @@
<ClCompile Include="..\Classes\TankExample.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\spine-cpp\spine-cpp\src\spine\ConstraintData.cpp">
<Filter>spine</Filter>
</ClCompile>
<ClCompile Include="..\Classes\MixAndMatchExample.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="main.h">
@ -344,9 +347,6 @@
<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>
@ -536,6 +536,9 @@
<ClInclude Include="..\..\..\spine-cpp\spine-cpp\include\spine\Vertices.h">
<Filter>spine</Filter>
</ClInclude>
<ClInclude Include="..\Classes\MixAndMatchExample.h">
<Filter>src</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="game.rc">

3
spine-cocos2dx/src/spine/SkeletonRenderer.cpp
View File

@ -434,7 +434,8 @@ namespace spine {
const cocos2d::Color4B color4B = ColorToColor4B(color);
const cocos2d::Color4B darkColor4B = ColorToColor4B(darkColor);
const BlendFunc blendFunc = makeBlendFunc(slot->getData().getBlendMode(), _premultipliedAlpha);
const BlendFunc blendFunc = makeBlendFunc(slot->getData().getBlendMode(), attachmentVertices->_texture->hasPremultipliedAlpha());
_blendFunc = blendFunc;
if (hasSingleTint) {
if (_clipper->isClipping()) {