bflibrary: Work on creation of sprites for tests

The sprites have now palette mapped to the palette used in test.
Now they have to be encoded into DAT/TAB sprite list.

Author: mefistotelis

bflibrary/Makefile.am

@@ -259,7 +259,7 @@ bflib_test_sprdrw_SOURCES = \
   tests/mock_palette.c \
   tests/mock_screen.c \
   tests/mock_windows.c \
-  tests/helpers_screen.c \
+  tests/helpers_sprite.c \
   tests/bflib_test_sprdrw.c
 
 bflib_test_sprdrw_CPPFLAGS = \

bflibrary/tests/bflib_test_sprdrw.c

@@ -51,10 +51,12 @@ TbBool test_spritedraw(void)
     ubyte ref_pal[PALETTE_8b_SIZE];
     TbPixel unaffected_colours[] = {0,};
     TbScreenModeInfo *mdinfo;
-    TbScreenMode mode = Lb_SCREEN_MODE_640_480_8;
+    TbScreenMode mode;
     ubyte *texmap;
     TbPixel *ref_buffer;
     ulong picno;
+    int sprfile_no = 1;
+    int len;
 
     if (LbErrorLogSetup(NULL, "tst_sprdrw.log", Lb_ERROR_LOG_NEW) != Lb_SUCCESS) {
         LOGERR("execution log setup failed");
@@ -67,13 +69,46 @@ TbBool test_spritedraw(void)
     }
     LbMemorySetup();
 
-    mdinfo = LbScreenGetModeInfo(mode);
-
     // Prepare a palette, and colour tables for it
     make_general_palette(pal);
     LbFileSaveAt("tst_gp.pal", &pal, sizeof(pal));
     LbColourTablesGenerate(pal, unaffected_colours, "tst_gptbl.dat");
 
+    mode = get_example_sprites_screen_mode(sprfile_no);
+    mdinfo = LbScreenGetModeInfo(mode);
+    if (MockScreenSetupAnyMode(mode, mdinfo->Width, mdinfo->Height, pal) != Lb_SUCCESS) {
+        LOGERR("mock screen initialization failed");
+        return false;
+    }
+
+    MockScreenLock();
+
+    { // Read image file containing sprites
+        char loc_fname[64];
+        ubyte colour_remap[PALETTE_8b_COLORS];
+        ulong ref_width, ref_height;
+
+        ref_buffer = malloc(mdinfo->Width * (mdinfo->Height + 1) * 1);
+        get_example_sprites_file_name(sprfile_no, loc_fname);
+        memset(ref_pal, 0, PALETTE_8b_SIZE);
+        LbPngLoad(loc_fname, ref_buffer, &ref_width, &ref_height, ref_pal);
+        if ((ref_width != mdinfo->Width) || (ref_height != mdinfo->Height)) {
+            LOGERR("%s: unexpected sprites image size", loc_fname);
+            return false;
+        }
+        palette_remap_to_screen(colour_remap, ref_pal);
+        LbScreenCopyRemap(ref_buffer, lbDisplay.WScreen, lbDisplay.GraphicsWindowHeight,
+          colour_remap);
+        free(ref_buffer);
+    }
+
+    //len = generate_example_sprites_from_screen(sprfile_no, pal, ubyte *p_dat, TbSprite *p_tab);
+
+    MockScreenUnlock();
+    MockScreenReset();
+
+    mode = Lb_SCREEN_MODE_640_480_8;
+    mdinfo = LbScreenGetModeInfo(mode);
     if (MockScreenSetupAnyMode(mode, mdinfo->Width, mdinfo->Height, pal) != Lb_SUCCESS) {
         LOGERR("mock screen initialization failed");
         return false;
@@ -84,9 +119,6 @@ TbBool test_spritedraw(void)
     texmap = LbMemoryAlloc(256*256*1);
     LbMemorySet(texmap, 0, 256*256*1);
 
-    setup_vecs(lbDisplay.WScreen, texmap, lbDisplay.PhysicalScreenWidth,
-        lbDisplay.PhysicalScreenWidth, lbDisplay.PhysicalScreenHeight);
-
     ref_buffer = malloc(mdinfo->Width * mdinfo->Height * (lbEngineBPP+7) / 8);
     if (ref_buffer == NULL) {
         LOGERR("reference screen buffer alloc failed");

bflibrary/tests/helpers_sprite.c

@@ -19,6 +19,7 @@
 /******************************************************************************/
 #include <string.h>
 #include "helpers_sprite.h"
+#include "bfanywnd.h"
 #include "bfpalette.h"
 #include "bfutility.h"
 #include "bftstlog.h"
@@ -27,29 +28,66 @@ static struct TbAnyWindow sprites1_list[] = {
     {0, 0, 0, 0, NULL,},
 };
 
-void generate_example_sprites_from_png(int sprfile_no, const ubyte *pal,
+void get_example_sprites_file_name(int sprfile_no, char *fname)
+{
+    switch (sprfile_no)
+    {
+    case 1:
+        strcpy(fname, "referenc/spr_devpac-mans16.png");
+        break;
+    default:
+        fname[0] = '\0';
+        break;
+    }
+}
+
+TbScreenMode get_example_sprites_screen_mode(int sprfile_no)
+{
+    char locstr[64];
+    ulong img_width, img_height, img_bpp;
+    ulong flags;
+
+    switch (sprfile_no)
+    {
+    case 1:
+        img_width = 320;
+        img_height = 1024;
+        img_bpp = 8;
+        break;
+    default:
+        img_width = 4;
+        img_height = 4;
+        img_bpp = 8;
+        break;
+    }
+
+    sprintf(locstr, "%lux%lux%lu", img_width, img_height, img_bpp);
+    if (img_bpp <= 8)
+        flags = Lb_VF_PALETTE;
+    else
+        flags = Lb_VF_RGBCOLOUR;
+    return LbRegisterVideoMode(locstr, img_width, img_height, img_bpp, flags);
+}
+
+void generate_example_sprites_from_screen(int sprfile_no, const ubyte *pal,
   ubyte *p_dat, TbSprite *p_tab)
 {
-    const char *img_fname;
     TbSprite *p_spr;
     struct TbAnyWindow *p_wnd;
     int tot_sprites, i;
 
     switch (sprfile_no)
     {
     case 1:
-        img_fname = "referenc/spr_devpac-mans16.png";
         tot_sprites = sizeof(sprites1_list)/sizeof(sprites1_list[0]);
-        p_wnd = &sprites1_list[i];
+        p_wnd = &sprites1_list[0];
         break;
     default:
-        img_fname = NULL;
         tot_sprites = 0;
         p_wnd = NULL;
         break;
     }
-    // Load the sprite image
- 
+
     // Convert each area into a sprite
     p_spr = p_tab;
     for (i = 0; i < tot_sprites; i++)
@@ -65,4 +103,17 @@ void generate_example_sprites_from_png(int sprfile_no, const ubyte *pal,
 
 }
 
+void palette_remap_to_screen(TbPixel *p_remap, const TbPixel *p_altpal)
+{
+    int i;
+    for (i = 0; i < PALETTE_8b_COLORS; i++)
+    {
+        ubyte r, g, b;
+        r = p_altpal[3*i + 0];
+        g = p_altpal[3*i + 1];
+        b = p_altpal[3*i + 2];
+        p_remap[i] = LbPaletteFindColour(lbDisplay.Palette, r, g, b);
+    }
+}
+
 /******************************************************************************/

bflibrary/tests/helpers_sprite.h

@@ -22,14 +22,18 @@
 
 #include "bftypes.h"
 #include "bfsprite.h"
+#include "bfscreen.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void generate_example_sprites_from_png(int sprfile_no, const ubyte *pal,
+void get_example_sprites_file_name(int sprfile_no, char *fname);
+TbScreenMode get_example_sprites_screen_mode(int sprfile_no);
+void palette_remap_to_screen(TbPixel *p_remap, const TbPixel *p_altpal);
+
+void generate_example_sprites_from_screen(int sprfile_no, const ubyte *pal,
   ubyte *p_dat, TbSprite *p_tab);
-void raw_to_sprite(short X, short Y, ushort Width, ushort Height, ubyte *Raw);
 
 #ifdef __cplusplus
 };