From b829d724c58d87454db01e43e25ec0001dd130ee Mon Sep 17 00:00:00 2001 From: Nomango Date: Thu, 23 Jun 2022 15:16:48 +0800 Subject: [PATCH] [deploy] fix SpriteFrame::Split --- projects/kiwano/kiwano.vcxproj | 2 +- projects/kiwano/kiwano.vcxproj.filters | 2 +- src/kiwano/2d/{SpriteFrame.h.cpp => SpriteFrame.cpp} | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) rename src/kiwano/2d/{SpriteFrame.h.cpp => SpriteFrame.cpp} (96%) diff --git a/projects/kiwano/kiwano.vcxproj b/projects/kiwano/kiwano.vcxproj index 56a87356..6bfacbde 100644 --- a/projects/kiwano/kiwano.vcxproj +++ b/projects/kiwano/kiwano.vcxproj @@ -142,7 +142,7 @@ - + diff --git a/projects/kiwano/kiwano.vcxproj.filters b/projects/kiwano/kiwano.vcxproj.filters index 5e622aef..a915dc60 100644 --- a/projects/kiwano/kiwano.vcxproj.filters +++ b/projects/kiwano/kiwano.vcxproj.filters @@ -641,7 +641,7 @@ 2d\animation - + 2d diff --git a/src/kiwano/2d/SpriteFrame.h.cpp b/src/kiwano/2d/SpriteFrame.cpp similarity index 96% rename from src/kiwano/2d/SpriteFrame.h.cpp rename to src/kiwano/2d/SpriteFrame.cpp index 1fb6716c..0d1d37a7 100644 --- a/src/kiwano/2d/SpriteFrame.h.cpp +++ b/src/kiwano/2d/SpriteFrame.cpp @@ -126,10 +126,13 @@ Vector SpriteFrame::Split(int cols, int rows, int max_num, float pa ++current_num; dtx += (width + padding_x); + + if (max_num > 0 && current_num >= max_num) + break; } dty += (height + padding_y); - if (max_num > 0 && current_num == max_num) + if (max_num > 0 && current_num >= max_num) break; } return frames;