Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[deploy] fix SpriteFrame::Split

This commit is contained in:
Nomango 2022-06-23 15:16:48 +08:00
parent 44abd8f220
commit b829d724c5
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/kiwano/kiwano.vcxproj
View File

@ -142,7 +142,7 @@
<ClCompile Include="..\..\src\kiwano\2d\ShapeActor.cpp" /> <ClCompile Include="..\..\src\kiwano\2d\ShapeActor.cpp" />
<ClCompile Include="..\..\src\kiwano\2d\GifSprite.cpp" /> <ClCompile Include="..\..\src\kiwano\2d\GifSprite.cpp" />
<ClCompile Include="..\..\src\kiwano\2d\LayerActor.cpp" /> <ClCompile Include="..\..\src\kiwano\2d\LayerActor.cpp" />
<ClCompile Include="..\..\src\kiwano\2d\SpriteFrame.h.cpp" /> <ClCompile Include="..\..\src\kiwano\2d\SpriteFrame.cpp" />
<ClCompile Include="..\..\src\kiwano\2d\Stage.cpp" /> <ClCompile Include="..\..\src\kiwano\2d\Stage.cpp" />
<ClCompile Include="..\..\src\kiwano\2d\Sprite.cpp" /> <ClCompile Include="..\..\src\kiwano\2d\Sprite.cpp" />
<ClCompile Include="..\..\src\kiwano\2d\TextActor.cpp" /> <ClCompile Include="..\..\src\kiwano\2d\TextActor.cpp" />

2
projects/kiwano/kiwano.vcxproj.filters
View File

@ -641,7 +641,7 @@
<ClCompile Include="..\..\src\kiwano\2d\animation\FrameSequence.cpp"> <ClCompile Include="..\..\src\kiwano\2d\animation\FrameSequence.cpp">
<Filter>2d\animation</Filter> <Filter>2d\animation</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kiwano\2d\SpriteFrame.h.cpp"> <ClCompile Include="..\..\src\kiwano\2d\SpriteFrame.cpp">
<Filter>2d</Filter> <Filter>2d</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kiwano\2d\transition\Transition.cpp"> <ClCompile Include="..\..\src\kiwano\2d\transition\Transition.cpp">

5
src/kiwano/2d/SpriteFrame.h.cpp → src/kiwano/2d/SpriteFrame.cpp
View File

@ -126,10 +126,13 @@ Vector<SpriteFrame> SpriteFrame::Split(int cols, int rows, int max_num, float pa
++current_num; ++current_num;
dtx += (width + padding_x); dtx += (width + padding_x);
if (max_num > 0 && current_num >= max_num)
break;
} }
dty += (height + padding_y); dty += (height + padding_y);
if (max_num > 0 && current_num == max_num) if (max_num > 0 && current_num >= max_num)
break; break;
} }
return frames; return frames;