c/JacksEscape
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor reading Vec2 & Box2

Browse Source
This commit is contained in:
Edgaru089 2024-04-15 12:54:25 +08:00
parent 17c5a96786
commit 7febdef6a9
1 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
app_file.c
View File

@ -58,33 +58,42 @@ static void _app_UnescapeTextbox(char *t) {
vector_Push(charbuf, &zero); vector_Push(charbuf, &zero);
} }
static inline Vec2 readvec2() {
double a, b;
a = TOKEN_DOUBLE;
b = TOKEN_DOUBLE;
Vec2 v = {.x = a, .y = b};
return v;
}
static inline Box2 readbox2() {
Vec2 a, b;
a = readvec2();
b = readvec2();
Box2 box = {.lefttop = a, .size = b};
return box;
}
// Subsequent tokens can be read by strtok(NULL, " ") // Subsequent tokens can be read by strtok(NULL, " ")
static void _app_LevelCommand(App *app, char *cmd) { static void _app_LevelCommand(App *app, char *cmd) {
CMD1("HITBOX") { CMD1("HITBOX") {
double a, b, c, d; Box2 box = readbox2();
a = TOKEN_DOUBLE;
b = TOKEN_DOUBLE;
c = TOKEN_DOUBLE;
d = TOKEN_DOUBLE;
Entity *e = entity_Create(app->entity, cmd); Entity *e = entity_Create(app->entity, cmd);
ADD_COMPONENT(e, hitbox); ADD_COMPONENT(e, hitbox);
e->hitbox->box = box2(a, b, c, d); e->hitbox->box = box;
e->hitbox->fixed = true; e->hitbox->fixed = true;
entity_Commit(app->entity, e); entity_Commit(app->entity, e);
} }
CMD("PLAYER") { CMD("PLAYER") {
double a, b; Vec2 vec = readvec2();
a = TOKEN_DOUBLE;
b = TOKEN_DOUBLE;
Entity *e = entity_Create(app->entity, cmd); Entity *e = entity_Create(app->entity, cmd);
ADD_COMPONENT(e, player); ADD_COMPONENT(e, player);
e->player->hazardRespawn = vec2(a, b); e->player->hazardRespawn = vec;
ADD_COMPONENT(e, position); ADD_COMPONENT(e, position);
e->position->position = vec2(a, b); e->position->position = vec;
e->position->velocity = vec2(0, 0); e->position->velocity = vec2(0, 0);
ADD_COMPONENT(e, hitbox); ADD_COMPONENT(e, hitbox);
e->hitbox->box.lefttop = vec2(-20, -80); e->hitbox->box.lefttop = vec2(-20, -80);
@ -93,28 +102,19 @@ static void _app_LevelCommand(App *app, char *cmd) {
} }
CMD("HAZARD_RESPAWN") { CMD("HAZARD_RESPAWN") {
double a, b, c, d, e, f; Box2 box = readbox2();
a = TOKEN_DOUBLE; Vec2 vec = readvec2();
b = TOKEN_DOUBLE;
c = TOKEN_DOUBLE;
d = TOKEN_DOUBLE;
e = TOKEN_DOUBLE;
f = TOKEN_DOUBLE;
Entity *en = entity_Create(app->entity, cmd); Entity *e = entity_Create(app->entity, cmd);
misc_InstantiateHazardRespawn(app, en, box2(a, b, c, d), vec2(e, f)); misc_InstantiateHazardRespawn(app, e, box, vec);
entity_Commit(app->entity, en); entity_Commit(app->entity, e);
} }
CMD("HAZARD") { CMD("HAZARD") {
double a, b, c, d; Box2 box = readbox2();
a = TOKEN_DOUBLE;
b = TOKEN_DOUBLE;
c = TOKEN_DOUBLE;
d = TOKEN_DOUBLE;
Entity *e = entity_Create(app->entity, cmd); Entity *e = entity_Create(app->entity, cmd);
misc_InstantiateHazard(app, e, box2(a, b, c, d)); misc_InstantiateHazard(app, e, box);
entity_Commit(app->entity, e); entity_Commit(app->entity, e);
} }
@ -147,15 +147,11 @@ static void _app_LevelCommand(App *app, char *cmd) {
} }
CMD("LEVEL_TRANSITION") { CMD("LEVEL_TRANSITION") {
double a, b, c, d; Box2 box = readbox2();
a = TOKEN_DOUBLE;
b = TOKEN_DOUBLE;
c = TOKEN_DOUBLE;
d = TOKEN_DOUBLE;
char *next_level = TOKEN; char *next_level = TOKEN;
if (next_level) { if (next_level) {
Entity *e = entity_Create(app->entity, cmd); Entity *e = entity_Create(app->entity, cmd);
misc_InstantiateChangeLevel(app, e, box2(a, b, c, d), next_level); misc_InstantiateChangeLevel(app, e, box, next_level);
entity_Commit(app->entity, e); entity_Commit(app->entity, e);
} }
} }