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

Fix polygon sprite bug of resetting flip and color information in setSpriteFrame. (#18085)

This commit is contained in:
Felippe Durán 2017-07-19 00:08:12 -03:00 committed by minggo
parent cdac595a68
commit 681e9aa752
2 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
cocos/2d/CCSprite.cpp
View File

@ -1433,23 +1433,7 @@ void Sprite::setFlippedX(bool flippedX)
if (_flippedX != flippedX)
{
_flippedX = flippedX;
if (_renderMode == RenderMode::QUAD_BATCHNODE)
{
setDirty(true);
}
else if (_renderMode == RenderMode::POLYGON)
{
for (ssize_t i = 0; i < _polyInfo.triangles.vertCount; i++) {
auto& v = _polyInfo.triangles.verts[i].vertices;
v.x = _contentSize.width -v.x;
}
}
else
{
// RenderMode:: Quad or Slice9
updatePoly();
}
flipX();
}
}
@ -1463,23 +1447,7 @@ void Sprite::setFlippedY(bool flippedY)
if (_flippedY != flippedY)
{
_flippedY = flippedY;
if (_renderMode == RenderMode::QUAD_BATCHNODE)
{
setDirty(true);
}
else if (_renderMode == RenderMode::POLYGON)
{
for (ssize_t i = 0; i < _polyInfo.triangles.vertCount; i++) {
auto& v = _polyInfo.triangles.verts[i].vertices;
v.y = _contentSize.height -v.y;
}
}
else
{
// RenderMode:: Quad or Slice9
updatePoly();
}
flipY();
}
}
@ -1488,6 +1456,44 @@ bool Sprite::isFlippedY(void) const
return _flippedY;
}
void Sprite::flipX() {
if (_renderMode == RenderMode::QUAD_BATCHNODE)
{
setDirty(true);
}
else if (_renderMode == RenderMode::POLYGON)
{
for (ssize_t i = 0; i < _polyInfo.triangles.vertCount; i++) {
auto& v = _polyInfo.triangles.verts[i].vertices;
v.x = _contentSize.width -v.x;
}
}
else
{
// RenderMode:: Quad or Slice9
updatePoly();
}
}
void Sprite::flipY() {
if (_renderMode == RenderMode::QUAD_BATCHNODE)
{
setDirty(true);
}
else if (_renderMode == RenderMode::POLYGON)
{
for (ssize_t i = 0; i < _polyInfo.triangles.vertCount; i++) {
auto& v = _polyInfo.triangles.verts[i].vertices;
v.y = _contentSize.height -v.y;
}
}
else
{
// RenderMode:: Quad or Slice9
updatePoly();
}
}
//
// MARK: RGBA protocol
//
@ -1591,6 +1597,9 @@ void Sprite::setSpriteFrame(SpriteFrame *spriteFrame)
{
_polyInfo = spriteFrame->getPolygonInfo();
_renderMode = RenderMode::POLYGON;
if (_flippedX) flipX();
if (_flippedY) flipY();
updateColor();
}
if (spriteFrame->hasAnchorPoint())
{

3
cocos/2d/CCSprite.h
View File

@ -661,6 +661,9 @@ protected:
void updatePoly();
void updateStretchFactor();
virtual void flipX();
virtual void flipY();
//
// Data used when the sprite is rendered using a SpriteSheet
//