bflibrary: Work continues on the sprite drawing test

Author: mefistotelis

bflibrary/src/general/gspr_enc.c

@@ -116,7 +116,7 @@ int LbScreenSpriteEncode(TbSprite *p_spr, TbSpriteData p_spr_data)
     p_spr->SWidth = lbDisplay.GraphicsWindowWidth;
     p_spr->SHeight = lbDisplay.GraphicsWindowHeight;
     assert(p_spr->SWidth == lbDisplay.GraphicsWindowWidth);
-    assert(p_spr->SHeight = lbDisplay.GraphicsWindowHeight);
+    assert(p_spr->SHeight == lbDisplay.GraphicsWindowHeight);
     p_spr->Data = p_spr_data;
 
     return LbSpriteEncode(lbDisplay.GraphicsWindowPtr, lbDisplay.GraphicsScreenWidth, transcol, p_spr);

bflibrary/tests/bflib_test_sprdrw.c

@@ -30,6 +30,7 @@
 #include "bfpalcrss.h"
 #include "bffile.h"
 #include "bfpng.h"
+#include "bfscrcopy.h"
 #include "bfgentab.h"
 #include "bfutility.h"
 #include "bftstlog.h"
@@ -52,10 +53,12 @@ TbBool test_spritedraw(void)
     TbPixel unaffected_colours[] = {0,};
     TbScreenModeInfo *mdinfo;
     TbScreenMode mode;
-    ubyte *texmap;
+    ubyte *p_sprdata;
+    TbSprite *p_sprlist;
     TbPixel *ref_buffer;
     ulong picno;
     int sprfile_no = 1;
+    int tot_sprites;
     int len;
 
     if (LbErrorLogSetup(NULL, "tst_sprdrw.log", Lb_ERROR_LOG_NEW) != Lb_SUCCESS) {
@@ -102,7 +105,16 @@ TbBool test_spritedraw(void)
         free(ref_buffer);
     }
 
-    //len = generate_example_sprites_from_screen(sprfile_no, pal, ubyte *p_dat, TbSprite *p_tab);
+    tot_sprites = get_example_sprites_total_count(sprfile_no);
+    len = (tot_sprites+1) * 8192;
+    p_sprdata = LbMemoryAlloc(len);
+    LbMemorySet(p_sprdata, 0, len);
+
+    len = (tot_sprites+1) * sizeof(TbSprite);
+    p_sprlist = (TbSprite *)LbMemoryAlloc(len);
+    LbMemorySet(p_sprlist, 0, len);
+
+    len = generate_example_sprites_from_screen(sprfile_no, pal, p_sprdata, p_sprlist);
 
     MockScreenUnlock();
     MockScreenReset();
@@ -116,9 +128,6 @@ TbBool test_spritedraw(void)
 
     MockScreenLock();
 
-    texmap = LbMemoryAlloc(256*256*1);
-    LbMemorySet(texmap, 0, 256*256*1);
-
     ref_buffer = malloc(mdinfo->Width * mdinfo->Height * (lbEngineBPP+7) / 8);
     if (ref_buffer == NULL) {
         LOGERR("reference screen buffer alloc failed");
@@ -134,6 +143,8 @@ TbBool test_spritedraw(void)
 
         LbScreenClear(0);
         lbSeed = seeds[picno];
+
+        LbSpriteDraw(88, 88, &p_sprlist[0]);
 #if 0
         test_sprite_draw_random_sprites(pal, mdinfo->Height);
 
@@ -161,7 +172,7 @@ TbBool test_spritedraw(void)
 #endif
     }
 
-    LbMemoryFree(texmap);
+    LbMemoryFree(p_sprdata);
     free(ref_buffer);
 
     MockScreenUnlock();

bflibrary/tests/helpers_sprite.c

@@ -69,38 +69,57 @@ TbScreenMode get_example_sprites_screen_mode(int sprfile_no)
     return LbRegisterVideoMode(locstr, img_width, img_height, img_bpp, flags);
 }
 
-void generate_example_sprites_from_screen(int sprfile_no, const ubyte *pal,
+int get_example_sprites_total_count(int sprfile_no)
+{
+    int tot_sprites;
+
+    switch (sprfile_no)
+    {
+    case 1:
+        tot_sprites = sizeof(sprites1_list)/sizeof(sprites1_list[0]);
+        break;
+    default:
+        tot_sprites = 0;
+        break;
+    }
+
+    return tot_sprites;
+}
+
+int generate_example_sprites_from_screen(int sprfile_no, const ubyte *pal,
   ubyte *p_dat, TbSprite *p_tab)
 {
     TbSprite *p_spr;
+    ubyte *p_sprdt;
     struct TbAnyWindow *p_wnd;
     int tot_sprites, i;
 
     switch (sprfile_no)
     {
     case 1:
-        tot_sprites = sizeof(sprites1_list)/sizeof(sprites1_list[0]);
         p_wnd = &sprites1_list[0];
         break;
     default:
-        tot_sprites = 0;
         p_wnd = NULL;
         break;
     }
+    tot_sprites = get_example_sprites_total_count(sprfile_no);
 
     // Convert each area into a sprite
     p_spr = p_tab;
+    p_sprdt = p_dat;
     for (i = 0; i < tot_sprites; i++)
     {
         int len;
 
         LbScreenSetGraphicsWindow(p_wnd->x, p_wnd->y, p_wnd->width, p_wnd->height);
-        len = LbScreenSpriteEncode(p_spr, p_dat);
-        p_dat += len;
+        len = LbScreenSpriteEncode(p_spr, p_sprdt);
+        p_sprdt += len;
         p_spr++;
         p_wnd++;
     }
 
+    return p_sprdt - p_dat;
 }
 
 void palette_remap_to_screen(TbPixel *p_remap, const TbPixel *p_altpal)

bflibrary/tests/helpers_sprite.h

@@ -30,9 +30,10 @@ extern "C" {
 
 void get_example_sprites_file_name(int sprfile_no, char *fname);
 TbScreenMode get_example_sprites_screen_mode(int sprfile_no);
+int get_example_sprites_total_count(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,
+int generate_example_sprites_from_screen(int sprfile_no, const ubyte *pal,
   ubyte *p_dat, TbSprite *p_tab);
 
 #ifdef __cplusplus