From 99186c887bd86d61926db818491ae19d0a7ea544 Mon Sep 17 00:00:00 2001 From: Rohmer Maxime Date: Thu, 13 Jun 2024 21:20:27 +0200 Subject: [PATCH] The god damm programm wont crash anymore but still is crappy af --- Debug/MyProject.axf | Bin 308612 -> 308908 bytes Debug/MyProject.map | 278 +++++++++++++++---------------- Debug/MyProject_Debug.ld | 2 +- Debug/MyProject_Debug_library.ld | 2 +- Debug/MyProject_Debug_memory.ld | 2 +- Debug/src/SPI.d | 3 +- Debug/src/SPI.o | Bin 289888 -> 293792 bytes Debug/src/SPI.su | 48 +++--- Debug/src/main.o | Bin 49840 -> 49852 bytes Debug/src/main.su | 2 +- src/SPI.c | 18 +- src/Ship_1.h | 4 +- src/Ship_3.h | 108 ++++++++++++ src/main.c | 18 +- 14 files changed, 306 insertions(+), 179 deletions(-) create mode 100644 src/Ship_3.h diff --git a/Debug/MyProject.axf b/Debug/MyProject.axf index af2a055a6a5d862d684b486587e5bdbc310e3a75..3df48ad8bb8f478e45746205c9301b29e346d32f 100755 GIT binary patch delta 11479 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 Lb8_ikHTAy$)%>rI delta 10718 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 RTbX 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 Qq!($5i}?w3W|CFks?a59R(B= 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 diff --git a/Debug/src/SPI.su b/Debug/src/SPI.su index 8c94ada..42e949c 100644 --- a/Debug/src/SPI.su +++ b/Debug/src/SPI.su @@ -1,24 +1,24 @@ -../src/SPI.c:25:6:Init_SPI 8 static -../src/SPI.c:42:6:DC_MODE_DATA 4 static -../src/SPI.c:45:6:DC_MODE_COMMAND 4 static -../src/SPI.c:48:6:CS_UP 4 static -../src/SPI.c:51:6:CS_DOWN 4 static -../src/SPI.c:54:6:Write_Cmd 16 static -../src/SPI.c:64:6:Write_Cmd_Data 16 static -../src/SPI.c:74:6:ILI9341_Initial 8 static -../src/SPI.c:193:9:Split_Uint8 24 static -../src/SPI.c:198:6:SendPixel 24 static -../src/SPI.c:211:6:Resize_Window 64 static -../src/SPI.c:245:6:scroll 24 static -../src/SPI.c:255:6:Get_Color_From_Background 32 static -../src/SPI.c:262:6:Get_Color_From_Sprite 16 static -../src/SPI.c:268:6:auto_screen_roloff 64 static -../src/SPI.c:278:6:Refresh_Area 72 static -../src/SPI.c:290:6:Refresh_Player_Area 6240 static -../src/SPI.c:313:6:DrawPlayer 6232 static -../src/SPI.c:334:6:Draw_stars 32 static -../src/SPI.c:344:5:strLen 24 static -../src/SPI.c:354:6:DrawChar 72 static -../src/SPI.c:375:6:DrawText 72 static -../src/SPI.c:383:6:DrawSolidBackground 24 static -../src/SPI.c:391:6:Fill_Gradient 48 static +../src/SPI.c:26:6:Init_SPI 8 static +../src/SPI.c:43:6:DC_MODE_DATA 4 static +../src/SPI.c:46:6:DC_MODE_COMMAND 4 static +../src/SPI.c:49:6:CS_UP 4 static +../src/SPI.c:52:6:CS_DOWN 4 static +../src/SPI.c:55:6:Write_Cmd 16 static +../src/SPI.c:65:6:Write_Cmd_Data 16 static +../src/SPI.c:75:6:ILI9341_Initial 8 static +../src/SPI.c:194:9:Split_Uint8 24 static +../src/SPI.c:199:6:SendPixel 24 static +../src/SPI.c:212:6:Resize_Window 64 static +../src/SPI.c:246:6:scroll 24 static +../src/SPI.c:256:6:Get_Color_From_Background 32 static +../src/SPI.c:269:6:Get_Color_From_Sprite 16 static +../src/SPI.c:275:6:auto_screen_roloff 64 static +../src/SPI.c:285:6:Refresh_Area 72 static +../src/SPI.c:297:6:Refresh_Player_Area 6256 static +../src/SPI.c:323:6:DrawPlayer 6232 static +../src/SPI.c:344:6:Draw_stars 32 static +../src/SPI.c:354:5:strLen 24 static +../src/SPI.c:364:6:DrawChar 72 static +../src/SPI.c:385:6:DrawText 72 static +../src/SPI.c:393:6:DrawSolidBackground 24 static +../src/SPI.c:401:6:Fill_Gradient 48 static diff --git a/Debug/src/main.o b/Debug/src/main.o index 9afd3c3a7cebe579326634accd2ccfdb3cb0e0bb..ab5edc4873e41664646c7b2caa4179789b7cbe80 100644 GIT binary patch delta 786 zcmXYtZAcVh5XYa{y~leK>(EsTlU3=q%QB@5>5Cn#cvp%@f+j&~L}w6q8Bquwf@TVu z>lBnoYH48fLEED|y}Q&P(+`z?5Q^x{z>1(3g6u=k?0EzGo992z%x3 zJ(|eAEN(47T5nnZa-TgHJh;oAS)iHUQ7=LB#h}?!8eU4M$(S44=6j;?QPF>t~hCB0krp!$;ckSVa@_0=iFPC|N%roR- zTy~8*Mg=ni;F}qzWzl@M^(#By)aniGU6ASl#@tDXZDNPe1MVb`JJDPu4Cq3~QxQ~s zq3elAzw7R~YI2QGsjZo@hjG7Rct2y`;(kAMvYlg0)l2ZW46XX8zRF<|J45p@gOyVi z@E(V!=HUl6PFKJ>hNi!RjAP*=w2^<|9N2+b5d}V>mso>-;yT`pC<42Na}g(G;};4I zq9dvZmK%5=>V!0`k1EiFox}i65cBaB@hie(1$xm%yoHs-mw1u54~L1Lae=7fPvSam znNi>@x`{q)ByLBIScD;BDSjZ

x?a)7DYyDirIf`zu*u6 delta 900 zcmXX^O-vI}5T3W&rIgZIQnrv-nhM$#5rP82pQtnz#ehL01cMMoA@+aXk*H{tl7L%G1PW3S)PpfbJs5}r{%{~MBp5w-a9-&-gWjS_&x0DSjQbYIWZu|KT0JL5)6zxiDRC+j1?`j^K5N z@0!Y;YN?#O_mog_TljV-tUt9BwyPd}qoj9H+kDY1aJgB=5mO#>sns!eV%e-3?NG(I z(~=`ive_k#UCKRHHl*n?_k5^xa^r6nyHcfI5l}6P8JPGgb`CbdK7~Z#%Q`C8Y z9Q80Bx3hY6P+gFi4?CVsGe4FO7qSo7KRnI8;f0YxwuCQ7ez8~_8a+aznVT@9HDF>^ zObsaPD;5(LU<2U__68JT1@Udb!EE@OsBTOcQ-puFaNn4Nneoh+!YZ+YupR@1>+w6` z4>XJ`hQ?0n#|V%|J!atY*jm+V)V*Sv>e$F_iTIyrXBq`JJJfbsGQ@agb^@)37#%{dR@4y`)WYjTNCh zp-5T>z#KX!lIXrw6AD|z7QzG^BCNz&LLW*&g=JzYVI>xaupy|#SNj33gnlS}fL8d4 Fz<*yY^dRed = SMPTE.pixel_data[index]; color->Green = SMPTE.pixel_data[index+1]; color->Blue = SMPTE.pixel_data[index+2]; @@ -301,12 +308,15 @@ void Refresh_Player_Area(Rectangle area,Rectangle Hitbox){ && x + area.Position.X < Hitbox.Position.X + Hitbox.Size.Width){ Get_Color_From_Sprite(sprite,(Point){x-(Hitbox.Position.X - area.Position.X),y-(Hitbox.Position.Y-area.Position.Y)},&color); - SendPixel(color.Red,color.Green,color.Blue); + + if(color.Red == 0 && color.Green == 0 && color.Blue == 0) + Get_Color_From_Background((Point){area.Position.X+x,(area.Position.Y+y)%SCREEN_HEIGHT},&color); }else{ - //Get_Color_From_Background((Point){area.Position.X+x,(area.Position.Y+y)%SCREEN_HEIGHT},&color); - //SendPixel(color.Red,color.Green,color.Blue); - SendPixel(0,0,0); + Get_Color_From_Background((Point){area.Position.X+x,(area.Position.Y+y)%SCREEN_HEIGHT},&color); + if(y == 0 || y == area.Size.Height -1 || x == 0 || x == area.Size.Width -1) + color = (Color){255,0,0}; } + SendPixel(color.Red,color.Green,color.Blue); } } } diff --git a/src/Ship_1.h b/src/Ship_1.h index 8173ca3..852d7e8 100644 --- a/src/Ship_1.h +++ b/src/Ship_1.h @@ -3,14 +3,14 @@ /* GIMP RGB C-Source image dump (Ship_1.c) */ -typedef struct Sprite_32x32_t{ +const typedef struct Sprite_32x32_t{ unsigned int width; unsigned int height; unsigned int bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */ unsigned char pixel_data[32 * 32 * 3 + 1]; }Sprite_32x32; -const Sprite_32x32 ShipSprite1 = { +static const Sprite_32x32 ShipSprite1 = { 32, 32, 3, "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" diff --git a/src/Ship_3.h b/src/Ship_3.h new file mode 100644 index 0000000..cefd6d7 --- /dev/null +++ b/src/Ship_3.h @@ -0,0 +1,108 @@ +#ifndef SPRITE_SHIP_3 +#define SPRITE_SHIP_3 +/* GIMP RGB C-Source image dump (Ship_3.c) */ + +static const struct { + unsigned int width; + unsigned int height; + unsigned int bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */ + unsigned char pixel_data[32 * 32 * 3 + 1]; +} Ship_3 = { + 32, 32, 3, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\364\364\364\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\364\364\364\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\364\364\364\364\364\364\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\364\364\364\364\364\364\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\364\364\364\063= SCREEN_SIZE.Height){ player.Hitbox.Position.Y = vector.Y - (SCREEN_SIZE.Height - player.Hitbox.Position.Y); @@ -147,9 +153,11 @@ void RefreshPlayer(Point vector){ Refresh_Player_Area((Rectangle){bigPos,bigSize},player.Hitbox); - //Rectangle rect = player.Hitbox; - //rect.Position = (Point){0,0}; - //DrawPlayer(player,rect); + /* + Rectangle rect = player.Hitbox; + rect.Position = (Point){0,0}; + DrawPlayer(player,rect); + */ } int main(void) {