more gems changes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.cpp

@@ -33,6 +33,30 @@
 
 namespace TextureAtlasBuilder
 {
+    //! Used for sorting ImageDimensions
+    bool operator<(ImageDimension a, ImageDimension b);
+
+    //! Used to expose the ImageDimension in a pair to AZStd::Sort
+    bool operator<(IndexImageDimension a, IndexImageDimension b);
+
+    //! Returns true if two coordinate sets overlap
+    bool Collides(AtlasCoordinates a, AtlasCoordinates b);
+
+    //! Returns true if item collides with any object in list
+    bool Collides(AtlasCoordinates item, AZStd::vector<AtlasCoordinates> list);
+
+    //! Returns the portion of the second item that overlaps with the first
+    AtlasCoordinates GetOverlap(AtlasCoordinates a, AtlasCoordinates b);
+
+    //! Performs an operation that copies a pixel to the output
+    void SetPixels(AZ::u8* dest, const AZ::u8* source, int destBytes);
+
+    //! Checks if we can insert an image into a slot
+    bool CanInsert(AtlasCoordinates slot, ImageDimension image, int padding, int farRight, int farBot);
+
+    //! Adds the necessary padding to an Atlas Coordinate 
+    void AddPadding(AtlasCoordinates& slot, int padding, int farRight, int farBot);
+
     //! Counts leading zeros
     uint32_t CountLeadingZeros32(uint32_t x)
     {
@@ -1411,7 +1435,7 @@ namespace TextureAtlasBuilder
 
     // Defines priority so that sorting can be meaningful. It may seem odd that larger items are "less than" smaller
     // ones, but as this is a deduction of priority, not value, it is correct.
-    static bool operator<(ImageDimension a, ImageDimension b)
+    bool operator<(ImageDimension a, ImageDimension b)
     {
         // Prioritize first by longest size
         if ((a.m_width > a.m_height ? a.m_width : a.m_height) != (b.m_width > b.m_height ? b.m_width : b.m_height))
@@ -1431,7 +1455,7 @@ namespace TextureAtlasBuilder
     }
 
     // Exposes priority logic to the sorting algorithm
-    static bool operator<(IndexImageDimension a, IndexImageDimension b) { return a.second < b.second; }
+    bool operator<(IndexImageDimension a, IndexImageDimension b) { return a.second < b.second; }
 
     // Tests if two coordinate sets intersect
     bool Collides(AtlasCoordinates a, AtlasCoordinates b)

Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.h

@@ -200,28 +200,4 @@ namespace TextureAtlasBuilder
         //! Returns the height of the tallest area
         static int GetTallest(const ImageDimensionData& imageList);
     };
-
-    //! Used for sorting ImageDimensions
-    static bool operator<(ImageDimension a, ImageDimension b);
-
-    //! Used to expose the ImageDimension in a pair to AZStd::Sort
-    static bool operator<(IndexImageDimension a, IndexImageDimension b);
-
-    //! Returns true if two coordinate sets overlap
-    static bool Collides(AtlasCoordinates a, AtlasCoordinates b);
-
-    //! Returns true if item collides with any object in list
-    static bool Collides(AtlasCoordinates item, AZStd::vector<AtlasCoordinates> list);
-
-    //! Returns the portion of the second item that overlaps with the first
-    static AtlasCoordinates GetOverlap(AtlasCoordinates a, AtlasCoordinates b);
-
-    //! Performs an operation that copies a pixel to the output
-    static void SetPixels(AZ::u8* dest, const AZ::u8* source, int destBytes);
-
-    //! Checks if we can insert an image into a slot
-    static bool CanInsert(AtlasCoordinates slot, ImageDimension image, int padding, int farRight, int farBot);
-
-    //! Adds the necessary padding to an Atlas Coordinate 
-    static void AddPadding(AtlasCoordinates& slot, int padding, int farRight, int farBot);
 }