From 097895127db3821fe303660259681a2f456cd5a5 Mon Sep 17 00:00:00 2001 From: Edward Emelianov Date: Tue, 27 Apr 2021 00:49:51 +0300 Subject: [PATCH] add pre-pre-alpha of tetris --- F1-nolib/Tetris/TETRIS.bin | Bin 16468 -> 18532 bytes F1-nolib/Tetris/balls.c | 12 +- F1-nolib/Tetris/buttons.c | 2 + F1-nolib/Tetris/buttons.h | 2 + F1-nolib/Tetris/main.c | 35 ++++- F1-nolib/Tetris/menu.c | 18 ++- F1-nolib/Tetris/menu.h | 3 + F1-nolib/Tetris/screen.c | 19 ++- F1-nolib/Tetris/screen.h | 18 +++ F1-nolib/Tetris/snake.c | 69 +++++--- F1-nolib/Tetris/snake.h | 5 +- F1-nolib/Tetris/tetris.c | 314 +++++++++++++++++++++++++++++++++++++ F1-nolib/Tetris/tetris.h | 25 +++ 13 files changed, 476 insertions(+), 46 deletions(-) create mode 100644 F1-nolib/Tetris/tetris.c create mode 100644 F1-nolib/Tetris/tetris.h diff --git a/F1-nolib/Tetris/TETRIS.bin b/F1-nolib/Tetris/TETRIS.bin index f795364b43fa85af925c642a52606792e97bba00..5ba973d657ef86de9e50952108990f1757f55ae3 100755 GIT binary patch delta 6602 zcmb_g4RjPmwyv6)keQI5NhX2(r)MUSNhX9LiEA)OCX>)iGWlT%{_vwaL86UD83Jfz zdE0|Q4J&G(Sr0#pvWn{}tdPMxM2TSqkGkM_Gyd#L1SKlck>J@LjCN=K`rVo&uFv(I zch0`o=X_mNw{G3Kb?e@`)%}qhU+TduT8yaA%}D(zVCW}6KY0ib0U?vpr}^hGKb7%w z?KS@x$Ntl#{=$Dv=+8~`zta}~e^16W;Szt^i24(h zXq^I~FI1>+OH-B|XcY=XEt`4Vw_Ay*?WEtR?Tc$jr;Sb|d?_R08yO3Eg6#YJL_jXcjb@W$*U+5e8RIW zr|x|h1oV#xPfhgsFBoc5Jg8{7d+3v90V(!(EO&jxFY9it)p#_8%iQmOii>V{r4L~0 zUGM&mcP4wv$D!-gr(F_0pr!YBoaCp390wuFs1Oei#)ZuxmIAM*wkx>Lrah@BFXrx# zHE>sB&){8Lulg9g+ca}DyMW7r6xJSYzot3u1=tv*Le?G_PpBv!TX%6dPB)uKBQ``- z^H^RiD16sp$Km=6rt4_6fN_R%8DqPav@y=Q+?mO|$W_NxX@2L(WOgbSe*84IE$()_ znd9S1*;(ryF8lh%`|59Zx+SCaS!af`<(}8+8o|B3WtA*0i-2HTyQ94+vsD(i2eA+e zHjg3O-HwZrcL!k0-3@m)UX;%DX110w=d+G|7hvN)TwQmT`J^UGr5Hm?lmcqe)l6@_ zfvNxgW#d^1S@r;s*(yBamPNKDyc?P-bNb-L5v8!8d8I3i zhmq+$?}Q?6`{vrQFcgFl2V`+y7zzI&y}@H)*EljA_aPx=Qd%!>0=~DwUh~EkQTfmE z1wc6&M1m`fqm-w4y`9CvvEYP3Zt-pdq1*W!V0#JJo)0ObY+XESOtG7t6om1A!ZcN5 z4M(uBJ80)+abxff9%;cVkSw8Z&@iGDR_!nvuFAj&sj-##NCSA>QUKCo>vr&>13=T( zBK6T4q!w6s4FkM@Q-I$?=VHQaLDqOsqzx4L)ubYJeqz;nSoO_PH9w)AET#pq5mdL# z0XJ8HU~tN61lyMr204NdKtdpp1^%+ZoyFvC+Pg_zQg{L9lWj)@?7w^7@+T=&!5R67 zY`W%y9-WsA`dc6#-a`S(bE~Av!q+2VPq4gJHT$3^&PxU!vW@x($6Eoy{dV9A4`IB8 z^gK6uiz1u;fVaaUOrQ*<0uF<^PwB{XA>m4}e?)DS#a9Lh-O`ssH*_6M@W)~WRnRGm zPlVFJ;bJY=Jj+X{N?1i#X!i+Y=YAXZ$|5HdY79_2Cpi`7B%tr%k`w3LM?_Zi5rtL- zQX7V$Tn*~U;v?Xm$#uIoo$@CkBv8Q+^xPUSG70s2HX-USehMSu>%eq}fr+8hnO&QZ zP!c%fr&J1BPn$gbBNbLK#p`H*EU5yPR0~+lRVUtnOO8F1_ykUVCa_;pf#~{iBrF9y z%FWc~u-B&`^&&uv_FuX4K7e{FPCR4X@JGoOKdPgue|u;3Vw67jPJmPn?)W>Pt|+ z3YZP;F(^qCZ-&wZ*bV4RfLAvl1W+yHI#LW7WGr^1GpD$t+Ti1!JhO68;ZTllNse1exR!GMl)TiXz(G=witak9r4wjb42^U7x>q%1_)1WA zDfhWGZuzL%os zfw*OInuO=5YV#p2f9E@xHSCf4O|;Yxigyw}4vWbwrTG%&?S z##i*o;@wRB``@lu1y9eOTX~x5NfdxGCWVlBCQc!8k z(wrWx(H$7AQLfC6h`r%I1=01hHE)l`q+RkH7+n}sL4yNDD6;MdIrH9(eB(*5BjNRk z324m`B=kkFUSo%>#YPHg!ng&}*g0SAl^9A%{ITn!g-Cq?a0x&>qeiXYx~;prTiZ8H z|L{=?gsqCm;vePQ2J02Ak#g$<8RdJkf!-aVz*spjNmnET+U|%G+G)`Kbz}y#J0sbK z)=t7RFTzH|mT>dfrjBIC^FgHBr%?oTO3JJl!j$5uwqF(>kWYI~eH*K9xq=mA-gJ7{ zAd9(?zw>Bd1Qc5eH#^}+N`Bb5O6!7yQx>m2k57@&%M2v=UIjL7c{i|>u^n#V-h!_kZL5UP5%BwUL zc(ExJ?r}1thP1jF4z(-O^^P7HQ|r_0sZ3hE%9+-f){yM9bgt`6FqoZ2rz{SH`$t^X zWU$0oKMSE_h^;Byb*q zOsPXZbDT8_4WxWg^Q4IDM}?L+7k9h%x9xya*Qqd5%c*dRRz@f zvS~taB{o~HZI9ApfNuG3^d5IaY?j|_eA6*dH_(vI#4%>(I_BZbeOY^L_YIwdfXMAc zC5(@#I$LHHCaZAVeY}Zco*qXQT!w^xw^dDnnPf0?Ti63;S{3evq%ZC4ZGig?bx{%? z#y6@)Z8%j*p%6Edc636%M!O}f%{C+jx`LQX3Op8&#rQCBvtsa=*f26IqZfmlE5bwu z+J}qOLm-0-&n#reLeuDkNtYZBp%SaG)otvoGNWs<`_9fhD1&ZH#gMRgs*9WuW#>Ig zv(d$lwIA6E`k`<{JQG0_<+{rM8v2p>b}vh|H-wBvR~!FeQ*>?SsD0G3t+AK76wVCSb^Mx%fn`-=Gmaqr-HtnK2xo@j~ zE{Ial=uX5Uf2xAB4UCl?dETFjDCZo0326Ux2!r;q{9>s0ge+jY0@#tqLkpqZ9V#xl z-%FK1QgRQ&`>-3AD1CIjj>#y~IgMmLsJ%9J?2aR_D^zRe4yfODWI=-BbB6c;b&E&HSx=6T(+1lHf)!$i`)lgaYjfMUxnNA4c-!% zzAj{8Wbre&QPzgc(5?=FSR{)d1En%#0!l^51RU=}yDUV`AWLW_Z=oaNrLe+O=Sy=? z4A_strK`PGH4FD)P8N>?b51A`m@`Auo6x?#%QK;#8X`wlGVEkbeLAgkg)funn~Fpd zg||&cCpjcZq>_kLLp>Gn{<(AK@}VpTkZ5I~+zi+XumXAjD_ID0a*&b8`yJ?4?A15v z9S>aA!^9s42Y6yK3_Ex85nOrR1NKq;5)z;eA;W}iwgngQm4;bVE?>l?7VQ}t=}oQs zLlCv1(H#i37XQ}v2rO^!wGdgn5Lo)X$>6;%8AJ zPtF{&qNSiESxH4-L|hxlY|LzUA&87`WhzIPDEFyPkDgYpVoqo7wZ(c3%wAiHcNLRP zpZOXYEBYhitpVV@z9uVXv?ba#zH0x=-$bmr9Xg1VjgPDuVz z9|S0!2KHzQ5=ZJ z?XNKcoWpQqR)Y8Bv#cUuqnt3UY(~zsj z<+5lDq!o*hZQqNKOgX)Nx?_n%QCcS5netF3=>7QQb&4cI5>`_Qk(pGGC`*#!wjYw> z2f@jt2)S$R&{R@CoSEdA+)dM(6 zC8_cGpqsXma58nmsAd7HBcdnx8wU&jSaghuWzJ@H z+4Mu39m&qj&MPN=?bzI$%iP4g=0{0wzVg~an)tjsqASiBjPYajYyO<1^uZ1F)zN#~ zrASXNsk!Q9@n8f~nrNC@6HP-_@4eun$Hz$;dIZkDyXy-<(vCHu`Yn2)Bf+no z&Vi$z^-SB@%|d9XdY+I{wV2D2@V*)taL0J_l?>f!ze=eQk~B3}G`ctmSH>J#vG5xo z-uHx*ZP^XOCq`LlvMPUASCTN8Gkf}=>g5TG-4-$Rst%E93LWXrjCCehJ+Wj;B3xEGx}%>9JorIlp3#;@N~{L?!)s=*q-xS71ut+H>}`E z-k8cE>*j*DPK6W+v3NKbDgY#*WJ6gDnDTPs;cHafw5+Ba1`bBF5?L{2{r;)-$~tAe z+O>n3ZsnY=MQ(0g*1ZW)4*31Dz?Otw<-X23rg=3HKIcHhR_=vtHi5LdNDHu;o161k z&Kal`8j$+m0Ih&2ej;fr_i@e*F@)kimYi$GF^8dgj;qc)9di$KpW`&tgZSLBE!5xf zjYJOVeiusQMAmaqwnMue7>NW1mb4kL9ncN10!{(0E;{zIVF}J4{A4`gCBlik7iJ-K zJC~Nf0-xj7<=4QwFaM^Bu=rIZ!bksD0pA9I0CGtA8jRH@Bh)Y(sT+!sT1zRA1%6Cf zY)GwEbFGzzV+{qnXWFYbZdkj%y{*j^htSO}Hfq(zyY6c1pw>Rn)^S(++6RFOGT>`> zDPSdFHDFQeeQi`TaOe?gxpQqt+l>@D7JpMWE?v@k|7tR%14J7&HJQxN=igKbX#nG~~ECgkW!B`egN~59lODJ_l zV`(;&HSKM!9YiKPuY$iE2Al*O1e^hU1ULs+ym3R6YiZktjy3D4j<)q1?`s1+C)=5> z){X0lGHA)#4Xqp6sG3`&_4f9gxOr8<;&QMb`P)ZSV*y(D>X4z7Cm)Qg2)#uVR-^v{ DPJwsY delta 4387 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 if(PRESSED(k->port, k->pin)){ // key is in pressed state + lastUnsleep = Tms; // update activity time (any key is in pressed state) switch(e){ case EVT_NONE: // just pressed case EVT_RELEASE: diff --git a/F1-nolib/Tetris/buttons.h b/F1-nolib/Tetris/buttons.h index f5eba8b..1d3d99a 100644 --- a/F1-nolib/Tetris/buttons.h +++ b/F1-nolib/Tetris/buttons.h @@ -43,6 +43,8 @@ typedef enum{ EVT_RELEASE // released } keyevent; +extern uint32_t lastUnsleep; // last keys activity time + void process_keys(); void clear_events(); uint8_t keystate(keycode k, keyevent *evt); diff --git a/F1-nolib/Tetris/main.c b/F1-nolib/Tetris/main.c index e6edc85..1a9a559 100644 --- a/F1-nolib/Tetris/main.c +++ b/F1-nolib/Tetris/main.c @@ -25,9 +25,13 @@ #include "proto.h" #include "screen.h" #include "snake.h" +#include "tetris.h" #include "usb.h" #include "usb_lib.h" +// timeout for autosleep (30s) +#define AUTOSLEEP_TMOUT (30000) + volatile uint32_t Tms = 0; uint8_t balls = 0; @@ -35,7 +39,8 @@ enum{ STATE_MENU, STATE_SNAKE, STATE_TETRIS, - STATE_SLEEP + STATE_SLEEP, + STATE_GAMEOVER } curstate = STATE_SLEEP; /* Called when systick fires */ @@ -89,6 +94,8 @@ static void process_menu(){ break; case MENU_TETRIS: USB_send("Select 'Tetris'\n"); + tetris_init(); + curstate = STATE_TETRIS; break; default: break; @@ -112,7 +119,7 @@ int main(void){ USBPU_OFF(); adc_setup(); USB_setup(); - iwdg_setup(); + //iwdg_setup(); USBPU_ON(); keyevent evt; @@ -133,12 +140,32 @@ int main(void){ break; case STATE_MENU: process_menu(); + if(Tms - lastUnsleep > AUTOSLEEP_TMOUT){ + USB_send("Autosleep\n"); + ScreenOFF(); + curstate = STATE_SLEEP; + } break; case STATE_SNAKE: - if(!proces_snake()) gotomenu(); + if(!snake_proces()){ + show_gameover(); + curstate = STATE_GAMEOVER; + } break; case STATE_TETRIS: - ; + if(!tetris_process()){ + show_gameover(); + curstate = STATE_GAMEOVER; + } + break; + case STATE_GAMEOVER: // show gameover screen + if(keystate(KEY_M, &evt) && evt == EVT_RELEASE){ + gotomenu(); + }else if(Tms - lastUnsleep > AUTOSLEEP_TMOUT){ + USB_send("Autosleep\n"); + ScreenOFF(); + curstate = STATE_SLEEP; + } break; } diff --git a/F1-nolib/Tetris/menu.c b/F1-nolib/Tetris/menu.c index 0bc7069..ef83ab6 100644 --- a/F1-nolib/Tetris/menu.c +++ b/F1-nolib/Tetris/menu.c @@ -39,13 +39,12 @@ static const char* items[] = { [MENU_TETRIS] = " Tetris " }; - static menuitem curitem = MENU_SLEEP; // show menu static void _menu(){ choose_font(FONT14); - setBGcolor(0); + setBGcolor(COLOR_BLACK); ClearScreen(); int charH = curfont->height, charB = curfont->baseline; int curI = midNo; @@ -60,8 +59,7 @@ static void _menu(){ setBGcolor(MENUBGCOLOR); setFGcolor(MENUFGCOLOR); } - PutStringAt((SCREEN_WIDTH - strpixlen(items[i]))/2, - midY + (i-curI)*charH - charB, items[i]); + CenterStringAt(midY + (i-curI)*charH - charB, items[i]); } } @@ -89,3 +87,15 @@ menuitem menu_activated(){ clear_events(); // clear all other events return MENU_NONE; } + +// show "GAME OVER" screen +void show_gameover(){ + setBGcolor(COLOR_BLACK); + setFGcolor(COLOR_RED); + ClearScreen(); + choose_font(FONT14); + CenterStringAt(SCREEN_HEIGHT/2 - curfont->baseline - 1, "Game Over!"); + setFGcolor(COLOR_YELLOW); + uint8_t l = PutStringAt(0, SCREEN_HEIGHT - curfont->baseline, "Score: "); + PutStringAt(l, SCREEN_HEIGHT - curfont->baseline, u2str(score)); +} diff --git a/F1-nolib/Tetris/menu.h b/F1-nolib/Tetris/menu.h index 1273845..8ac68a9 100644 --- a/F1-nolib/Tetris/menu.h +++ b/F1-nolib/Tetris/menu.h @@ -19,6 +19,8 @@ #ifndef MENU_H__ #define MENU_H__ +#include + typedef enum{ MENU_SLEEP, MENU_BALLS, @@ -29,6 +31,7 @@ typedef enum{ } menuitem; void show_menu(); +void show_gameover(); menuitem menu_activated(); diff --git a/F1-nolib/Tetris/screen.c b/F1-nolib/Tetris/screen.c index abec1be..10481f2 100644 --- a/F1-nolib/Tetris/screen.c +++ b/F1-nolib/Tetris/screen.c @@ -23,15 +23,17 @@ #include "screen.h" //#include "usb.h" - // !!!FOR LITTLE-ENDIAN!!! +uint32_t score = 0; // current game's score +uint32_t StepMS, Tlast, incSpd = 0; // common for all games timer values + // X coordinate - from left to right! // Y coordinate - from top to bottom! // (0,0) is top left corner // all-screen buffer -static uint8_t screenbuf[SCREENBUF_SZ]; +uint8_t screenbuf[SCREENBUF_SZ]; extern volatile uint32_t Tms; // time for FPS count static uint32_t FPS = 0, Tfps = 0; // approx FPS uint32_t getFPS(){return FPS;} @@ -112,6 +114,17 @@ uint8_t PutStringAt(int16_t X, int16_t Y, const char *str){ return X - Xold; } +/** + * @brief CenterStringAt - draw string @ center line + * @param Y - y coordinate + * @param str - string + * @return - text width in pixels + */ +uint8_t CenterStringAt(int16_t Y, const char *str){ + int l = strpixlen(str); + return PutStringAt((SCREEN_WIDTH - l)/2, Y, str); +} + // full string length in pixels int strpixlen(const char *str){ int l = 0; @@ -122,8 +135,6 @@ int strpixlen(const char *str){ return l; } -uint8_t *getScreenBuf(){return screenbuf;} - static screen_state ScrnState = SCREEN_RELAX; screen_state getScreenState(){return ScrnState;} diff --git a/F1-nolib/Tetris/screen.h b/F1-nolib/Tetris/screen.h index 7d4c4cd..6ded8e8 100644 --- a/F1-nolib/Tetris/screen.h +++ b/F1-nolib/Tetris/screen.h @@ -43,6 +43,23 @@ typedef enum{ // screen states SCREEN_UPDATENXT // update next quarter } screen_state; +// colors +#define COLOR_BLACK (0b00000000) +#define COLOR_WHITE (0b11111111) +#define COLOR_BLUE (0b00000011) +#define COLOR_LBLUE (0b00000001) +#define COLOR_GREEN (0b00011100) +#define COLOR_LGREEN (0b00001100) +#define COLOR_RED (0b11100000) +#define COLOR_LRED (0b01100000) +#define COLOR_CYAN (0b00011111) +#define COLOR_PURPLE (0b11100011) +#define COLOR_YELLOW (0b11111100) + +extern uint32_t score; // current game score +extern uint8_t screenbuf[SCREENBUF_SZ]; +extern uint32_t StepMS, Tlast, incSpd; // common for all games timer values + screen_state getScreenState(); void ClearScreen(); void setBGcolor(uint8_t c); @@ -53,6 +70,7 @@ void XORPix(int16_t X, int16_t Y, uint8_t pix); uint8_t GetPix(int16_t X, int16_t Y); uint8_t DrawCharAt(int16_t X, int16_t Y, uint8_t Char); uint8_t PutStringAt(int16_t X, int16_t Y, const char *str); +uint8_t CenterStringAt(int16_t Y, const char *str); int strpixlen(const char *str); uint8_t *getScreenBuf(); void process_screen(); diff --git a/F1-nolib/Tetris/snake.c b/F1-nolib/Tetris/snake.c index a36514e..b98995b 100644 --- a/F1-nolib/Tetris/snake.c +++ b/F1-nolib/Tetris/snake.c @@ -29,7 +29,19 @@ #define SNAKE_BGCOLOR (0) #define SNAKE_HEADCOLOR (0b00001101) #define SNAKE_COLOR (0b00101100) +// food: +1 to size #define FOOD_COLOR (0b00011100) +// cut - -1 to size +#define CUT_COLOR (0b11100000) +// chance of CUT appears when drawing food (/1000) +#define CUT_PROMILLE (33) +// score - +10 to score +#define SCORE_COLOR (0b00000001) +// add this to score after each SCORE_COLOR eating +#define ADDSCORE (25) +// chance of SCORE appears when doing move (1/1000) +#define SCORE_PROMILLE (15) +// border #define BORDER_COLOR (0b00100000) // max and min pause between steps #define MAXSTEPMS (199) @@ -46,24 +58,28 @@ static point snake[SNAKE_MAXLEN]; static int8_t dirX, dirY; static uint8_t snakelen; static point Food; -static uint32_t StepMS, Tlast, incSpd = 0; -static uint32_t score; -static void ThrowFood(){ - int notfound = 1; - do{ - Food.x = 1 + getRand() % (SCREEN_WIDTH-2); - Food.y = 1 + getRand() % (SCREEN_HEIGHT-2); - for(int i = 0; i < snakelen; ++i){ - if(Food.x != snake[i].x && Food.y != snake[i].y){ - notfound = 0; - break; - } - } - }while(notfound); - USB_send("Food @ "); USB_send(u2str(Food.x)); - USB_send(", "); USB_send(u2str(Food.y)); USB_send("\n"); +static point RandCoords(){ + point pt = {0,0}; + for(int i = 0; i < 10000; ++i){ // not more than 10000 tries + pt.x = 1 + getRand() % (SCREEN_WIDTH-2); + pt.y = 1 + getRand() % (SCREEN_HEIGHT-2); + if(GetPix(pt.x, pt.y) == SNAKE_BGCOLOR) break; + }; + return pt; +} + +// return 0 if failed +static int ThrowFood(){ + Food = RandCoords(); + if(Food.x == 0 && Food.y == 0) return 0; DrawPix(Food.x, Food.y, FOOD_COLOR); + if(getRand() % 1000 < CUT_PROMILLE){ + point p = RandCoords(); + if(p.x == 0 && p.y == 0) return 1; + DrawPix(p.x, p.y, CUT_COLOR); + } + return 1; } /* static void draw_snake(){ @@ -101,7 +117,6 @@ void snake_init(){ dirX = 1; dirY = 0; break; case 1: - dirX = -1; dirY = 0; break; case 2: @@ -115,12 +130,14 @@ void snake_init(){ Tlast = Tms; incSpd = 0; score = 0; DrawPix(snake[0].x, snake[0].y, SNAKE_HEADCOLOR); + USB_send("Snake inited\n"); } // return 0 if failed static int move_snake(){ int last = snakelen - 1; point tail = {snake[last].x, snake[last].y}; + DrawPix(Food.x, Food.y, FOOD_COLOR); // redraw food DrawPix(snake[0].x, snake[0].y, SNAKE_COLOR); // redraw head with body color DrawPix(tail.x, tail.y, SNAKE_BGCOLOR); // delete tail for(int i = snakelen-1; i > 0; --i){ @@ -135,6 +152,11 @@ static int move_snake(){ if(nxtcolr == SNAKE_COLOR) USB_send("slum into yourself\n"); else USB_send("crush into border\n"); return 0; + }else if(nxtcolr == CUT_COLOR && snakelen > 1){ // make snake shorter + --snakelen; + DrawPix(snake[snakelen].x, snake[snakelen].y, SNAKE_BGCOLOR); + }else if(nxtcolr == SCORE_COLOR){ // add score + score += ADDSCORE; } // not border or snake -> FOOD?! if(snake[0].x == Food.x && snake[0].y == Food.y){ // increase snake len & speed & score @@ -145,7 +167,7 @@ static int move_snake(){ ++snakelen; DrawPix(tail.x, tail.y, SNAKE_COLOR); } - ThrowFood(); + if(!ThrowFood()) return 0; USB_send("Got food, score="); USB_send(u2str(score)); USB_send(", len="); USB_send(u2str(snakelen)); USB_send(", speed="); USB_send(u2str(StepMS)); @@ -163,7 +185,7 @@ static int move_snake(){ #define DECRSPD() do{incSpd /= 2;}while(0) // return 0 if game over -int proces_snake(){ +int snake_proces(){ keyevent evt; static uint8_t paused = 0; // change moving direction @@ -173,13 +195,13 @@ int proces_snake(){ if(keystate(KEY_D, &evt)){ // Down if(evt == EVT_PRESS){ if(dirY != -1) SETDIR(0, 1);} } - if(keystate(KEY_L, &evt)){ // Down + if(keystate(KEY_L, &evt)){ // Left if(evt == EVT_PRESS){ if(dirX != 1) SETDIR(-1, 0);} } - if(keystate(KEY_R, &evt) && (evt == EVT_PRESS || evt == EVT_HOLD)){ // Down + if(keystate(KEY_R, &evt) && (evt == EVT_PRESS || evt == EVT_HOLD)){ // Right if(evt == EVT_PRESS){ if(dirX != -1) SETDIR(1, 0);} } - if(keystate(KEY_M, &evt) && (evt == EVT_PRESS || evt == EVT_HOLD)){ // Pause or out + if(keystate(KEY_M, &evt) && (evt == EVT_PRESS || evt == EVT_HOLD)){ // Menu - Pause or out if(3 == ++paused){ USB_send("Exit snake\n"); clear_events(); @@ -187,7 +209,7 @@ int proces_snake(){ return 0; } } - if(keystate(KEY_S, &evt) && (evt == EVT_PRESS || evt == EVT_HOLD)){ // Pause + if(keystate(KEY_S, &evt) && (evt == EVT_PRESS || evt == EVT_HOLD)){ // Set - Pause if(paused){ USB_send("Snake resume\n"); paused = 0; @@ -226,4 +248,3 @@ int proces_snake(){ return 1; } -uint32_t snake_getscore(){return score;} diff --git a/F1-nolib/Tetris/snake.h b/F1-nolib/Tetris/snake.h index 6b9e3a3..603ab2c 100644 --- a/F1-nolib/Tetris/snake.h +++ b/F1-nolib/Tetris/snake.h @@ -19,10 +19,7 @@ #ifndef SNAKE_H__ #define SNAKE_H__ -#include - void snake_init(); -int proces_snake(); -uint32_t snake_getscore(); +int snake_proces(); #endif // SNAKE_H__ diff --git a/F1-nolib/Tetris/tetris.c b/F1-nolib/Tetris/tetris.c new file mode 100644 index 0000000..951c876 --- /dev/null +++ b/F1-nolib/Tetris/tetris.c @@ -0,0 +1,314 @@ +/* + * This file is part of the TETRIS project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "adcrandom.h" +#include "buttons.h" +#include "screen.h" +#include "tetris.h" + +#include "usb.h" +#include "proto.h" + +// backround color +#define BACKGROUND_COLOR (COLOR_BLACK) +#define CUP_COLOR (COLOR_LRED) + +// height of cup +#define CUPHEIGHT (30) +#define CUPWIDTH (20) +// screen coordinate of x=0 @ cup +#define CUPX0 (1) +// screen coordinate of y=0 @ cup (Y grows upside down) +#define CUPY0 (0) +// coordinates of "NEXT figure" +#define NEXTX0 (30) +#define NEXTY0 (4) +#define xmax (CUPWIDTH-1) +#define ymax (CUPHEIGHT-1) + +// min speed +#define MAXSTEPMS (199) +// max speed / drop speed +#define MINSTEPMS (19) +// each NXTSPEEDSCORE of score the speed will be increased +#define NXTSPEEDSCORE (50) + +extern uint32_t Tms; + +// get coordinates by figure member +#define GETX(u) (((u) >> 4) - 2) +#define GETY(u) (((u) & 0xf) - 2) + +typedef struct{ + uint8_t f[4]; + uint8_t color; +} figure; + +// L: 00, 01, 02, 10 + 2 = 0x22, 0x23, 0x24, 0x32 +static const figure L = { + .f = {0x22, 0x23, 0x24, 0x32}, + .color = COLOR_LBLUE +}; +// J: 00, 01, 02, -10 + 2 = 0x22, 0x23, 0x24, 0x12 +static const figure J = { + .f = {0x22, 0x23, 0x24, 0x12}, + .color = COLOR_BLUE +}; +// O: 00, 01, 10, 11 + 2 = 0x22, 0x23, 0x32, 0x33 +static const figure O = { + .f = {0x22, 0x23, 0x32, 0x33}, + .color = COLOR_YELLOW +}; + +// I: 0-1, 00, 01, 02 + 2 = 0x21, 0x22, 0x23, 0x24 +static const figure I = { + .f = {0x21, 0x22, 0x23, 0x24}, + .color = COLOR_CYAN +}; + +// S: -10, 00, 01, 11 + 2 = 0x12, 0x22, 0x23, 0x33 +static const figure S = { + .f = {0x12, 0x22, 0x23, 0x33}, + .color = COLOR_LGREEN +}; + +// Z: -11, 01, 00, 10 + 2 = 0x13, 0x23, 0x23, 0x32 +static const figure Z = { + .f = {0x13, 0x23, 0x23, 0x32}, + .color = COLOR_GREEN +}; + +// T: -10, 01, 00, 10 + 2 = 0x12, 0x23, 0x22, 0x32 +static const figure T = { + .f = {0x12, 0x23, 0x22, 0x32}, + .color = COLOR_PURPLE +}; + +#define FIGURESNUM (7) +static const figure *figures[FIGURESNUM] = {&L, &J, &O, &I, &S, &Z, &T}; +static figure curfigure, nextfigure; + +// current figure coordinates +static int xf, yf; +// next score the speed will be encreased +static uint32_t nextSpeedScore = 0; + + +// chk if figure can be put to (x,y); @return 1 if empty +static int chkfigure(int x, int y, const figure *F){ + if(x < 0 || x > xmax) return 0; + if(y < 0 || y > ymax) return 0; + for(int i = 0; i < 4; ++i){ + int xn = x + GETX(F->f[i]), yn = y + GETY(F->f[i]); + if(yn > ymax || yn < 0) return 0; + if(xn < 0 || xn > xmax || yn < 0) return 0; // border + if(GetPix(xn ,yn) != BACKGROUND_COLOR) return 0; // occupied + } + return 1; +} + +// clear figure from old location +static void clearfigure(int x, int y){ + USB_send("Clear @ "); USB_send(u2str(x)); USB_send(", "); USB_send(u2str(y)); USB_send("\n"); + for(int i = 0; i < 4; ++i){ + int xn = x + GETX(curfigure.f[i]), yn = y + GETY(curfigure.f[i]); + if(xn < 0 || xn > xmax || yn < 0 || yn > ymax) continue; // out of cup + DrawPix(xn, yn, BACKGROUND_COLOR); + } +} + +// put figure into new location +static void putfigure(int x, int y, figure *F){ + USB_send("Put @ "); USB_send(u2str(x)); USB_send(", "); USB_send(u2str(y)); USB_send("\n"); + for(int i = 0; i < 4; ++i){ + int xn = x + GETX(F->f[i]), yn = y + GETY(F->f[i]); + if(xn < 0 || xn > xmax || yn < 0 || yn > ymax) continue; // out of cup + DrawPix(xn, yn, F->color); + } +} + +// dir=-1 - right, =1 - left +static void rotatefigure(int dir, figure *F){ + figure nF = {.color = F->color}; + for(int i = 0; i < 4; ++i){ + int x = GETX(F->f[i]), y = GETY(F->f[i]), xn, yn; + if(dir > 0){ // CW + xn = y; yn = -x; + USB_send("Rotate CW\n"); + }else if(dir < 0){ // CCW + xn = -y; yn = x; + USB_send("Rotate CCW\n"); + } + nF.f[i] = ((xn + 2) << 4) | (yn + 2); + } + *F = nF; +} + +// check cup for full lines & delete them; return number of deleted lines +static int checkandroll(){ + int upper = 0, ret = 0; + for(int y = 0; y < CUPHEIGHT; ++y){ + int N = 0; + for(int x = 0; x < CUPWIDTH; ++x) + if(GetPix(x, y) != BACKGROUND_COLOR) ++N; + if(N == 0) upper = y; + else if(N == CUPWIDTH){ // full line - roll all upper + ++ret; + for(int yy = y; yy <= upper; --yy){ + uint8_t *ptr = &screenbuf[(yy+CUPY0)*SCREEN_WIDTH + CUPX0]; + for(int x = 0; x < CUPWIDTH; ++x, ++ptr) + *ptr = ptr[-CUPWIDTH]; // copy upper row into the current + } + ++upper; + } + } + USB_send("Roll="); USB_send(u2str(ret)); USB_send("\n"); + return ret; +} + +// get random number of next figure +static int getrand(){ + static int oldnum[2] = {-1, -1}; + int r = getRand() % FIGURESNUM; + if(r == oldnum[1]) r = getRand() % FIGURESNUM; + if(r == oldnum[0]) r = getRand() % FIGURESNUM; + oldnum[0] = oldnum[1]; + oldnum[1] = r; + return r; +} + +// return 0 if cannot move +static int mvfig(int *x, int *y, int dx){ + register int xx = *x, yy = *y; + int xnew = xx+dx, ynew = yy+1, ret = 1; + clearfigure(xx, yy); + if(chkfigure(xnew, ynew, &curfigure)){ + xx = xnew; yy = ynew; + *x = xx; *y = yy; + }else ret = 0; + putfigure(xx, yy, &curfigure); + return ret; +} + +// dir == -1 - left, 1 - right +static void rotfig(int x, int y, int dir){ + if(!dir) return; + figure newF = curfigure; + rotatefigure(dir, &newF); + clearfigure(x, y); + if(chkfigure(x, y, &newF)){ // can rotate - substitute old figure with new + curfigure = newF; + } + putfigure(x, y, &curfigure); +} + +// draw current & next figures; return 0 if can't +static int drawnext(){ + curfigure = nextfigure; + clearfigure(NEXTX0, NEXTY0); // clear NEXT + nextfigure = *figures[getrand()]; + putfigure(NEXTX0, NEXTY0, &nextfigure); + xf = xmax/2; yf = ymax/2; + if(!chkfigure(xf, yf, &curfigure)) return 0; // can't draw next + putfigure(xf, yf, &curfigure); + return 1; +} + +void tetris_init(){ + setBGcolor(BACKGROUND_COLOR); + ClearScreen(); + ScreenON(); + StepMS = MAXSTEPMS; + Tlast = Tms; + incSpd = StepMS; + score = 0; + nextSpeedScore = NXTSPEEDSCORE; + // draw cup + for(int y = 0; y < CUPHEIGHT; ++y){ + DrawPix(CUPX0, CUPY0 + y, CUP_COLOR); + DrawPix(CUPX0 + CUPWIDTH, CUPY0 + y, CUP_COLOR); + } + for(int x = 0; x < CUPWIDTH; ++x) + DrawPix(CUPX0 + x, CUPY0 + CUPHEIGHT, CUP_COLOR); + nextfigure = *figures[getrand()]; + drawnext(); +} + +// process tetris game; @return 0 if game is over +int tetris_process(){ + uint8_t moveX = 0, rot = 0; + keyevent evt; + static uint8_t paused = 0; + // change moving direction + if(keystate(KEY_U, &evt) && (evt == EVT_PRESS || evt == EVT_HOLD)){ // UP - pause + if(paused){ + USB_send("Tetris resume\n"); + paused = 0; + }else{ + USB_send("Tetris paused\n"); + paused = 1; + } + } + if(keystate(KEY_D, &evt) && evt == EVT_PRESS){ // Down - drop + incSpd = MINSTEPMS; + } + if(keystate(KEY_L, &evt) && evt == EVT_PRESS){ // L - left + moveX = -1; + } + if(keystate(KEY_R, &evt) && evt == EVT_PRESS){ // Right + moveX = 1; + } + if(keystate(KEY_M, &evt) && evt == EVT_PRESS){ // Menu - rotate CCW + rot = -1; + } + if(keystate(KEY_S, &evt) && evt == EVT_PRESS){ // Set - rotate CW + rot = 1; + } + clear_events(); + if(Tms - Tlast > incSpd){ + Tlast = Tms; + if(paused) return 1; + int xnew = xf, ynew = yf; + if(rot) rotfig(xf, yf, rot); + if(!mvfig(&xnew, &ynew, moveX) && ynew == yf){ // can't move: end of moving? + int s = checkandroll(); + switch(s){ // add score + case 1: + score += 1; + break; + case 2: + score += 3; + break; + case 3: + score += 7; + break; + case 4: + score += 15; + break; + default: + break; + } + if(StepMS > MINSTEPMS && score > nextSpeedScore){ // increase speed + --StepMS; + nextSpeedScore += NXTSPEEDSCORE; + } + if(!drawnext()) return 0; + } + } + return 1; +} diff --git a/F1-nolib/Tetris/tetris.h b/F1-nolib/Tetris/tetris.h new file mode 100644 index 0000000..ca04e1b --- /dev/null +++ b/F1-nolib/Tetris/tetris.h @@ -0,0 +1,25 @@ +/* + * This file is part of the TETRIS project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#pragma once +#ifndef TETRIS_H__ +#define TETRIS_H__ + +void tetris_init(); +int tetris_process(); + +#endif // TETRIS_H__