From 729e7130a04df5fc895a297edfb2411aabdef5b7 Mon Sep 17 00:00:00 2001 From: Sebastian Leonhardt Date: Sun, 16 Aug 2015 21:35:51 +0200 Subject: [PATCH] Snake2: add 128x96x16 bitmaps These fit by pure chance exactly the YH820 screen :) Change-Id: I0f7a7f5d14aa0497da5ddf63cf1f95a2c4989460 --- apps/plugins/bitmaps/native/SOURCES | 6 ++++ .../native/snake2_bottom.128x96x16.bmp | Bin 0 -> 3126 bytes .../native/snake2_header1.128x96x16.bmp | Bin 0 -> 9270 bytes .../native/snake2_header2.128x96x16.bmp | Bin 0 -> 9270 bytes .../bitmaps/native/snake2_left.128x96x16.bmp | Bin 0 -> 1590 bytes .../bitmaps/native/snake2_right.128x96x16.bmp | Bin 0 -> 1590 bytes apps/plugins/snake2.c | 27 ++++++++++++++---- manual/plugins/images/ss-snake2-128x96x16.png | Bin 399 -> 1936 bytes 8 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 apps/plugins/bitmaps/native/snake2_bottom.128x96x16.bmp create mode 100644 apps/plugins/bitmaps/native/snake2_header1.128x96x16.bmp create mode 100644 apps/plugins/bitmaps/native/snake2_header2.128x96x16.bmp create mode 100644 apps/plugins/bitmaps/native/snake2_left.128x96x16.bmp create mode 100644 apps/plugins/bitmaps/native/snake2_right.128x96x16.bmp diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 90376d8ecd..052163c37d 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -633,6 +633,12 @@ snake2_header2.160x128x2.bmp snake2_left.160x128x2.bmp snake2_right.160x128x2.bmp snake2_bottom.160x128x2.bmp +#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96) && (LCD_DEPTH >= 16) +snake2_header1.128x96x16.bmp +snake2_header2.128x96x16.bmp +snake2_left.128x96x16.bmp +snake2_right.128x96x16.bmp +snake2_bottom.128x96x16.bmp #endif /* Sokoban*/ diff --git a/apps/plugins/bitmaps/native/snake2_bottom.128x96x16.bmp b/apps/plugins/bitmaps/native/snake2_bottom.128x96x16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e8fac73bd4b6e4225e69a2ad99f5b761c1a1f61d GIT binary patch literal 3126 zcmeH{K@!3s3`KG0!g1{pI6)8K-aC0DS6;vwZ{ju7Pg0TqqMMG*0tRUM!?ZsS+T&^3 z1!@!Kh;hc)Vr;?zGaB-@Jr5Q_c-*htvoNmzARyQ)`0*0CtBKb$a3=}bIpstDVFqaj z=Ha3RD_g)NRM?AKlt7K)^PB_+x+^n4^3jiqc_RpC`uT7m3nZxY;>q?c4r1%sb8Hz} zpQ_V&o>LCawi-j!^Mh1A16ovX@v6E7t5zHHx~z1Y>V(2Q-IU+jin=Q^J!l3O6P7Ko Zfy7kPm=-1gyh6AQ7Jk`y+*bn3{|(ZKkjDT3 literal 0 HcmV?d00001 diff --git a/apps/plugins/bitmaps/native/snake2_header1.128x96x16.bmp b/apps/plugins/bitmaps/native/snake2_header1.128x96x16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4cd8beed530d213c64072b0137e4b98a974af5f3 GIT binary patch literal 9270 zcmeHL!EVz)6ikj)0~M-(s9ZU;<=z8AAP^TQM5@FG@fnCC6;eb+flIGQRB%K5L{YAl zdZ&zc?D5O)I!>~#T~MuLGy8VlytiW~a{T1w&fT6nb}(+@{TlBf-hDR$VEy~(cqoCAf!rRPO0?-cz0adh=+(1FZmV}9Yf`z)^c{1muYBc*?S+24Kq z;MV$$sd9@?pa31H&C^vUMQa<=rc0BZ?MTd)VyC87b2j1Y`#0NLTL%XRlgZ>f?SKMw zpa#uLSafzvSoO^>+-73#zay2uLcLy8R#E^_f`ZQ;-9J1$Of!Be8*0#$eiU?4wAPc1 z;I8)Y;>RwOKDAnWJM1>W1V=AS?W%{b4OUN2Pp2GAo1C4Ut*)$iRlI5YMQc6D>@6;M zlCy|A)I4T%HDADoNg<7#lHiaOLXc@ReLyoTWFzetbvBd(uVJ>7M~#z+$Y-x@lC{e3 zOR4J;l};LKA!wz95pUZ5^Qu~%6h$*QWQDAgEhJ>4`!NxLarI0f8h};sFsG8@)RU6n zfA4?j1|xJhj@`Kk9b<|v`=~O4;R}hO8Y1og6t`TI7iwq-BU&ZEm>tf1d`2D13B{KM z(<*VqGqO9PQV8OX9XE{)eg)>a|7p2s;X#d2xm_@};^LQwnPAL+uMnroih^(Bx42^; zkH;q`Cy8eP3ecJ7{=bu=bVHZDoznTz|B5T$8mM#tPm>W6INHPzBHg8b(^vT zh5~fv|Nq-&QM;Yo=OQHc6b~(mMhbx`|8Wf?E-7-D{_E(&-sr_}cw31x0B9g1C0e?Z zU`qdXr!*MATWs|iPwZbMsHRbX6-l!g1aSnUCO&B)fpO3h`L|FN>I;q?Az zSVZf%7ugtYO$uTvQ29|z_Hi>m|8oXDOz`gi!;q1!F zN)^I)ali?4KAj@9BqeoUO%g!b?fK>pmv_x(pN_CtXu$Y|8_tIIFUzoB18t8Ujf&y%+DO2 zHrsX#cwigk{|~#IG%QNuNGRggUzkvwzP6T_K|L%^M!S7^h8_^AVg22!ih$Xg4lK++ zP${@I&f!~SHS$^!sioeBcWy6UKCjf+$B!Mod3|Ai?u<9{^!~j@qhYu8>{n9X7+*3CAG@;@C_{e~HhDFv}_!ylOuhv>BbFS}2NQbt05Z zXA385tQ7k}TXOA*M`!F*D2dq`yvt5jSMmM>e(7t}4y?+&^Gw7{J5P|CB?qsH*FNy3|n!GRXZSFrzLU qI#ZF}2SKg~NiLRXE%LIf!r#9p=Mxn5KOZ6=-^ds#FjAmG1^xjh%ewCX literal 0 HcmV?d00001 diff --git a/apps/plugins/bitmaps/native/snake2_left.128x96x16.bmp b/apps/plugins/bitmaps/native/snake2_left.128x96x16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a85e58688654979929d3fa831639547adcf20a68 GIT binary patch literal 1590 zcmaivOAf+73`5HXv0}{;dV;PId+y2|xEJ6iaz0inMx73NFZPtjb2~4#HoRBt3-%rR zwA}E(S?3R-c7uiLko9&OXF(Qt5RL)JcGHSCU`tN?U z#!dc(kXp9@yL?F6XIMIlCUg*Jwqq`AE2sUGTu> z9&tHOwaVG`2);%ua?MA=h3tX{Hus3jd8$>;u1D}ST9Io$5-wyHJg~V(T+UOia&|p} uuhEKJ^O0~NyWoM%J>qhnYL&C=5qynS= 160) && (LCD_HEIGHT >= 128) +#if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) \ + || (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96) && (LCD_DEPTH >= 16) #include "pluginbitmaps/snake2_header1.h" #include "pluginbitmaps/snake2_header2.h" #include "pluginbitmaps/snake2_left.h" @@ -121,6 +122,18 @@ Head and Tail are stored #define TOP_X4 114 #define TOP_Y1 4 #define TOP_Y2 25 +#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96) && (LCD_DEPTH >= 16) + #define MULTIPLIER 4 + #define MODIFIER_1 4 + #define MODIFIER_2 2 + #define CENTER_X 8 + #define CENTER_Y 24 + #define TOP_X1 28 + #define TOP_X2 96 + #define TOP_X3 44 + #define TOP_X4 83 + #define TOP_Y1 2 + #define TOP_Y2 13 #elif (LCD_WIDTH == 96) && (LCD_HEIGHT == 96) #define MULTIPLIER 3 #define MODIFIER_1 4 @@ -638,7 +651,8 @@ static void init_snake(void) new_level(level_from_file); } -#if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) +#if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) \ + || (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96) && (LCD_DEPTH >= 16) static void draw_frame_bitmap(int header_type) { rb->lcd_bitmap(header_type==1? snake2_header1: snake2_header2, 0, 0, @@ -670,7 +684,8 @@ static void draw_apple( void ) { int x,y; -#if LCD_WIDTH >= 160 && LCD_HEIGHT >= 128 +#if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) \ + || (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96) && (LCD_DEPTH >= 16) draw_frame_bitmap(2); rb->snprintf(strbuf, sizeof(strbuf), "%d", applecount); @@ -901,7 +916,8 @@ static void redraw (void) } } -#if LCD_WIDTH >= 160 && LCD_HEIGHT >= 128 +#if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) \ + || (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96) && (LCD_DEPTH >= 16) draw_frame_bitmap(2); rb->snprintf(strbuf, sizeof(strbuf), "%d", applecount); @@ -1434,7 +1450,8 @@ static void select_maze(void) while (1) { -#if LCD_WIDTH >= 160 && LCD_HEIGHT >= 128 +#if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) \ + || (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96) && (LCD_DEPTH >= 16) draw_frame_bitmap(1); rb->snprintf(strbuf, sizeof(strbuf), "%d", level); diff --git a/manual/plugins/images/ss-snake2-128x96x16.png b/manual/plugins/images/ss-snake2-128x96x16.png index fbe25b551555e4370bb9028c97ad0f56b87aac6e..8bc61930b5fafc6210b2836450c06ebbbdf0d067 100644 GIT binary patch delta 1913 zcmZuydpOgJ8~?H+k+EpG+xX>vIQ>GAn9JDXPNZ={LMQiYAu+>Y<}x%+E}L6F9M{#{ z5+SWot_|UYNVzpER3!)9V3fF=_aiT~o8gvkc z$3b!05a`L1IMFkbE?6`cXNJ5MSuo@emzpEmcNuTH3Jje6gEM+SvX|4XvJw}KzxJxR zZ_%-Z@ut=nVv<2MoNDGSRZF8Vdcb%ycfk_f{c))}V>X1&05f9MTaDig17^qLOJ0(V zhp1vs13p8hSyPW!qH0=fWIC-}faG|So${OgJ@<$GfN}6Z&x!FEZpnL{1=<r~78>B$yIr_M$urw$sS&uO)%OSkhCIM2E)8Ffe;(La#;G$|a59y{CZB zi85OK?cabiTL7L&!Vq*yA&NimhQUR~f9$=O^&d}C#957zWNty>A1b;)yO)T=`NX6vBH1ohY3VaL{})^n>X57My) zlf0{kLrtlgM+`CTz{&UgXIkaO*y13Q(hL+DcaLu*DWQCuhL*@#CPjh9(P ze$;U=2ov1dp0o)hug)1N?{D2*X2wW9gN%is!*g%t`*q=!A@wg!pZxM|iz$FEIw=d} zd3dzd17@3n*8XTq5?KpI36jb04;0EykP8pLV>W-^(`g`TeZ9Y=us3VR2Vuwf5*x`e z5}){PEyjpBV(}Jn@X}M&w+%Klr=7$1%m>b3hT9V(D+Tc#mv%zF)skv#+Uj$^+c91o z1`3nCR%Sh9n_Q*wOi_hyP-CTc6UV+xZ|(2v2gT{wZQgW_6|RoingO{nk3LF8fXhc; zX+V9;ZHYls?^8)O59(XkKnC@$CUN*xryRxpr8Ud_*43tq;PbL~aQ~p%8jmYe|N4aa z8aJ*HT3V(PmK+*R6xBK%q<5jBNs-nb4d~c4jGV|JS7_!`|K8R(*RW{Kz5PkMsUB&Y zIaQn9`GFwYmd-VwkJSd&K<on z!nC4MF?j@rQflv|e7xM^On*c48^_$0J5ux*efsO0!e!P5H7G*Utt_a`@q!Ad)KD?J zeE{53UNbI^Jrqh%sO7LC%|1}Z6?xMP7{xKbSIR}@tK?gv5h+0*w%PS^UGQHfcdkk4 zW0oJ0!;l@6e z4vC&Bn-S)_7e-tTB!4ebt-AoYH3TibdYI2qJ>PEY8C0-AFsQcI9o3W>mQg~Q<^ z#T2ykl(dB)C}$>jbMYx9r9T4hUD$D|N(1ko&v~}Jumi zPCraL zVcr_AJFS8c?(=DvESyo?v^*4=oTM+XGMm~C5q)LHG}*HW zY8fc5Gc+^R63@$=lgP{FgTTj+{0C>_LH>NpKHs9oxA5gk_0JBBg@PI8#+r7RK{P07 zHQ~9}j%JtL>`6=h>eTp1(2mq%D@vam%;dq}q7Agf z4Ke(Xm&u>GtNud3N3IP9m*NBVlVyM8|NjX8bE2ht6zYcm+X^3+_Jvia#KPWPH50#G zPhl&RzIL|FUW!WsNu(z&bG0bRz3`-4fomLH$}MKAlYEo+?#)>Jx#hjC!2{6e1d1M_ z$QxTkAGv*V5j8v?uLeey@jHyrHe33hD-fNiuZ6yG#XU=xGTg#w-M{JeoargJ?d!77 jly8$?jB8#yuEqOaIZNTOQ;O60PZqGTazr*;Tu=Eg*Gik8 literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^4M3d0!3HF+R#kZdDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5M?jcysy3fAP=ku6i(^Pd+}q0+IS(5MusVLdzlDiWTp)?B zb8h2rvlnZxtNAh%GIa<$%wc%MBB0)2!FXh^(1EDe)pwr1zdG-uYk@jYVAG6`?^Cxj zs{dDDl28CC;Z*QL*F~hz1BLSvlNbBcy$=7$p!VK{Nn%&