From cfdc6e8e95e57051adfdcce7e36587b603ab3e6e Mon Sep 17 00:00:00 2001
From: Lephe <sebastien.mld@numericable.fr>
Date: Thu, 23 Jul 2020 10:21:50 +0200
Subject: [PATCH] add a simple (non-exhaustive) bopti test on fx-9860G

---
 assets-fx/img/bopti_1col.png     | Bin 0 -> 140 bytes
 assets-fx/img/bopti_2col.png     | Bin 0 -> 140 bytes
 assets-fx/img/bopti_3col.png     | Bin 0 -> 141 bytes
 assets-fx/img/opt_gint_bopti.png | Bin 0 -> 4981 bytes
 src/gint/bopti.c                 |  92 ++++++++++++++++++++++++++++++-
 5 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 assets-fx/img/bopti_1col.png
 create mode 100644 assets-fx/img/bopti_2col.png
 create mode 100644 assets-fx/img/bopti_3col.png
 create mode 100644 assets-fx/img/opt_gint_bopti.png

diff --git a/assets-fx/img/bopti_1col.png b/assets-fx/img/bopti_1col.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1fca5b1506ee9165e12060f3bbfb6c376008bd8
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CC!2~2tT|DmsDb50q$YKTtZeb8+WSBKa0w~B{
z;_2(k{)AmjNS0IHvE?98NZZrJF@)oKZ?7X4gMvWImjC~6@;M5`UR$i(<FGVrkIc%V
iZToj@isC6K+RnJ8N%p7D(#SNRHU>{uKbLh*2~7a(GbNb-

literal 0
HcmV?d00001

diff --git a/assets-fx/img/bopti_2col.png b/assets-fx/img/bopti_2col.png
new file mode 100644
index 0000000000000000000000000000000000000000..793fe8b3c24f36f189889f8367a52f3323eff3b9
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^DnQJ_!2~2T&vE?(Qk(@Ik;M!Q+`=Ht$S`Y;1W=H@
z#M9T6{Rz96kgQ77yc=79LfW1#jv*44_f9y-$)F(6u;p+0Huno`<$MbkI4li2^Wlls
jdc*KvpI&X~m@Ta@ZYKLvJ^kJ#pf(0iS3j3^P6<r_!nr9J

literal 0
HcmV?d00001

diff --git a/assets-fx/img/bopti_3col.png b/assets-fx/img/bopti_3col.png
new file mode 100644
index 0000000000000000000000000000000000000000..660079b8f75e9c7e7c05703d5391a27c2224833d
GIT binary patch
literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^E<nt}!2~3CX!3OeDb50q$YKTtZeb8+WSBKa0w~B{
z;_2(k{)AmjNRHQ-QCJ!%q~q!07@~3h?xcg93<?4bTmF`BbHBh>?zdop!_u%bPfo7h
k)3#GJexH@jA>Y}tA9!VdO5YU_1L|Y&boFyt=akR{02Q7l9{>OV

literal 0
HcmV?d00001

diff --git a/assets-fx/img/opt_gint_bopti.png b/assets-fx/img/opt_gint_bopti.png
new file mode 100644
index 0000000000000000000000000000000000000000..838821688b62a208db158f7e5991ca5dda0dd312
GIT binary patch
literal 4981
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

literal 0
HcmV?d00001

diff --git a/src/gint/bopti.c b/src/gint/bopti.c
index 760c600..cf7fbc2 100644
--- a/src/gint/bopti.c
+++ b/src/gint/bopti.c
@@ -5,10 +5,10 @@
 #include <gintctl/gint.h>
 #include <gintctl/util.h>
 
+#ifdef FXCG50
 /* gintctl_gint_bopti(): Test image rendering */
 void gintctl_gint_bopti(void)
 {
-#ifdef FXCG50
 	extern bopti_image_t img_swift;
 	extern bopti_image_t img_swords;
 	extern bopti_image_t img_potion_17x22, img_potion_18x22;
@@ -62,5 +62,93 @@ void gintctl_gint_bopti(void)
 
 		key = getkey().key;
 	}
-#endif
 }
+#endif
+
+#ifdef FX9860G
+static void img(int x, int y, bopti_image_t *img, int sub, int flags)
+{
+	int ix = 0;
+	int w = img->width;
+
+	if(sub) x += 2, ix += 2, w -= 4;
+	dsubimage(x, y, img, ix, 0, w, img->height, flags);
+}
+#define img(x, y, i) img(x, y, & img_bopti_##i, sub, flags)
+
+void gintctl_gint_bopti(void)
+{
+	extern bopti_image_t img_opt_gint_bopti;
+	extern bopti_image_t img_bopti_1col;
+	extern bopti_image_t img_bopti_2col;
+	extern bopti_image_t img_bopti_3col;
+
+	int key = 0;
+	int cols=0, flags=DIMAGE_NONE, sub=0, back=0;
+
+	while(key != KEY_EXIT)
+	{
+		dclear(back ? C_BLACK : C_WHITE);
+
+		if(cols == 0)
+		{
+			img( -6, 4, 1col);
+			img( 20, 4, 1col);
+			img( 42, 4, 1col);
+			img( 64, 4, 1col);
+			img( 90, 4, 1col);
+			img(122, 4, 1col);
+
+			dsubimage(0, 10, &img_bopti_1col, 6, 0, 6, 4, flags);
+			dsubimage(5, 16, &img_bopti_1col, 6, 0, 6, 4, flags);
+			dsubimage(4, 22, &img_bopti_1col, 5, 0, 7, 4, flags);
+			dsubimage(3, 28, &img_bopti_1col, 4, 0, 8, 4, flags);
+			dsubimage(2, 34, &img_bopti_1col, 3, 0, 9, 4, flags);
+			dsubimage(1, 40, &img_bopti_1col, 2, 0,10, 4, flags);
+			dsubimage(0, 40, &img_bopti_1col, 1, 0,11, 4, flags);
+			dsubimage(0, 46, &img_bopti_1col, 0, 0,12, 4, flags);
+
+			img(33, 12, 1col);
+		}
+		else if(cols == 1)
+		{
+			img(-10,  4, 2col);
+			img( 28,  4, 2col);
+			img( 96,  4, 2col);
+			img( 46, 12, 2col);
+		}
+		else if(cols == 2)
+		{
+			img(-30,  4, 3col);
+			img( 90,  4, 3col);
+			img( -4, 12, 3col);
+			img( 64, 12, 3col);
+		}
+		else if(cols == 3)
+		{
+			img(  0, 4, 1col);
+			img( 20, 4, 1col);
+			img( 42, 4, 1col);
+			img( 64, 4, 1col);
+			img(116, 4, 1col);
+		}
+
+		dsubimage(0, 56, &img_opt_gint_bopti, 0,0,128,8, DIMAGE_NONE);
+		dsubimage(0, 56, &img_opt_gint_bopti, 0, 9*cols, 21, 8,
+			DIMAGE_NONE);
+		if(flags & DIMAGE_NOCLIP)
+		{
+			dsubimage(86, 56, &img_opt_gint_bopti, 86, 9, 21, 8,
+				DIMAGE_NONE);
+		}
+
+		dupdate();
+
+		key = getkey().key;
+		if(key == KEY_F1) cols = (cols + 1) % 4;
+		if(key == KEY_F4) sub = !sub;
+		if(key == KEY_F5) flags ^= DIMAGE_NOCLIP;
+		if(key == KEY_F6) back = !back;
+	}
+}
+#endif