Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improves fix for issue #17119 (v3) (#17188)

This commit is contained in:
Ricardo Quesada 2017-01-15 17:30:08 -08:00 committed by minggo
parent 59403ad40d
commit 88a1cd73fa
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cocos/2d/CCSprite.cpp
View File

@ -669,7 +669,10 @@ void Sprite::updatePoly()
void Sprite::setCenterRectNormalized(const cocos2d::Rect &rectTopLeft)
{
CCASSERT(_renderMode == RenderMode::QUAD || _renderMode == RenderMode::SLICE9, "centerRect can only be used with SLICE9 or QUAD render modes");
if (_renderMode != RenderMode::QUAD && _renderMode != RenderMode::SLICE9) {
CCLOGWARN("Warning: Sprite::setCenterRectNormalized() only works with QUAD and SLICE9 render modes");
return;
}
// FIMXE: Rect is has origin on top-left (like text coordinate).
// but all the logic has been done using bottom-left as origin. So it is easier to invert Y
@ -716,7 +719,10 @@ void Sprite::setCenterRectNormalized(const cocos2d::Rect &rectTopLeft)
void Sprite::setCenterRect(const cocos2d::Rect &rectInPoints)
{
CCASSERT(_renderMode == RenderMode::QUAD || _renderMode == RenderMode::SLICE9, "centerRect can only be used with SLICE9 or QUAD render modes");
if (_renderMode != RenderMode::QUAD && _renderMode != RenderMode::SLICE9) {
CCLOGWARN("Warning: Sprite::setCenterRect() only works with QUAD and SLICE9 render modes");
return;
}
if (!_originalContentSize.equals(Size::ZERO))
{