KlemenPl/PixelDefense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use built-in qsort instead of flecs (better perf)

Browse Source
This commit is contained in:
Klemen Plestenjak
2023-12-29 10:02:13 +01:00
parent 5aba8d18c6
commit 7ec5e2122e
3 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
game/main.c
View File

@@ -1,5 +1,8 @@
#include <rlImGui.h>
#include <raygui.h>
#include <time.h>
#include <raymath.h>
#include <stdlib.h>
#include "systems.h"
#include "components.h"
@@ -15,8 +18,6 @@
#include "pathfinding.h"
#include <time.h>
#include <raymath.h>
ECS_COMPONENT_DECLARE(Game);
ECS_COMPONENT_DECLARE(InputState);
@@ -148,12 +149,11 @@ ECS_DTOR(Path, path, {
}
})
int cmpPos(ecs_entity_t e1, const void *v1, ecs_entity_t e2, const void *v2) {
const Position *pos1 = v1;
const Position *pos2 = v2;
int cmpDrawData(const void *a, const void *b) {
const DrawData *lhs = (DrawData *) a;
const DrawData *rhs = (DrawData *) b;
// NOTE: entities with lower Y are in front
f32 dif = pos2->y - pos1->y;
f32 dif = (rhs->dst.y) - (lhs->dst.y);
int cmpVal = 0;
if (dif < 0) cmpVal = 1;
else if (dif > 0) cmpVal = -1;
@@ -179,6 +179,7 @@ bool init(void *userData) {
Game *game = ecs_singleton_get_mut(ECS, Game);
game->screen = SCREEN_MAIN_MENU;
game->font = LoadFontEx("assets/fonts/CompassPro.ttf", 92, NULL, 0);
game->drawData = bzArrayCreate(DrawData, 1000);
game->drawQuery = ecs_query(ECS, {
.filter.terms = {
{ ecs_id(Position) },
@@ -186,8 +187,6 @@ bool init(void *userData) {
{ ecs_id(Rotation) },
{ ecs_id(TextureRegion) }
},
.order_by_component = ecs_id(Position),
.order_by = cmpPos
});
ECS_COMPONENT_DEFINE(ECS, InputState);
@@ -250,10 +249,6 @@ bool init(void *userData) {
ECS_SYSTEM(ECS, renderDebugPath, EcsOnUpdate, Path);
//ECS_SYSTEM(ECS, renderTerrain, EcsOnUpdate, Position, Size, Rotation, TextureRegion, TextureTerrain);
//ECS_SYSTEM(ECS, renderBuildings, EcsOnUpdate, Position, Size, Rotation, TextureRegion, TextureBuildings);
//ECS_SYSTEM(ECS, renderEntities, EcsOnUpdate, Position, Size, Rotation, TextureRegion, TextureEntities);
ECS_SYSTEM(ECS, renderColliders, EcsOnUpdate, Position, Size);
ECS_SYSTEM(ECS, renderRotationDirection, EcsOnUpdate, Position, Rotation);
@@ -294,6 +289,8 @@ void deinit(void *userData) {
bzObjectPoolDestroy(game->pools.pathData);
bzObjectPoolDestroy(game->pools.actions);
bzArrayDestroy(game->drawData);
bzUIDestroy(UI);
UI = NULL;
@@ -342,6 +339,7 @@ static void renderGame(Game *game, float dt) {
// Ground UI
drawPlayerInputUIGround();
// Entities
bzArrayClear(game->drawData);
ecs_iter_t it = ecs_query_iter(ECS, game->drawQuery);
while (ecs_iter_next(&it)) {
Position *p = ecs_field(&it, Position, 1);
@@ -354,9 +352,21 @@ static void renderGame(Game *game, float dt) {
Rectangle src = t[i].rec;
if (t[i].flipX) src.width *= -1.0f;
if (t[i].flipY) src.height *= -1.0f;
DrawTexturePro(t[i].texture, src, dst, origin, t[i].rotation, WHITE);
bzArrayPush(game->drawData, (DrawData) {
.tex = t[i].texture,
.src = src,
.dst = dst,
.origin = origin,
.rotation = t[i].rotation
});
}
}
qsort(game->drawData, bzArraySize(game->drawData), sizeof(*game->drawData), cmpDrawData);
for (i32 i = 0; i < bzArraySize(game->drawData); i++) {
DrawData draw = game->drawData[i];
DrawTexturePro(draw.tex, draw.src, draw.dst, draw.origin, draw.rotation, WHITE);
}
ecs_progress(ECS, dt);
ecs_enable(ECS, renderDebugPathSystem, game->debugDraw.path);