Preparing release

Author: houmain

CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [Version 4.0.0] - 2025-12-22
+
+### Changed
+
+- Renamed `*-bounds` definitions to `*-size`.
+- Changed meaning of `rect` in the output description. It used to be the logical bounds of the sprite. Now it is the rectangle the sprite takes on the sheet (which can be bigger than `trimmedRect`, when the size is increased by `min-size`, `divisible-size`, `common-size`).
+- The logical bounds of a sprite can now be defined by a `margin`, which is added to `rect`.
+- Renamed `vertices` to `outline` in output description and made it relative to `rect` (it used to be relative to the `trimmedRect`).
+
+### Added
+
+- Added `margin` definition.
+- Added the sheets' `outputs` to description.
+
+### Fixed
+
+- Fixed `divisible-width`.
+- Fixed `trimmedSourceRect` in description when transforming.
+- Fixed `align-pivot` when anchor is not top/left.
+- Fixed alignment when sprite is rotated.
+- Fixed `extrude` and uncropped pivot-point.
+- Fixed `scale` when downsampling to nearest.
+- Improved `rotate` accuracy.
+- Fixed `trim convex`.
+- Fixed crash on `duplicate` before first sprite.
+- Prevent `grid`/`atlas` in input sequences.
+- Ensuring invalid definitions do not lead to invalid states.
+
 ## [Version 3.8.0] - 2025-11-21
 
 ### Added
@@ -369,6 +397,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed -- commandline arguments.
 - Fixed sample cpp.template.
 
+[version 4.0.0]: https://github.com/houmain/spright/compare/3.8.0...4.0.0
 [version 3.8.0]: https://github.com/houmain/spright/compare/3.7.0...3.8.0
 [version 3.7.0]: https://github.com/houmain/spright/compare/3.6.1...3.7.0
 [version 3.6.1]: https://github.com/houmain/spright/compare/3.5.4...3.6.1

CMakeLists.txt

@@ -104,7 +104,7 @@ if(ENABLE_TEST)
         test/test-main.cpp
         test/test-common.cpp
         test/test-scope.cpp
-        test/test-autocompletion.cpp
+        test/test-completion.cpp
         test/test-packing.cpp
         test/test-performance.cpp
         test/test-globbing.cpp

src/image.cpp

@@ -251,7 +251,7 @@ namespace {
     return dest;
   }
 
-  Image downsample_image_nearest(ImageView<const RGBAF> image_rgbaf, const SizeF& scale) {
+  [[maybe_unused]] Image downsample_image_nearest(ImageView<const RGBAF> image_rgbaf, const SizeF& scale) {
     return downsample_image_sample(image_rgbaf, scale,
       [&](const RectF& rect) {
         const auto point = Point(round_to_int(rect.x + rect.w / 2), round_to_int(rect.y + rect.h / 2));

src/image_io.cpp

@@ -109,7 +109,7 @@ namespace {
       const auto b = to_int(palette[i].b) - to_int(color.b);
       const auto distance = (r * r + g * g + b * b);
       if (distance < min_distance) {
-        min_index = to_int(i);
+        min_index = i;
         min_distance = distance;
       }
     }

src/pack_compact.cpp

@@ -20,8 +20,8 @@ namespace {
     const auto border = to_real(border_padding) - padding;
     const auto x0 = border;
     const auto y0 = border;
-    const auto x1 = to_real(slice.width) - border - 0.5;
-    const auto y1 = to_real(slice.height) - border - 0.5;
+    const auto x1 = to_real(slice.width) - border;
+    const auto y1 = to_real(slice.height) - border;
 
     auto shapes = std::vector<ShapePtr>();
     shapes.emplace_back(cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv(x0, y0), cpv(x1, y0), 0)));
@@ -74,10 +74,10 @@ void pack_compact(const SheetPtr& sheet, SpriteSpan sprites,
     std::vector<Slice>& slices) {
   const auto fast = (sheet->allow_rotate == false);
   pack_binpack(sheet, sprites, slices, fast);
-  for (auto& slice : slices) {
+  scheduler.for_each_parallel(slices, [&](Slice& slice) {
     recompute_slice_size(slice);
     compact_sprites(slice, sheet->border_padding, sheet->shape_padding);
-  }
+  });
 }
 
 } // namespace

src/trimming.cpp

@@ -69,7 +69,9 @@ namespace {
       reinterpret_cast<cpMarchSegmentFunc>(cpPolylineSetCollectSegment), outlines,
       sample, &image_mono);
 
-    assert(outlines->count > 0);
+    if (outlines->count == 0)
+      return { };
+
     const auto right = cpFloat(image_mono.width());
     const auto bottom = cpFloat(image_mono.height());
     for (auto i = 0; i < outlines->count; ++i) {
@@ -163,13 +165,14 @@ namespace {
         get_gray_levels(sprite.source->image(), sprite.trimmed_source_rect) :
         get_alpha_levels(sprite.source->image(), sprite.trimmed_source_rect));
 
-      auto outline = get_polygon_outline(
-        levels.view<RGBA::Channel>(), sprite.trim_threshold);
-      outline = to_convex_polygon(*outline, 0);
-      outline = simplify_polygon(*outline, 0.25);
-      remove_end_point(*outline);
-      expand_polygon(*outline, sprite.trim_margin.x0);
-      sprite.outline = to_point_list(*outline);
+      if (auto outline = get_polygon_outline(
+          levels.view<RGBA::Channel>(), sprite.trim_threshold)) {
+        outline = to_convex_polygon(*outline, 0);
+        outline = simplify_polygon(*outline, 0.25);
+        remove_end_point(*outline);
+        expand_polygon(*outline, sprite.trim_margin.x0);
+        sprite.outline = to_point_list(*outline);
+      }
     }
 
     if (sprite.outline.empty()) {

templates/phaser.inja

@@ -17,7 +17,7 @@
         { {% set sprite=at(sprites, index) %}
           "filename": "{{ sprite.id }}",
           "rotated": {{ sprite.rotated }},
-          "trimmed": {% if sprite.rect.w == sprite.trimmedRect.w and sprite.rect.h == sprite.trimmedRect.h %}false{% else %}true{% endif %},
+          "trimmed": {% if sprite.sourceRect.w == sprite.trimmedSourceRect.w and sprite.sourceRect.h == sprite.trimmedSourceRect.h %}false{% else %}true{% endif %},
           "sourceSize": {
             "w": {{ round(sprite.sourceRect.w * scale, 0) }},
             "h": {{ round(sprite.sourceRect.h * scale, 0) }}

templates/phaser2.inja

@@ -10,7 +10,7 @@
     {
       "filename": "{{ sprite.id }}",
       "rotated": {{ sprite.rotated }},
-      "trimmed": {% if sprite.rect.w == sprite.trimmedRect.w and sprite.rect.h == sprite.trimmedRect.h %}false{% else %}true{% endif %},
+      "trimmed": {% if sprite.sourceRect.w == sprite.trimmedSourceRect.w and sprite.sourceRect.h == sprite.trimmedSourceRect.h %}false{% else %}true{% endif %},
       "sourceSize": {
         "w": {{ round(sprite.sourceRect.w * scale, 0) }},
         "h": {{ round(sprite.sourceRect.h * scale, 0) }}

templates/pixijs.inja

@@ -3,7 +3,7 @@
 "{{ sprite.id }}":
 {
   "rotated": {{ sprite.rotated }},
-  "trimmed": {% if sprite.rect.w == sprite.trimmedRect.w and sprite.rect.h == sprite.trimmedRect.h %}false{% else %}true{% endif %},
+  "trimmed": {% if sprite.sourceRect.w == sprite.trimmedSourceRect.w and sprite.sourceRect.h == sprite.trimmedSourceRect.h %}false{% else %}true{% endif %},
   "sourceSize": {
     "w": {{ round(sprite.sourceRect.w * scale, 0) }},
     "h": {{ round(sprite.sourceRect.h * scale, 0) }}