Tileset: Fixed optimization with 8bpp formats

Author: LoxoSoftware

project.cpp

@@ -214,12 +214,15 @@ int Project::ExportToSourceFile(QString fname, int export_flags)
         switch ((export_flags>>Project::ExportFormat)&0b11)
         {
         case Project::ExportGBA4bpp>>Project::ExportFormat:
+            out_tileset.format= Tileset::GBA_4bpp;
             out_tileset.tiles= out_tileset.Optimized(&out_map, Tileset::OptimizeWithFlip|Tileset::OptimizeWithPalette);
             break;
         case Project::ExportGBA8bpp>>Project::ExportFormat:
+            out_tileset.format= Tileset::GBA_8bpp;
             out_tileset.tiles= out_tileset.Optimized(&out_map, Tileset::OptimizeWithFlip);
             break;
         case Project::ExportGBAAffine>>Project::ExportFormat:
+            out_tileset.format= Tileset::GBA_8bpp;
             out_tileset.tiles= out_tileset.Optimized(&out_map, Tileset::OptimizeNone);
             break;
         default:

tile.cpp

@@ -147,21 +147,29 @@ QVector<QImage> Tileset::Optimized(QList<Tile>* tilemap, Tileset::optimize_flags
     for (int im=0; im<tilemap->count(); im++)
     {
         Tile* tmtile= &(*tilemap)[im];
-        QImage tmtile_img= tmtile->RenderImage(this,true);
+        QImage tmtile_img= tmtile->RenderImage(this,false);
         bool hflipped=false, vflipped=false;
         int ind_found= -2;
 
         //Search the new tilemap by all the possible versions of this tile
-        for (int ipal=0; ipal<PALETTE_H; ipal++)
+        for (int ipal=0; ipal<PALETTE_H && ipal>=0; ipal++)
         {
             if (!(optiflags&Tileset::OptimizeWithPalette))
                 if (ipal != tmtile->palette_index) continue;
 
+            if (!isPalettedFormat()) ipal= -1;
+
             hflipped=false, vflipped=false;
             ind_found= new_tileset.indexOf(Tile::TransformImage(tmtile_img,vflipped,hflipped,ipal));
             if (ind_found >= 0) break;
 
-            if (!(optiflags&Tileset::OptimizeWithFlip)) continue;
+            if (!(optiflags&Tileset::OptimizeWithFlip))
+            {
+                if (isPalettedFormat())
+                    continue;
+                else
+                    break;
+            }
 
             hflipped=false, vflipped=true;
             ind_found= new_tileset.indexOf(Tile::TransformImage(tmtile_img,vflipped,hflipped,ipal));
@@ -172,6 +180,9 @@ QVector<QImage> Tileset::Optimized(QList<Tile>* tilemap, Tileset::optimize_flags
             hflipped=true, vflipped=true;
             ind_found= new_tileset.indexOf(Tile::TransformImage(tmtile_img,vflipped,hflipped,ipal));
             if (ind_found >= 0) break;
+
+            if (!isPalettedFormat())
+                break;
         }
 
         if (ind_found >= 0)
@@ -180,7 +191,7 @@ QVector<QImage> Tileset::Optimized(QList<Tile>* tilemap, Tileset::optimize_flags
         }
         else
         {
-            new_tileset+= tmtile_img;
+            new_tileset+= tmtile->RenderImage(this,isPalettedFormat());;
             new_tilemap+= Tile(new_tileset.count()-1,false,false,new_tileset.last().scanLine(0)[0]>>4);
         }