Fix improve the octree quantization method using better Euclidean color distance (fix #2787) #4416

Gasparoken · 2024-04-11T22:22:56Z

First approach.

I'm still looking for a way to run the color mode conversion preview when changing the "color fit criteria" selector (combo box), just like it runs when changing the RGB mapping method.

fix #2787

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2024-04-11T22:27:30Z

src/app/cmd/set_pixel_format.cpp

@@ -73,7 +73,8 @@ SetPixelFormat::SetPixelFormat(Sprite* sprite,
                               const render::Dithering& dithering,
                               const doc::RgbMapAlgorithm mapAlgorithm,
                               doc::rgba_to_graya_func toGray,
-                               render::TaskDelegate* delegate)
+                               render::TaskDelegate* delegate,
+                               const doc::FitCriteria fitCriteria)


warning: parameter 'fitCriteria' is unused [misc-unused-parameters]

Suggested change

const doc::FitCriteria fitCriteria)

const doc::FitCriteria /*fitCriteria*/)

aseprite-bot · 2024-04-11T22:27:30Z

src/app/cmd/set_pixel_format.h

@@ -37,7 +38,8 @@ namespace cmd {
                   const render::Dithering& dithering,
                   const doc::RgbMapAlgorithm mapAlgorithm,
                   doc::rgba_to_graya_func toGray,
-                   render::TaskDelegate* delegate);
+                   render::TaskDelegate* delegate,
+                   const doc::FitCriteria fitCriteria = doc::FitCriteria::DEFAULT);


warning: parameter 'fitCriteria' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]

Suggested change

const doc::FitCriteria fitCriteria = doc::FitCriteria::DEFAULT);

doc::FitCriteria fitCriteria = doc::FitCriteria::DEFAULT);

aseprite-bot · 2024-04-11T22:27:31Z

src/app/cmd/set_pixel_format.h

@@ -56,7 +58,8 @@
                      const bool isBackground,
                      const doc::RgbMapAlgorithm mapAlgorithm,
                      doc::rgba_to_graya_func toGray,
-                      render::TaskDelegate* delegate);
+                      render::TaskDelegate* delegate,
+                      const doc::FitCriteria fitCriteria = doc::FitCriteria::DEFAULT);


warning: parameter 'fitCriteria' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]

Suggested change

const doc::FitCriteria fitCriteria = doc::FitCriteria::DEFAULT);

doc::FitCriteria fitCriteria = doc::FitCriteria::DEFAULT);

src/app/commands/cmd_change_pixel_format.cpp

aseprite-bot · 2024-04-11T22:27:31Z

src/doc/octree_map.cpp

@@ -35,19 +35,21 @@ void OctreeNode::addColor(color_t c, int level, OctreeNode* parent,
  (*m_children)[index].addColor(c, level + 1, this, paletteIndex, levelDeep);
 }

-int OctreeNode::mapColor(int  r, int g, int b, int a, int mask_index, const Palette* palette, int level) const
+int OctreeNode::mapColor(int  r, int g, int b, int a, int mask_index,


warning: function 'mapColor' is within a recursive call chain [misc-no-recursion]

int OctreeNode::mapColor(int r, int g, int b, int a, int mask_index, ^

Additional context

src/doc/octree_map.cpp:37: example recursive call chain, starting from function 'mapColor'

int OctreeNode::mapColor(int r, int g, int b, int a, int mask_index, ^

src/doc/octree_map.cpp:51: Frame #1: function 'mapColor' calls function 'mapColor' here:

return (*m_children)[index].mapColor(r, g, b, a, mask_index, palette, level + 1, fitCriteria); ^

src/doc/octree_map.cpp:51: ... which was the starting point of the recursive call chain; there may be other cycles

return (*m_children)[index].mapColor(r, g, b, a, mask_index, palette, level + 1, fitCriteria); ^

aseprite-bot · 2024-04-11T22:27:32Z

src/render/quantization.cpp

            else
-              *dst_it = palette->findBestfit(c, c, c, a, new_mask_color);
+              *dst_it = palette->findBestfit(c, c, c, a, new_mask_color, fitCriteria);


warning: narrowing conversion from 'color_t' (aka 'unsigned int') to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]

*dst_it = palette->findBestfit(c, c, c, a, new_mask_color, fitCriteria); ^

aseprite-bot · 2024-04-11T22:27:32Z

src/render/quantization.cpp

            else
-              *dst_it = palette->findBestfit(c, c, c, a, new_mask_color);
+              *dst_it = palette->findBestfit(c, c, c, a, new_mask_color, fitCriteria);


warning: narrowing conversion from 'color_t' (aka 'unsigned int') to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]

*dst_it = palette->findBestfit(c, c, c, a, new_mask_color, fitCriteria); ^

aseprite-bot · 2024-04-11T22:27:32Z

src/render/quantization.cpp

            else
-              *dst_it = palette->findBestfit(c, c, c, a, new_mask_color);
+              *dst_it = palette->findBestfit(c, c, c, a, new_mask_color, fitCriteria);


warning: narrowing conversion from 'color_t' (aka 'unsigned int') to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]

*dst_it = palette->findBestfit(c, c, c, a, new_mask_color, fitCriteria); ^

aseprite-bot · 2024-04-11T22:27:32Z

src/render/quantization.cpp

              else
-                *dst_it = palette->findBestfit(r, g, b, a, new_mask_color);
+                *dst_it = palette->findBestfit(r, g, b, a, new_mask_color, fitCriteria);


warning: narrowing conversion from 'color_t' (aka 'unsigned int') to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]

*dst_it = palette->findBestfit(r, g, b, a, new_mask_color, fitCriteria); ^

aseprite-bot · 2024-04-11T22:27:32Z

src/render/quantization.h

@@ -68,7 +68,8 @@ namespace render {
    bool is_background,
    doc::color_t new_mask_color,
    doc::rgba_to_graya_func toGray = nullptr,
-    TaskDelegate* delegate = nullptr);
+    TaskDelegate* delegate = nullptr,
+    const doc::FitCriteria fitCriteria = doc::FitCriteria::DEFAULT);


warning: parameter 'fitCriteria' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]

Suggested change

const doc::FitCriteria fitCriteria = doc::FitCriteria::DEFAULT);

doc::FitCriteria fitCriteria = doc::FitCriteria::DEFAULT);

aseprite-bot

clang-tidy made some suggestions

src/doc/sprite.h

aseprite-bot · 2024-04-12T21:51:02Z

src/doc/sprite.h

@@ -160,7 +161,8 @@
                   const RgbMapFor forLayer) const;
    RgbMap* rgbMap(const frame_t frame,
                   const RgbMapFor forLayer,
-                   RgbMapAlgorithm mapAlgo) const;
+                   const RgbMapAlgorithm mapAlgo,
+                   const FitCriteria fitCriteria = FitCriteria::DEFAULT) const;


warning: parameter 'fitCriteria' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]

Suggested change

const FitCriteria fitCriteria = FitCriteria::DEFAULT) const;

FitCriteria fitCriteria = FitCriteria::DEFAULT) const;

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2024-04-15T15:11:16Z

src/app/commands/cmd_change_pixel_format.cpp

@@ -564,6 +592,23 @@ void ChangePixelFormatCommand::onLoadParams(const Params& params)
    m_rgbmap = Preferences::instance().quantization.rgbmapAlgorithm();
  }

+  // TODO change this with NewParams as in ColorQuantizationParams
+  std::string fitCriteria = params.get("fitCriteria");


warning: variable 'fitCriteria' of type 'std::string' (aka 'basic_string') can be declared 'const' [misc-const-correctness]

Suggested change

std::string fitCriteria = params.get("fitCriteria");

std::string const fitCriteria = params.get("fitCriteria");

dacap · 2024-04-15T15:36:48Z

src/doc/sprite.h

@@ -258,6 +260,9 @@ namespace doc {
    mutable RgbMapAlgorithm m_rgbMapAlgorithm;
    mutable std::unique_ptr<RgbMap> m_rgbMap;

+    // Last 'color fit criteria' used on indexed conversions
+    mutable FitCriteria m_fitCriteria = FitCriteria::DEFAULT;


Do we really need this in doc::Sprite?

You're right! We don't need it, and we don't need mutable RgbMapAlgorithm m_rgbMapAlgorithm; either. I'll add this parameters into class Rgbmap.

Actually moving it to the RgbMap is a similar case. If you think it makes more sense to move them inside RgbMap go for it (not sure if this FitCriteria is only used inside the RgbMap and not in the findBest of the palette).

One important thing I'm missing and probably I thought incorrectly was that this FitCriteria was something used in the Sprite > Color Mode > More Options > Advance only. But it looks like you are planning as part of the whole program configuration. Something particular for the Octree (if I'm guided by the #2787 title), or something that can be used in both rgbmaps (rgb5a3/octree). What is the plan with this PR?

In a first approximation, I thought of it only for octree quantization. But I tested it with RGB5A3 and it can be processed without problems. So I extended it for both rgbmaps.
I added a global setting to set the default value in Advanced conversion RGB->Indexed, then added this setting to work with Sprite > ColorMode > Indexed too.

We can stop here and wait for the artist's reception to see if it is feasible to extend this option further (include parameter in lua for example).

All of these other 'color fit criteria' in the Palette::findBestFit function can be useful for artists who want to fit any RGB image to a custom palette and achieve a more appropriate color selection.

@dacap I will limit the feature to be used only in Sprite > Color Mode > More Options > Advance

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2024-04-15T18:01:59Z

src/doc/rgbmap.h

+    virtual RgbMapAlgorithm rgbamapAlgorithm() const = 0;
+
+    // Color Best Fit Criteria used to generate the rgbmap
+    virtual FitCriteria fitCriteria() const = 0;


warning: unknown type name 'FitCriteria' [clang-diagnostic-error]

virtual FitCriteria fitCriteria() const = 0; ^

aseprite-bot · 2024-04-15T18:01:59Z

src/doc/rgbmap.h

+
+    // Color Best Fit Criteria used to generate the rgbmap
+    virtual FitCriteria fitCriteria() const = 0;
+    virtual void fitCriteria(const FitCriteria fitCriteria) = 0;


warning: parameter 'fitCriteria' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]

Suggested change

virtual void fitCriteria(const FitCriteria fitCriteria) = 0;

virtual void fitCriteria(FitCriteria fitCriteria) = 0;

aseprite-bot · 2024-04-15T18:02:00Z

src/doc/rgbmap.h

+
+    // Color Best Fit Criteria used to generate the rgbmap
+    virtual FitCriteria fitCriteria() const = 0;
+    virtual void fitCriteria(const FitCriteria fitCriteria) = 0;


warning: unknown type name 'FitCriteria' [clang-diagnostic-error]

virtual void fitCriteria(const FitCriteria fitCriteria) = 0; ^

Gasparoken · 2024-04-24T20:06:54Z

This new parameter called 'color fit criteria' is used to compare colors under different criteria in the Palette::findBestFit function.
A possible alternative to emplace the 'color fit criteria' conversion process is within the Rgbmap class.
I'll try to refactor this to include the conversion function inside Rgbmap only.

aseprite-bot

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 38. Check the log or trigger a new build to see more.

aseprite-bot · 2024-04-26T19:40:12Z

src/doc/octree_map.cpp

@@ -35,19 +35,21 @@ void OctreeNode::addColor(color_t c, int level, OctreeNode* parent,
  (*m_children)[index].addColor(c, level + 1, this, paletteIndex, levelDeep);
 }

-int OctreeNode::mapColor(int  r, int g, int b, int a, int mask_index, const Palette* palette, int level) const
+int OctreeNode::mapColor(int  r, int g, int b, int a, int mask_index,


warning: function 'mapColor' is within a recursive call chain [misc-no-recursion]

int OctreeNode::mapColor(int r, int g, int b, int a, int mask_index, ^

Additional context

src/doc/octree_map.cpp:37: example recursive call chain, starting from function 'mapColor'

int OctreeNode::mapColor(int r, int g, int b, int a, int mask_index, ^

src/doc/octree_map.cpp:51: Frame #1: function 'mapColor' calls function 'mapColor' here:

return (*m_children)[index].mapColor(r, g, b, a, mask_index, palette, level + 1, octree); ^

src/doc/octree_map.cpp:51: ... which was the starting point of the recursive call chain; there may be other cycles

return (*m_children)[index].mapColor(r, g, b, a, mask_index, palette, level + 1, octree); ^

aseprite-bot · 2024-04-26T19:40:12Z

src/doc/octree_map.h

@@ -135,9 +141,22 @@ class OctreeMap : public RgbMap {
                     const int levelDeep = 7);

  // RgbMap impl
-  void regenerateMap(const Palette* palette, const int maskIndex) override;
+  void regenerateMap(const Palette* palette,
+                     const int maskIndex,


warning: parameter 'maskIndex' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]

Suggested change

const int maskIndex,

int maskIndex,

aseprite-bot · 2024-04-26T19:40:12Z

src/doc/octree_map.h

-  void regenerateMap(const Palette* palette, const int maskIndex) override;
+  void regenerateMap(const Palette* palette,
+                     const int maskIndex,
+                     const FitCriteria fitCriteria) override;


warning: parameter 'fitCriteria' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]

Suggested change

const FitCriteria fitCriteria) override;

FitCriteria fitCriteria) override;

aseprite-bot · 2024-04-26T19:40:12Z

src/doc/palette.cpp

-    int size = std::min(256, int(m_colors.size()));
+  int bestfit = 0;
+  int lowest = std::numeric_limits<int>::max();
+  int size = std::min(256, int(m_colors.size()));


warning: variable 'size' of type 'int' can be declared 'const' [misc-const-correctness]

Suggested change

int size = std::min(256, int(m_colors.size()));

int const size = std::min(256, int(m_colors.size()));

aseprite-bot · 2024-04-26T19:40:12Z

src/doc/palette.cpp

-    for (int i=0; i<size; ++i) {
-      color_t rgb = m_colors[i];
+  for (int i=0; i<size; ++i) {
+    color_t rgb = m_colors[i];


warning: variable 'rgb' of type 'color_t' (aka 'unsigned int') can be declared 'const' [misc-const-correctness]

Suggested change

color_t rgb = m_colors[i];

color_t const rgb = m_colors[i];

aseprite-bot · 2024-04-26T19:40:14Z

src/doc/rgbmap_base.cpp

+int RgbMapBase::findBestfit(int r, int g, int b, int a,
+                            int mask_index) const
+{
+  ASSERT(r >= 0 && r <= 255);


warning: boolean expression can be simplified by DeMorgan's theorem [readability-simplify-boolean-expr]

ASSERT(r >= 0 && r <= 255); ^

Additional context

laf/base/debug.h:60: expanded from macro 'ASSERT'

if (!(condition)) { \ ^

aseprite-bot · 2024-04-26T19:40:14Z

src/doc/rgbmap_base.cpp

+                            int mask_index) const
+{
+  ASSERT(r >= 0 && r <= 255);
+  ASSERT(g >= 0 && g <= 255);


warning: boolean expression can be simplified by DeMorgan's theorem [readability-simplify-boolean-expr]

ASSERT(g >= 0 && g <= 255); ^

Additional context

laf/base/debug.h:60: expanded from macro 'ASSERT'

if (!(condition)) { \ ^

aseprite-bot · 2024-04-26T19:40:14Z

src/doc/rgbmap_base.cpp

+{
+  ASSERT(r >= 0 && r <= 255);
+  ASSERT(g >= 0 && g <= 255);
+  ASSERT(b >= 0 && b <= 255);


warning: boolean expression can be simplified by DeMorgan's theorem [readability-simplify-boolean-expr]

ASSERT(b >= 0 && b <= 255); ^

Additional context

laf/base/debug.h:60: expanded from macro 'ASSERT'

if (!(condition)) { \ ^

aseprite-bot · 2024-04-26T19:40:14Z

src/doc/rgbmap_base.cpp

+  ASSERT(r >= 0 && r <= 255);
+  ASSERT(g >= 0 && g <= 255);
+  ASSERT(b >= 0 && b <= 255);
+  ASSERT(a >= 0 && a <= 255);


warning: boolean expression can be simplified by DeMorgan's theorem [readability-simplify-boolean-expr]

ASSERT(a >= 0 && a <= 255); ^

Additional context

laf/base/debug.h:60: expanded from macro 'ASSERT'

if (!(condition)) { \ ^

aseprite-bot · 2024-04-26T19:40:14Z

src/doc/rgbmap_base.cpp

+
+  int bestfit = 0;
+  double lowest = std::numeric_limits<double>::max();
+  int size = m_palette->size();


warning: variable 'size' of type 'int' can be declared 'const' [misc-const-correctness]

Suggested change

int size = m_palette->size();

int const size = m_palette->size();

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2024-04-26T20:32:12Z

src/doc/rgbmap_base.cpp

+  rgbToOtherSpace(x, y, z);
+
+  for (int i=0; i<size; ++i) {
+    color_t rgb = m_palette->getEntry(i);


warning: variable 'rgb' of type 'color_t' (aka 'unsigned int') can be declared 'const' [misc-const-correctness]

Suggested change

color_t rgb = m_palette->getEntry(i);

color_t const rgb = m_palette->getEntry(i);

aseprite-bot · 2024-04-26T20:32:12Z

src/doc/rgbmap_base.cpp

+    double Zpal = double(rgba_getb(rgb));
+    // Palette color conversion RGB-->XYZ and r,g,b is assumed CIE XYZ
+    rgbToOtherSpace(Xpal, Ypal, Zpal);
+    double xDiff = x - Xpal;


warning: variable 'xDiff' of type 'double' can be declared 'const' [misc-const-correctness]

Suggested change

double xDiff = x - Xpal;

double const xDiff = x - Xpal;

aseprite-bot · 2024-04-26T20:32:12Z

src/doc/rgbmap_base.cpp

+    // Palette color conversion RGB-->XYZ and r,g,b is assumed CIE XYZ
+    rgbToOtherSpace(Xpal, Ypal, Zpal);
+    double xDiff = x - Xpal;
+    double yDiff = y - Ypal;


warning: variable 'yDiff' of type 'double' can be declared 'const' [misc-const-correctness]

Suggested change

double yDiff = y - Ypal;

double const yDiff = y - Ypal;

aseprite-bot · 2024-04-26T20:32:12Z

src/doc/rgbmap_base.cpp

+    rgbToOtherSpace(Xpal, Ypal, Zpal);
+    double xDiff = x - Xpal;
+    double yDiff = y - Ypal;
+    double zDiff = z - Zpal;


warning: variable 'zDiff' of type 'double' can be declared 'const' [misc-const-correctness]

Suggested change

double zDiff = z - Zpal;

double const zDiff = z - Zpal;

aseprite-bot · 2024-04-26T20:32:12Z

src/doc/rgbmap_base.cpp

+    double xDiff = x - Xpal;
+    double yDiff = y - Ypal;
+    double zDiff = z - Zpal;
+    double aDiff = double(a - rgba_geta(rgb)) / 128.0;


warning: variable 'aDiff' of type 'double' can be declared 'const' [misc-const-correctness]

Suggested change

double aDiff = double(a - rgba_geta(rgb)) / 128.0;

double const aDiff = double(a - rgba_geta(rgb)) / 128.0;

aseprite-bot · 2024-04-26T20:32:13Z

src/doc/rgbmap_base.h

+protected:
+  FitCriteria m_fitCriteria;
+  const Palette* m_palette = nullptr;
+  int m_modifications = 0;


warning: member variable 'm_modifications' has protected visibility [misc-non-private-member-variables-in-classes]

int m_modifications = 0; ^

aseprite-bot · 2024-04-26T20:32:13Z

src/doc/rgbmap_base.h

+  FitCriteria m_fitCriteria;
+  const Palette* m_palette = nullptr;
+  int m_modifications = 0;
+  int m_maskIndex = 0;


warning: member variable 'm_maskIndex' has protected visibility [misc-non-private-member-variables-in-classes]

int m_maskIndex = 0; ^

aseprite-bot · 2024-04-26T20:32:13Z

src/doc/rgbmap_rgb5a3.cpp

-  , m_maskIndex(0)
-{
-}
+RgbMapRGB5A3::RgbMapRGB5A3() : m_map(MAPSIZE) {}


warning: performing an implicit widening conversion to type 'size_type' (aka 'unsigned long') of a multiplication performed in type 'int' [bugprone-implicit-widening-of-multiplication-result]

RgbMapRGB5A3::RgbMapRGB5A3() : m_map(MAPSIZE) {} ^

Additional context

src/doc/rgbmap_rgb5a3.cpp:22: expanded from macro 'MAPSIZE'

#define MAPSIZE (RSIZE*GSIZE*BSIZE*ASIZE) ^

src/doc/rgbmap_rgb5a3.cpp:18: expanded from macro 'RSIZE'

#define RSIZE 32 ^

src/doc/rgbmap_rgb5a3.cpp:24: make conversion explicit to silence this warning

RgbMapRGB5A3::RgbMapRGB5A3() : m_map(MAPSIZE) {} ^

src/doc/rgbmap_rgb5a3.cpp:22: expanded from macro 'MAPSIZE'

#define MAPSIZE (RSIZE*GSIZE*BSIZE*ASIZE) ^

src/doc/rgbmap_rgb5a3.cpp:18: expanded from macro 'RSIZE'

#define RSIZE 32 ^

src/doc/rgbmap_rgb5a3.cpp:24: perform multiplication in a wider type

RgbMapRGB5A3::RgbMapRGB5A3() : m_map(MAPSIZE) {} ^

src/doc/rgbmap_rgb5a3.cpp:22: expanded from macro 'MAPSIZE'

#define MAPSIZE (RSIZE*GSIZE*BSIZE*ASIZE) ^

src/doc/rgbmap_rgb5a3.cpp:18: expanded from macro 'RSIZE'

#define RSIZE 32 ^

aseprite-bot · 2024-04-26T20:32:13Z

src/doc/rgbmap_rgb5a3.h

    // Bit activated on m_map entries that aren't yet calculated.
    const int INVALID = 256;

  public:
    RgbMapRGB5A3();

    // RgbMap impl
-    void regenerateMap(const Palette* palette, int maskIndex) override;
+    void regenerateMap(const Palette* palette,
+                       const int maskIndex,


warning: parameter 'maskIndex' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]

Suggested change

const int maskIndex,

int maskIndex,

aseprite-bot · 2024-04-26T20:32:13Z

src/doc/rgbmap_rgb5a3.h

-    void regenerateMap(const Palette* palette, int maskIndex) override;
+    void regenerateMap(const Palette* palette,
+                       const int maskIndex,
+                       const FitCriteria fitCriteria) override;


warning: parameter 'fitCriteria' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]

Suggested change

const FitCriteria fitCriteria) override;

FitCriteria fitCriteria) override;

…tte::findBestfit

…side rgbmap algorithms Added also 'modifications' function as a common function

Also, fixed the order where the 'm_palette' is set in OctreeMap::regenerateMap because the new findBestfit function needs to access the 'm_palette' pointer.

… Options

Gasparoken self-assigned this Apr 11, 2024

Gasparoken requested a review from dacap as a code owner April 11, 2024 22:22

aseprite-bot reviewed Apr 11, 2024

View reviewed changes

aseprite-bot reviewed Apr 12, 2024

View reviewed changes

aseprite-bot reviewed Apr 15, 2024

View reviewed changes

dacap reviewed Apr 15, 2024

View reviewed changes

aseprite-bot reviewed Apr 15, 2024

View reviewed changes

Gasparoken force-pushed the add-color-fit-criteria branch from 14f4214 to 1889936 Compare April 15, 2024 18:07

Gasparoken assigned dacap and unassigned Gasparoken Apr 19, 2024

Gasparoken assigned Gasparoken and unassigned dacap Apr 24, 2024

Gasparoken force-pushed the add-color-fit-criteria branch from 246ab35 to 0660d91 Compare April 26, 2024 19:35

aseprite-bot reviewed Apr 26, 2024

View reviewed changes

Gasparoken force-pushed the add-color-fit-criteria branch from 0660d91 to 75023df Compare April 26, 2024 20:25

aseprite-bot reviewed Apr 26, 2024

View reviewed changes

Gasparoken added 7 commits April 29, 2024 11:11

Remove fit criteria internal variable and related functions from Pale…

ff10842

…tte::findBestfit

Add FitCriteria enum to specific header file

1d53bcf

Add RgbMapBase class to group common rgbmap algorithm variables

dd951ee

Add findBestFit function with FitCriteria to RgbMapBase

d1f7c96

Exchange the use of Palette::findBestfit x RgbMapBase::findBestfit in…

4484247

…side rgbmap algorithms Added also 'modifications' function as a common function

Add comboBox ‘color fit criteria’ on Sprite > Color Mode > More Options

d730479

Also, fixed the order where the 'm_palette' is set in OctreeMap::regenerateMap because the new findBestfit function needs to access the 'm_palette' pointer.

Add ‘color fit criteria’ implementation on Sprite > Color Mode > More…

8a17be1

… Options

Gasparoken force-pushed the add-color-fit-criteria branch from 75023df to 8a17be1 Compare April 29, 2024 14:12

Gasparoken assigned dacap and unassigned Gasparoken Apr 29, 2024

	const doc::FitCriteria fitCriteria)
	const doc::FitCriteria /fitCriteria/)

	const doc::FitCriteria fitCriteria = doc::FitCriteria::DEFAULT);
	doc::FitCriteria fitCriteria = doc::FitCriteria::DEFAULT);

	const FitCriteria fitCriteria = FitCriteria::DEFAULT) const;
	FitCriteria fitCriteria = FitCriteria::DEFAULT) const;

	std::string fitCriteria = params.get("fitCriteria");
	std::string const fitCriteria = params.get("fitCriteria");

	virtual void fitCriteria(const FitCriteria fitCriteria) = 0;
	virtual void fitCriteria(FitCriteria fitCriteria) = 0;

	const FitCriteria fitCriteria) override;
	FitCriteria fitCriteria) override;

	int size = std::min(256, int(m_colors.size()));
	int const size = std::min(256, int(m_colors.size()));

	int size = m_palette->size();
	int const size = m_palette->size();

	color_t rgb = m_palette->getEntry(i);
	color_t const rgb = m_palette->getEntry(i);

	double aDiff = double(a - rgba_geta(rgb)) / 128.0;
	double const aDiff = double(a - rgba_geta(rgb)) / 128.0;

Fix improve the octree quantization method using better Euclidean color distance (fix #2787) #4416

Are you sure you want to change the base?

Fix improve the octree quantization method using better Euclidean color distance (fix #2787) #4416

Conversation

Gasparoken commented Apr 11, 2024

aseprite-bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aseprite-bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aseprite-bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Gasparoken Apr 24, 2024 • edited

Choose a reason for hiding this comment

aseprite-bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Gasparoken commented Apr 24, 2024

aseprite-bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aseprite-bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Gasparoken Apr 24, 2024 •

edited