Clipper2 1.5.4 (#2563)

This release fixes a bug that very occasionally caused an endless loop (see GitHub issues #735 & #979)

Author: aismann

3rdparty/clipper2/include/clipper2/clipper.version.h

@@ -1,6 +1,6 @@
 #ifndef CLIPPER_VERSION_H
 #define CLIPPER_VERSION_H
 
-constexpr auto CLIPPER2_VERSION = "1.5.3";
+constexpr auto CLIPPER2_VERSION = "1.5.4";
 
 #endif  // CLIPPER_VERSION_H

3rdparty/clipper2/src/clipper.engine.cpp

@@ -1,6 +1,6 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  4 May 2025                                                      *
+* Date      :  30 May 2025                                                     *
 * Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2025                                         *
 * Purpose   :  This is the main polygon clipping module                        *
@@ -2119,10 +2119,9 @@ namespace Clipper2Lib {
       e->prev_in_sel = e->prev_in_ael;
       e->next_in_sel = e->next_in_ael;
       e->jump = e->next_in_sel;
-      if (e->join_with == JoinWith::Left)
-        e->curr_x = e->prev_in_ael->curr_x; // also avoids complications
-      else
-        e->curr_x = TopX(*e, top_y);
+      // it is safe to ignore 'joined' edges here because
+      // if necessary they will be split in IntersectEdges()
+      e->curr_x = TopX(*e, top_y);
       e = e->next_in_ael;
     }
   }

tests/cpp-tests/Source/BugsTest/Bug-350.cpp

@@ -35,10 +35,44 @@ bool Bug350Layer::init()
 {
     if (BugsTestBase::init())
     {
-        auto size       = Director::getInstance()->getWinSize();
-        auto background = Sprite::create("Hello.png");
-        background->setPosition(size.width / 2, size.height / 2);
-        addChild(background);
+        // auto size       = Director::getInstance()->getWinSize();
+        // auto background = Sprite::create("Hello.png");
+        // background->setPosition(size.width / 2, size.height / 2);
+        // addChild(background);
+
+        auto visibleSize = Director::getInstance()->getVisibleSize();
+        Vec2 origin      = Director::getInstance()->getVisibleOrigin();
+
+        //    https:  // rezghob.com/different-sprite-types/
+
+        auto spriteCache = SpriteFrameCache::getInstance();
+        //      spriteCache->addSpriteFramesWithFile("sprites_quad.plist");
+        spriteCache->addSpriteFramesWithFile("sprites_poly.plist");
+
+        for (int i = 0; i < 10000; i++)
+        {
+            auto sprite1 = Sprite::createWithSpriteFrameName("PolySprite1.png");
+    //       sprite1->setPosition(origin.x + visibleSize.width / 2, origin.y + visibleSize.height / 2);
+            sprite1->setPosition(50*AXRANDOM_MINUS1_1() + origin.x + visibleSize.width / 2,
+                                 50*AXRANDOM_MINUS1_1() + origin.y + visibleSize.height / 2);
+            sprite1->setScale(5);
+            sprite1->setColor(Color3B::RED);
+            this->addChild(sprite1);
+
+            auto sprite2 = Sprite::createWithSpriteFrameName("PolySprite2.png");
+            sprite2->setPosition(origin.x + visibleSize.width / 4, origin.y + visibleSize.height / 2);
+            sprite2->setScale(5);
+            sprite2->setTexture(sprite1->getTexture());
+            //    sprite2->setColor(Color3B::BLUE);
+            this->addChild(sprite2);
+
+            auto sprite3 = Sprite::createWithSpriteFrameName("PolySprite3.png");
+            sprite3->setPosition(origin.x + visibleSize.width / 1.3, origin.y + visibleSize.height / 2);
+            sprite3->setScale(5);
+                sprite3->setColor(Color3B::BLUE);
+            this->addChild(sprite3);
+        }
+
         return true;
     }