Merge pull request cocos2d#14697 from super626/v3.10-fixsprite

fix setflip for batch sprite

Author: ricardoquesada

cocos/2d/CCSprite.cpp

@@ -578,15 +578,6 @@ void Sprite::updateTransform(void)
             float x2 = x1 + size.width;
             float y2 = y1 + size.height;
 
-            if (_flippedX)
-            {
-                std::swap(x1, x2);
-            }
-            if (_flippedY)
-            {
-                std::swap(y1, y2);
-            }
-            
             float x = _transformToBatch.m[12];
             float y = _transformToBatch.m[13];
 
@@ -610,6 +601,7 @@ void Sprite::updateTransform(void)
             _quad.br.vertices.set(SPRITE_RENDER_IN_SUBPIXEL(bx), SPRITE_RENDER_IN_SUBPIXEL(by), _positionZ);
             _quad.tl.vertices.set(SPRITE_RENDER_IN_SUBPIXEL(dx), SPRITE_RENDER_IN_SUBPIXEL(dy), _positionZ);
             _quad.tr.vertices.set(SPRITE_RENDER_IN_SUBPIXEL(cx), SPRITE_RENDER_IN_SUBPIXEL(cy), _positionZ);
+            setTextureCoords(_rect);
         }
 
         // MARMALADE CHANGE: ADDED CHECK FOR nullptr, TO PERMIT SPRITES WITH NO BATCH NODE / TEXTURE ATLAS

tests/cpp-tests/Classes/TileMapTest/TileMapTest.cpp

@@ -48,6 +48,7 @@ TileMapTests::TileMapTests()
     ADD_TEST_CASE(TMXBug987);
     ADD_TEST_CASE(TMXBug787);
     ADD_TEST_CASE(TMXGIDObjectsTest);
+    ADD_TEST_CASE(TMXFlipTest);
 }
 
 TileDemo::TileDemo()
@@ -1457,3 +1458,24 @@ std::string TMXGIDObjectsTest::subtitle() const
 {
     return "Tiles are created from an object group";
 }
+
+//------------------------------------------------------------------
+//
+// TMXFlipTest
+//
+//------------------------------------------------------------------
+TMXFlipTest::TMXFlipTest()
+{
+    auto map = TMXTiledMap::create("TileMaps/flip-test/flip-test.tmx");
+    addChild(map, -1, kTagTileMap);
+}
+
+std::string TMXFlipTest::title() const
+{
+    return "TMX With Flipped SpriteBatchNode";
+}
+
+std::string TMXFlipTest::subtitle() const
+{
+    return "There are tiles with Flipped SpriteBatchNode";
+}

tests/cpp-tests/Classes/TileMapTest/TileMapTest.h

@@ -323,4 +323,13 @@ class TMXGIDObjectsTest : public TileDemo
     virtual std::string subtitle() const override;    
 };
 
+class TMXFlipTest : public TileDemo
+{
+public:
+    CREATE_FUNC(TMXFlipTest);
+    TMXFlipTest();
+    virtual std::string title() const override;
+    virtual std::string subtitle() const override;
+};
+
 #endif