From 0e9dc3b10e62011708c977b9616c52557cb3c5d5 Mon Sep 17 00:00:00 2001 From: Ulysse Cura Date: Sun, 4 May 2025 18:18:55 +0200 Subject: [PATCH] Adding some code that won't change anything... --- .vscode/settings.json | 4 +- CMakeLists.txt | 8 +- assets-cg/enemy-sheets/enemy_death_sheet.png | Bin 0 -> 3430 bytes assets-cg/enemy-sheets/enemy_idle_sheet.png | Bin 0 -> 1614 bytes assets-cg/enemy-sheets/enemy_run_sheet.png | Bin 0 -> 2197 bytes assets-cg/enemy-sheets/fxconv-metadata.txt | 3 + assets-cg/maps/map_test.json | 35 ++++++++ src/ecs/components.h | 1 + src/ecs/ecs.c | 11 +++ src/ecs/ecs.h | 5 +- src/ecs/enemy_system.c | 88 +++++++++++++++++++ src/ecs/enemy_system.h | 35 ++++++++ src/ecs/player_system.c | 26 +++--- src/ecs/player_system.h | 15 ++-- src/game.c | 17 +++- src/main.c | 5 +- src/map_manager.c | 0 src/map_manager.h | 8 ++ src/maps.h | 15 ++++ src/texture_manager.c | 4 +- src/texture_manager.h | 6 +- src/textures.h | 5 ++ 22 files changed, 254 insertions(+), 37 deletions(-) create mode 100644 assets-cg/enemy-sheets/enemy_death_sheet.png create mode 100644 assets-cg/enemy-sheets/enemy_idle_sheet.png create mode 100644 assets-cg/enemy-sheets/enemy_run_sheet.png create mode 100644 assets-cg/enemy-sheets/fxconv-metadata.txt create mode 100644 assets-cg/maps/map_test.json create mode 100644 src/ecs/enemy_system.c create mode 100644 src/ecs/enemy_system.h create mode 100644 src/map_manager.c create mode 100644 src/map_manager.h create mode 100644 src/maps.h diff --git a/.vscode/settings.json b/.vscode/settings.json index de6b62f..681799b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -27,7 +27,9 @@ "display-cg.h": "c", "stdbool.h": "c", "libimg.h": "c", - "stdint.h": "c" + "stdint.h": "c", + "transform_component.h": "c", + "sprite_component.h": "c" }, "C_Cpp.default.compilerPath": "/home/ulysse-cura/.local/bin/sh-elf-gcc" } \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 1855874..4438e61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,20 +20,24 @@ set(SOURCES src/ecs/sprite_component.c src/ecs/animation_system.c src/ecs/player_system.c + src/ecs/enemy_system.c ) # fx-CG-50-only assets set(ASSETS_cg assets-cg/player-sheets/player_idle_sheet.png assets-cg/player-sheets/player_run_sheet.png + + assets-cg/enemy-sheets/enemy_idle_sheet.png + assets-cg/enemy-sheets/enemy_run_sheet.png ) fxconv_declare_assets(${ASSETS_cg} WITH_METADATA) add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}}) # Release only -target_compile_options(myaddin PRIVATE -Wall -Wextra -Ofast -flto) -# target_compile_options(myaddin PRIVATE -Wall -Wextra -g -flto -Wpedantic -Wshadow -Wconversion -Wfloat-equal -Wformat=2 -Wuninitialized -Wsign-compare -Wundef -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes) +#target_compile_options(myaddin PRIVATE -Wall -Wextra -Ofast -flto) +target_compile_options(myaddin PRIVATE -Wall -Wextra -g -flto -Wpedantic -Wshadow -Wconversion -Wfloat-equal -Wformat=2 -Wuninitialized -Wsign-compare -Wundef -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes) target_link_libraries(myaddin Gint::Gint) if("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50) diff --git a/assets-cg/enemy-sheets/enemy_death_sheet.png b/assets-cg/enemy-sheets/enemy_death_sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..2a10b986179ef7027c9c32e82634c9b0b58ac29a GIT binary patch literal 3430 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 literal 0 HcmV?d00001 diff --git a/assets-cg/enemy-sheets/enemy_idle_sheet.png b/assets-cg/enemy-sheets/enemy_idle_sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..6902aa41a3f75925080265e87b10b0cf942ce616 GIT binary patch literal 1614 zcmV-U2C?~xP)Px*2uVaiRCt{2TTN&iM;Lvo8!L^lWhs-ob)_w7!8pheB`u`%;9iQTpzfuCQ0j9+ z4+S5ZHtNr*X`IqRdMdP#TYP9K6f74PkxO$hNvRzfywns@@X9|p+E|u_1ac#`ht-T$ z(rSOCS*>aHPS(!szHi^W@7tN#HPAy3J^X*+v3mj`LB*&&OnjdEYnk>V>Y=N!WdK5g z%1msi?$`_GVgP`@@1+0$iPT=t1P+3C0$MfzAwgy8^f5$+`(i zb+HofV!PtJo{{u%O?YUbtH|@6N0A! z+^#@w@;jM;Pqu0}e{H<(cloP78Bt`oABof+{DPOYPwvbE0Ft?i8K-S%1<*rexF6!q z0gG)WHiSe93a>%1%1_ZLzg_~GVe+jv0n`%EDs&C-V0qi~)5lQGUmM4kSO5TwTs{Rr zH3GfaP-GC|LKXm!gldMoRA$#XGZqE_*e!?M6o4nF0eOH|0-hNQ8|vS(0%%QecUFRw z&OwL$Er%38ijBe+?Cj11Unka-%AcLExrr2%LlH>b) zox|enI!=~K)mC**K-+|903(qBY>4|!f!KxH6$ofHAO+>WwNm1efvwQ31bo7*gDmfQ z7H0lp1KTaA0<2;rG5{%^!`)d4TVes;su2KH0E$p#kcq&H8vwS%0=C40E`KO8h`dxr zUMeG*t00-Hu-|~S3^a@5=F}3q&&AnwEKUE8)y)Fy6HkmH5>3h)cwI%Ar_ z)BqGGOC?SA*KlLv0{~!yLmzd%k>Q8-xT~@;mVe)Pr8~0jkz-r$2#| z&Ou7&mFQmr1r2lyADhMD~q=QsM*1wIo|Fwuo3MFz-uYk zir)-8?!A))Yqi~$7reN7Wg53uN(d7l z7xCS!K&|+JGUMtb1MQ%l1T=%80SF0V|JY+Co)~4v?!5FgCYBynmqNA8kJXYo`yCJT zRomLj7$dk@fg1VaiBT>YXa=Vfu%!X$40a!nO@sXO`ZrAQ)33gcpKp9b( znb;7nbIL#?bRz*x9|3u(%qBSi*o;_Gk%y@imp4)Di+ZBkAAi~7gWI#ZDH{zrL zyOn^Z1_%?MM_kA%;zAaF!K+S&&K_^-mw4|T06=nXp1l#X9EA?tu0V|6f&umU`8)!h zPC!em06Lf%si<6t9f!DcfYr?cHi~_$&#zzq*wp|2S_Xs!EeE3qH!F};ILY5>0%qi* z;q?u(lulq822mkT)%OeeYTKW;*YfO|^gLPKH4LH^H$_G+Dgc-O7peki-@wtm_~hJt zQ~7OY5=Qwma#5ihO@L~^smec&^V1ld*59;DH)e2@RFv`O1_0E*oBr+P&+*zHpVfU3 z(TM>7cMVASfqDbxr82t3ue}BZZ~aY|ffRHyWHoS&cveqog5Dz}N-8iCAT9SPyuQfM z@OuFDabz|CJo&q!zpb4>07%PyNXzO3CrS!<=Hj=k?T6(@h!P+z7Zn~$Ft-ipHoqQt z>u=cr8M&xLNv+h;EWj@xv16oqj0Om(!gW#t8_`Vz9wvUL^tW9BtRPA%+(mHPfNt~K zfgSx#4M2k@B#5+JTlQ&hvKeYWxBfT42?M&t@3j7g0XELQBk>dL$A-9%yj0e%Hx<9& zWiLajU#fVtH(?iq1hoR#{!XydH-U$NUjs+LES zdvo;Wk9d!Iwl}vZf0F<_mSJx5JFUOr7eQg-V}ENePTjS&vDxz6YQVO$#tMIR-@S=n z+vmT`&r|=F2GDMT(7kXW8eltO+3X|T^Jt$?WDwQ!+7hA1-yQyc0q81(rVdb$a{vGU M07*qoM6N<$g5MD5U;qFB literal 0 HcmV?d00001 diff --git a/assets-cg/enemy-sheets/enemy_run_sheet.png b/assets-cg/enemy-sheets/enemy_run_sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..837bc47239263d454c0fd6627ae1154e1df5316d GIT binary patch literal 2197 zcmV;G2x|9{5*f(c%E(9=_gf9 zW+w0V^Y?wf-@KVOV+B11#^Q$G{sbFR{(pV3Q|W9w^c(+5w-X2h#^T1z)Sjkoe?2+{ z0Qm9SIRHRzZndo<^qT>~pda}UT>#xO0Aq3EWO^4;`*%3@Y0H}cVC~DztwPr;(u=zv z4G<=7Kk^?c$!-~d$Oqsm0MLFB`qcoUar>2j;RHKrfcuZ!?dWpHV*^bw>~J%JECKr2 z0B+b${NE8a0XL-f?|`ct|8 z>I#yX7!I61WaW~~#4G_0rtSm)tQE^rWB0oOys%yP|BH753jlzdS`|07Dh5vv z%*1f)=_H1egH6VW68n=g3pkM4jiS1Os~3wF4+P2!Fu5QT$chcz=D*$iyB0tv69|H? zSCstB4g9R#l0J42wu1qJ(C_?v7C@&G5XF7#>$q=y-Ld`rp9!08#WS|ABXb>IoR_AXOB)UQtvu7J!D6gUIIYwa5pWyCJ__7TmJ@`1m>@N1;Ff% z7P##)(9Z@Cg|1f=UWapi!oN@fbjtvT#}Zi7YeqIVipu~d3niR5vKQman^;(?;^=cP zSjWhv~7M)*UItc41+u+H?GS7C=zW+LR}ABo)`fDOrzA+0;GHBqB@WUy~e+50SI;9dm6_tEL8!9 zmJ;y8T5-c#fC0=q4Q_aI`jmBNWc;&Bp3jSf0o_9nBR(Lv00~}tOrzBH4h)FtKpONK z|E>klYWHm=0Y4<)5oHc+$D&>{=mN~G2njofq8ore z1NiB|YjOOE$1VP4n2^tbu{giWp#y2qYyA5bfLCAup25Q=APN#7!?uj^dv*h8em4A@ z2j9TM|9f5P3n63xQSkw}2Cx?ZVNtIcC)2w;P0(rniF-iq3pt(O-*XCN3#{bkR_lSA z3Fm`15~v6#Ac_PVlCrcO1|*`cS9k-!uK-njz#s!e`Ru&;T}*&4ZmfgXqPYX#=3kV5 z*8<=J6Bvst`tRNyn37;;Uyxz|FR1zeRNb6nWte$3y6f2w0GR6(83w4PP*UgM-7o;) z?BaI*`R)rqS^;{&&Ogt+xvjVO7k(6?TLvI3>NO+78fP0a0RZ4XuK)m8eH#fR0}nj% zck_p(>-Dj>R{;_{`L}To^cMe~1zgen041e}4hxl!b2 zZgivwcw9dB9N0s03ZOJ!Fi3ct*!IsPb$+hv6-CR#;7vzAtNC)60+hmkHaF_I7-~n| zuu?SV&2IxgzF}{IqGw;v0-&c4{r20p)#t2D$)vLTpydn3NP0qg5%4*RiW3Hm#hVOB zQxVk3A4yO62^1OjBH$l+*79YC2E@O8oYK6>f0SvN7rz`Q(&6Jj`V0opXbi1*z_kE~ zB(EX}AW_lsWyk4T%NLAnZWM*jclXryktQ=Si&!mRMmq}G4^#w{3+3UXfdY>rh>}M# z6BC~1wCfsx#-^W3^99G5DS#UXgkFi{i@n?R*)*<5eqnhElS`Pf-OLgtuQ0J?^6$5QBt2p2lgz|g`h0%^ XmfyK}Mk}FN00000NkvXXu0mjfQh^oJ literal 0 HcmV?d00001 diff --git a/assets-cg/enemy-sheets/fxconv-metadata.txt b/assets-cg/enemy-sheets/fxconv-metadata.txt new file mode 100644 index 0000000..9f19cbb --- /dev/null +++ b/assets-cg/enemy-sheets/fxconv-metadata.txt @@ -0,0 +1,3 @@ +*.png: + type: bopti-image + name_regex: (.*)\.png img_\1 diff --git a/assets-cg/maps/map_test.json b/assets-cg/maps/map_test.json new file mode 100644 index 0000000..0c30ebc --- /dev/null +++ b/assets-cg/maps/map_test.json @@ -0,0 +1,35 @@ +{ + "map_width": 10, + "map_height": 10, + + "background": [ + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0] + ], + + "hitboxes": [ + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0], + [0,0,0,0,0,0,0,0,0] + ], + + "player_init_pos": { + "x": 2, + "y": 2 + } +} \ No newline at end of file diff --git a/src/ecs/components.h b/src/ecs/components.h index e842d7d..485e637 100644 --- a/src/ecs/components.h +++ b/src/ecs/components.h @@ -5,6 +5,7 @@ #include "sprite_component.h" #include "animation_system.h" #include "player_system.h" +#include "enemy_system.h" // Add new components header file here #endif // COMPONENTS_H \ No newline at end of file diff --git a/src/ecs/ecs.c b/src/ecs/ecs.c index 1f02224..2b1d6b4 100644 --- a/src/ecs/ecs.c +++ b/src/ecs/ecs.c @@ -54,6 +54,17 @@ component_t *create_component(component_type_t component_type) component->component_deleter = player_system_destroy; break; + case ENEMY_SYSTEM: + component->component_init = enemy_system_init; + component->component_update = enemy_system_update; + component->component_draw = NULL; + + component->component_data.enemy_system_data = kmalloc(sizeof(enemy_system_data_t), NULL); + if(!component->component_data.enemy_system_data) return NULL; + + component->component_deleter = enemy_system_destroy; + break; + // Add new components attributions here default: diff --git a/src/ecs/ecs.h b/src/ecs/ecs.h index 425b6a6..c191692 100644 --- a/src/ecs/ecs.h +++ b/src/ecs/ecs.h @@ -8,13 +8,15 @@ typedef enum component_type_t { TRANSFORM_COMPONENT, SPRITE_COMPONENT, ANIMATION_SYSTEM, - PLAYER_SYSTEM + PLAYER_SYSTEM, + ENEMY_SYSTEM, } component_type_t; typedef struct transform_component_data_t transform_component_data_t; typedef struct sprite_component_data_t sprite_component_data_t; typedef struct animation_system_data_t animation_system_data_t; typedef struct player_system_data_t player_system_data_t; +typedef struct enemy_system_data_t enemy_system_data_t; typedef struct component_t component_t; @@ -38,6 +40,7 @@ typedef struct component_t { sprite_component_data_t *sprite_component_data; animation_system_data_t *animation_system_data; player_system_data_t *player_system_data; + enemy_system_data_t *enemy_system_data; } component_data; component_deleter_t component_deleter; diff --git a/src/ecs/enemy_system.c b/src/ecs/enemy_system.c new file mode 100644 index 0000000..eb1ba57 --- /dev/null +++ b/src/ecs/enemy_system.c @@ -0,0 +1,88 @@ +#include +#include "enemy_system.h" +#include "animation_system.h" +#include "sprite_component.h" +#include "transform_component.h" +#include "../game.h" + +// No args +void enemy_system_init(component_t *component, va_list args __attribute__((unused))) +{ + enemy_system_data_t *system_data = component->component_data.enemy_system_data; + + system_data->animation_system_data = get_component(component->entity, ANIMATION_SYSTEM)->component_data.animation_system_data; + system_data->sprite_component_data = system_data->animation_system_data->sprite_component_data; + system_data->transform_component_data = system_data->sprite_component_data->transform_component_data; + + system_data->state = ENEMY_IDLE; +} + +// Only for this file +static void enemy_system_get_inputs(enemy_system_data_t *system_data) +{ + system_data->last_state = system_data->state; + + system_data->state &= 0xF0; // 11110000 + + system_data->state |= game.event.keys[KEY_UP] * ENEMY_RUNNING_UP; + system_data->state |= game.event.keys[KEY_DOWN] * ENEMY_RUNNING_DOWN; + system_data->state |= game.event.keys[KEY_LEFT] * ENEMY_RUNNING_LEFT; + system_data->state |= game.event.keys[KEY_RIGHT] * ENEMY_RUNNING_RIGHT; + + // Special cases + if(system_data->state & ENEMY_RUNNING_UP && system_data->state & ENEMY_RUNNING_DOWN) system_data->state &= 0xFC; // 11111100 + if(system_data->state & ENEMY_RUNNING_LEFT && system_data->state & ENEMY_RUNNING_RIGHT) system_data->state &= 0xF3; // 11110011 +} + +// Only for this file +static void enemy_system_set_velocity(enemy_system_data_t *system_data) +{ + transform_component_data_t *transform_component_data = system_data->transform_component_data; + + transform_component_data->velocity.x = + (float)((system_data->state & ENEMY_RUNNING_RIGHT) >> 3) - (float)((system_data->state & ENEMY_RUNNING_LEFT) >> 2); + transform_component_data->velocity.y = + (float)((system_data->state & ENEMY_RUNNING_DOWN) >> 1) - (float)(system_data->state & ENEMY_RUNNING_UP); + + if(is_not_zero(transform_component_data->velocity.x) && is_not_zero(transform_component_data->velocity.y)) + { + transform_component_data->velocity.x *= 0.707106781186548f; + transform_component_data->velocity.y *= 0.707106781186548f; + } +} + +// Only for this file +static void enemy_system_set_animation(enemy_system_data_t *system_data) +{ + sprite_component_data_t *sprite_component_data = system_data->sprite_component_data; + animation_system_data_t *animation_system_data = system_data->animation_system_data; + + if(system_data->state & ENEMY_RUNNING_LEFT) sprite_component_data->flip = true; + if(system_data->state & ENEMY_RUNNING_RIGHT) sprite_component_data->flip = false; + + if((system_data->state & ENEMY_RUNNING) && !(system_data->last_state & ENEMY_RUNNING)) + { + animation_system_data->frame_delay_ms = ENEMY_DEFAULT_RUN_ANIMATION_SPEED; + animation_system_change_animation(animation_system_data, "enemy_run_sheet", 6); + } + else if(!(system_data->state & ENEMY_RUNNING) && (system_data->last_state & ENEMY_RUNNING)) + { + animation_system_data->actual_frame_nb = 0; + animation_system_data->frame_delay_ms = ENEMY_DEFAULT_IDLE_ANIMATION_SPEED; + animation_system_change_animation(animation_system_data, "enemy_idle_sheet", 4); + } +} + +void enemy_system_update(component_t *component) +{ + enemy_system_data_t *system_data = component->component_data.enemy_system_data; + + enemy_system_get_inputs(system_data); + enemy_system_set_velocity(system_data); + enemy_system_set_animation(system_data); +} + +void enemy_system_destroy(component_t *component) +{ + kfree(component->component_data.enemy_system_data); +} diff --git a/src/ecs/enemy_system.h b/src/ecs/enemy_system.h new file mode 100644 index 0000000..3dd1808 --- /dev/null +++ b/src/ecs/enemy_system.h @@ -0,0 +1,35 @@ +#ifndef ENEMY_SYSTEM_H +#define ENEMY_SYSTEM_H + +#include "ecs.h" + +#define ENEMY_DEFAULT_SPEED 80.0f // px / s +#define ENEMY_DEFAULT_IDLE_ANIMATION_SPEED 250.0f // ms / frame +#define ENEMY_DEFAULT_RUN_ANIMATION_SPEED 160.0f // ms / frame + +typedef enum enemy_state_t { + ENEMY_IDLE = 0x00, // 00000000 + ENEMY_RUNNING_UP = 0x01, // 00000001 + ENEMY_RUNNING_DOWN = 0x02, // 00000010 + ENEMY_RUNNING_LEFT = 0x04, // 00000100 + ENEMY_RUNNING_RIGHT = 0x08, // 00001000 + ENEMY_RUNNING = 0x0F, // 00001111 + ENEMY_DEATH = 0x80 // 10000000 +} enemy_state_t; + +typedef struct enemy_system_data_t { + transform_component_data_t *transform_component_data; + sprite_component_data_t *sprite_component_data; + animation_system_data_t *animation_system_data; + + enemy_state_t state; + enemy_state_t last_state; +} enemy_system_data_t; + +void enemy_system_init(component_t *, va_list); + +void enemy_system_update(component_t *); + +void enemy_system_destroy(component_t *); + +#endif // ENEMY_SYSTEM_H \ No newline at end of file diff --git a/src/ecs/player_system.c b/src/ecs/player_system.c index 102bc0c..d353d4c 100644 --- a/src/ecs/player_system.c +++ b/src/ecs/player_system.c @@ -14,7 +14,7 @@ void player_system_init(component_t *component, va_list args __attribute__((unus system_data->sprite_component_data = system_data->animation_system_data->sprite_component_data; system_data->transform_component_data = system_data->sprite_component_data->transform_component_data; - system_data->state = IDLE; + system_data->state = PLAYER_IDLE; } // Only for this file @@ -24,14 +24,14 @@ static void player_system_get_inputs(player_system_data_t *system_data) system_data->state &= 0xF0; // 11110000 - system_data->state |= game.event.keys[KEY_UP] * RUNNING_UP; - system_data->state |= game.event.keys[KEY_DOWN] * RUNNING_DOWN; - system_data->state |= game.event.keys[KEY_LEFT] * RUNNING_LEFT; - system_data->state |= game.event.keys[KEY_RIGHT] * RUNNING_RIGHT; + system_data->state |= game.event.keys[KEY_UP] * PLAYER_RUNNING_UP; + system_data->state |= game.event.keys[KEY_DOWN] * PLAYER_RUNNING_DOWN; + system_data->state |= game.event.keys[KEY_LEFT] * PLAYER_RUNNING_LEFT; + system_data->state |= game.event.keys[KEY_RIGHT] * PLAYER_RUNNING_RIGHT; // Special cases - if(system_data->state & RUNNING_UP && system_data->state & RUNNING_DOWN) system_data->state &= 0xFC; // 11111100 - if(system_data->state & RUNNING_LEFT && system_data->state & RUNNING_RIGHT) system_data->state &= 0xF3; // 11110011 + if(system_data->state & PLAYER_RUNNING_UP && system_data->state & PLAYER_RUNNING_DOWN) system_data->state &= 0xFC; // 11111100 + if(system_data->state & PLAYER_RUNNING_LEFT && system_data->state & PLAYER_RUNNING_RIGHT) system_data->state &= 0xF3; // 11110011 } // Only for this file @@ -40,9 +40,9 @@ static void player_system_set_velocity(player_system_data_t *system_data) transform_component_data_t *transform_component_data = system_data->transform_component_data; transform_component_data->velocity.x = - (float)((system_data->state & RUNNING_RIGHT) >> 3) - (float)((system_data->state & RUNNING_LEFT) >> 2); + (float)((system_data->state & PLAYER_RUNNING_RIGHT) >> 3) - (float)((system_data->state & PLAYER_RUNNING_LEFT) >> 2); transform_component_data->velocity.y = - (float)((system_data->state & RUNNING_DOWN) >> 1) - (float)(system_data->state & RUNNING_UP); + (float)((system_data->state & PLAYER_RUNNING_DOWN) >> 1) - (float)(system_data->state & PLAYER_RUNNING_UP); if(is_not_zero(transform_component_data->velocity.x) && is_not_zero(transform_component_data->velocity.y)) { @@ -57,15 +57,15 @@ static void player_system_set_animation(player_system_data_t *system_data) sprite_component_data_t *sprite_component_data = system_data->sprite_component_data; animation_system_data_t *animation_system_data = system_data->animation_system_data; - if(system_data->state & RUNNING_LEFT) sprite_component_data->flip = true; - if(system_data->state & RUNNING_RIGHT) sprite_component_data->flip = false; + if(system_data->state & PLAYER_RUNNING_LEFT) sprite_component_data->flip = true; + if(system_data->state & PLAYER_RUNNING_RIGHT) sprite_component_data->flip = false; - if((system_data->state & RUNNING) && !(system_data->last_state & RUNNING)) + if((system_data->state & PLAYER_RUNNING) && !(system_data->last_state & PLAYER_RUNNING)) { animation_system_data->frame_delay_ms = PLAYER_DEFAULT_RUN_ANIMATION_SPEED; animation_system_change_animation(animation_system_data, "player_run_sheet", 6); } - else if(!(system_data->state & RUNNING) && (system_data->last_state & RUNNING)) + else if(!(system_data->state & PLAYER_RUNNING) && (system_data->last_state & PLAYER_RUNNING)) { animation_system_data->actual_frame_nb = 0; animation_system_data->frame_delay_ms = PLAYER_DEFAULT_IDLE_ANIMATION_SPEED; diff --git a/src/ecs/player_system.h b/src/ecs/player_system.h index f47c366..320f936 100644 --- a/src/ecs/player_system.h +++ b/src/ecs/player_system.h @@ -2,20 +2,19 @@ #define PLAYER_SYSTEM_H #include "ecs.h" -#include "transform_component.h" #define PLAYER_DEFAULT_SPEED 80.0f // px / s #define PLAYER_DEFAULT_IDLE_ANIMATION_SPEED 250.0f // ms / frame #define PLAYER_DEFAULT_RUN_ANIMATION_SPEED 160.0f // ms / frame typedef enum player_state_t { - IDLE = 0x00, // 00000000 - RUNNING_UP = 0x01, // 00000001 - RUNNING_DOWN = 0x02, // 00000010 - RUNNING_LEFT = 0x04, // 00000100 - RUNNING_RIGHT = 0x08, // 00001000 - RUNNING = 0x0F, // 00001111 - DEATH = 0x80 // 10000000 + PLAYER_IDLE = 0x00, // 00000000 + PLAYER_RUNNING_UP = 0x01, // 00000001 + PLAYER_RUNNING_DOWN = 0x02, // 00000010 + PLAYER_RUNNING_LEFT = 0x04, // 00000100 + PLAYER_RUNNING_RIGHT = 0x08, // 00001000 + PLAYER_RUNNING = 0x0F, // 00001111 + PLAYER_DEATH = 0x80 // 10000000 } player_state_t; typedef struct player_system_data_t { diff --git a/src/game.c b/src/game.c index 474a710..643b85a 100644 --- a/src/game.c +++ b/src/game.c @@ -22,6 +22,15 @@ void game_init(void) add_component(player, create_component(SPRITE_COMPONENT), "player_idle_sheet"); add_component(player, create_component(ANIMATION_SYSTEM), 4, 0, PLAYER_DEFAULT_IDLE_ANIMATION_SPEED, true, true, false); add_component(player, create_component(PLAYER_SYSTEM)); + + //entity_t *enemy = entity_manager_add_entity(&game.entity_manager, "enemy0"); + + //rect_t enemy_bounds = {50.0f, 50.0f, 32.0f, 32.0f}; + + //add_component(enemy, create_component(TRANSFORM_COMPONENT), enemy_bounds, ENEMY_DEFAULT_SPEED); + //add_component(enemy, create_component(SPRITE_COMPONENT), "enemy_idle_sheet"); + //add_component(enemy, create_component(ANIMATION_SYSTEM), 4, 0, ENEMY_DEFAULT_IDLE_ANIMATION_SPEED, true, true, false); + //add_component(enemy, create_component(ENEMY_SYSTEM)); } void game_handle_event(void) @@ -32,15 +41,15 @@ void game_handle_event(void) { key_event = pollevent(); - if (key_event.type == KEYEV_DOWN) + if(key_event.type == KEYEV_DOWN) game.event.keys[key_event.key] = true; - else if (key_event.type == KEYEV_UP) + else if(key_event.type == KEYEV_UP) game.event.keys[key_event.key] = false; - if (key_event.type == KEYEV_DOWN && key_event.key == KEY_EXIT) + if(key_event.type == KEYEV_DOWN && key_event.key == KEY_EXIT) game.is_running = false; } - while (key_event.type != KEYEV_NONE); + while(key_event.type != KEYEV_NONE); } void game_update(void) diff --git a/src/main.c b/src/main.c index e86a579..171449d 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,5 @@ #include - -//#include +#include #include "game.h" @@ -11,7 +10,7 @@ game_t game; int main(void) { - //gdb_start(); + //gdb_start_on_exception(); //__asm__("trapa #42"); diff --git a/src/map_manager.c b/src/map_manager.c new file mode 100644 index 0000000..e69de29 diff --git a/src/map_manager.h b/src/map_manager.h new file mode 100644 index 0000000..802d1e9 --- /dev/null +++ b/src/map_manager.h @@ -0,0 +1,8 @@ +#ifndef MAP_MANAGER_H +#define MAP_MANAGER_H + +typedef struct map_t { + +} map_t; + +#endif // MAP_MANAGER_H \ No newline at end of file diff --git a/src/maps.h b/src/maps.h new file mode 100644 index 0000000..5b2a3a6 --- /dev/null +++ b/src/maps.h @@ -0,0 +1,15 @@ +#ifndef MAPS_H +#define MAPS_H + +#include "vector2d.h" + +typedef unsigned int tile_t; + +typedef struct builtin_map_t { + char *entities; + size_t width; + size_t height; + tile_t *tiles; +} builtin_map_t; + +#endif // MAPS_H \ No newline at end of file diff --git a/src/texture_manager.c b/src/texture_manager.c index 1bf21f8..c95e857 100644 --- a/src/texture_manager.c +++ b/src/texture_manager.c @@ -67,7 +67,7 @@ static inline bool is_texture_name(elem_t *elem, va_list args) return !strcmp(((texture_t *)elem->data)->name, va_arg(args, const char*)); } -texture_t *texture_manager_get_texture(const texture_manager_t *texture_manager, const char *name) +texture_t *texture_manager_get_texture(texture_manager_t *texture_manager, const char *name) { texture_t *texture = linked_list_get_if(&texture_manager->textures, is_texture_name, name); if(texture) return texture; @@ -86,7 +86,7 @@ inline void texture_manager_clear(texture_manager_t *texture_manager) linked_list_clear(&texture_manager->textures); } -inline void texture_manager_draw_texture(const texture_manager_t *texture_manager, const char *name, const rect_t *src, const rect_t *dst, bool flip) +inline void texture_manager_draw_texture(texture_manager_t *texture_manager, const char *name, const rect_t *src, const rect_t *dst, bool flip) { draw_texture(texture_manager_get_texture(texture_manager, name), src, dst, flip); } diff --git a/src/texture_manager.h b/src/texture_manager.h index ae297b8..cd6c3c5 100644 --- a/src/texture_manager.h +++ b/src/texture_manager.h @@ -55,7 +55,7 @@ void texture_manager_load_builtin_textures(texture_manager_t *); @texture_manager Pointer to a texture manager @name Name of the texture to load */ -void texture_manager_load_builtin_texture(texture_manager_t *, const char*); +texture_t *texture_manager_load_builtin_texture(texture_manager_t *, const char*); /* texture_manager_add_texture(): Add a texture in the texture manager @@ -68,7 +68,7 @@ void texture_manager_add_texture(texture_manager_t *, texture_t *); @texture_manager Pointer to a texture manager @name Name of the texture to get Return the texture, NULL on error or if the texture is not found. */ -texture_t *texture_manager_get_texture(const texture_manager_t *, const char *); +texture_t *texture_manager_get_texture(texture_manager_t *, const char *); /* texture_manager_remove_texture(): Remove a texture in the texture manager @@ -87,6 +87,6 @@ void texture_manager_clear(texture_manager_t *); @texture_manager Pointer to a texture manager @name Name of the texture to draw Do nothing if the texture is not found. */ -void texture_manager_draw_texture(const texture_manager_t *, const char *, const rect_t *, const rect_t *, bool); +void texture_manager_draw_texture(texture_manager_t *, const char *, const rect_t *, const rect_t *, bool); #endif // TEXTURE_MANAGER_H \ No newline at end of file diff --git a/src/textures.h b/src/textures.h index dad398e..97d69c4 100644 --- a/src/textures.h +++ b/src/textures.h @@ -12,9 +12,14 @@ typedef struct builtin_texture_t { extern bopti_image_t img_player_idle_sheet; extern bopti_image_t img_player_run_sheet; +extern bopti_image_t img_enemy_idle_sheet; +extern bopti_image_t img_enemy_run_sheet; + static struct builtin_texture_t builtin_textures[] = { {"player_idle_sheet", &img_player_idle_sheet}, {"player_run_sheet", &img_player_run_sheet}, + {"enemy_idle_sheet", &img_enemy_idle_sheet}, + {"enemy_run_sheet", &img_enemy_run_sheet}, }; #define BUILTIN_TEXTURE_COUNT (sizeof(builtin_textures) / sizeof(builtin_texture_t))