cdo/retro-rpg
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Load and draw additional layers

Browse Source
This commit is contained in:
Camden Dixie O'Brien 2024-12-31 13:55:34 +00:00
parent 8de374bcfb
commit 0aab456433
1 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/main.c
View File

@ -21,6 +21,7 @@
#define MAX_PATH_LEN 128 #define MAX_PATH_LEN 128
#define MAP_ASSET "/map.tmx" #define MAP_ASSET "/map.tmx"
#define MAPNLAYERS 2
#define MAPWIDTH 64 #define MAPWIDTH 64
#define MAPHEIGHT 64 #define MAPHEIGHT 64
#define MAPSHIFTX 32 #define MAPSHIFTX 32
@ -86,7 +87,7 @@ typedef struct {
static SDL_Window *window; static SDL_Window *window;
static SDL_Renderer *renderer; static SDL_Renderer *renderer;
static unsigned map[MAPWIDTH][MAPHEIGHT]; static unsigned map[MAPNLAYERS][MAPWIDTH][MAPHEIGHT];
static SDL_Texture *tstex, *pidle, *pwalk; static SDL_Texture *tstex, *pidle, *pwalk;
static input_state_t input; static input_state_t input;
static dvec_t vpos = { -128, -96 }; static dvec_t vpos = { -128, -96 };
@ -102,19 +103,19 @@ static inline double dot(dvec_t v, dvec_t u)
return v.x * u.x + v.y * u.y; return v.x * u.x + v.y * u.y;
} }
static inline unsigned tileat(double x, double y) static inline unsigned tileat(int layeridx, double x, double y)
{ {
const unsigned row = (unsigned)floor(x / TILESIZE) + MAPSHIFTX; const unsigned row = (unsigned)floor(x / TILESIZE) + MAPSHIFTX;
const unsigned col = (unsigned)floor(y / TILESIZE) + MAPSHIFTY; const unsigned col = (unsigned)floor(y / TILESIZE) + MAPSHIFTY;
if (row >= MAPWIDTH || col >= MAPHEIGHT) if (row >= MAPWIDTH || col >= MAPHEIGHT)
return 0; return 0;
else else
return map[row][col]; return map[layeridx][row][col];
} }
static inline bool tilepassable(int x, int y) static inline bool tilepassable(int x, int y)
{ {
const unsigned id = tileat(x, y); const unsigned id = tileat(0, x, y);
for (unsigned i = 0; i < NELEMS(impassable); ++i) { for (unsigned i = 0; i < NELEMS(impassable); ++i) {
if (impassable[i] == id) if (impassable[i] == id)
return false; return false;
@ -122,21 +123,9 @@ static inline bool tilepassable(int x, int y)
return true; return true;
} }
static void mapload(const char *path) static void maploadlayer(xmlNodePtr layernode, int layeridx)
{ {
// Find chunk nodes in map XML xmlNodePtr node = layernode->xmlChildrenNode;
xmlDocPtr doc;
xmlNodePtr node;
doc = xmlParseFile(path);
assert(NULL != doc);
node = xmlDocGetRootElement(doc);
assert(0 == xmlStrcmp(node->name, (const xmlChar *)"map"));
node = node->xmlChildrenNode;
while (NULL != node
&& xmlStrcmp(node->name, (const xmlChar *)"layer") != 0)
node = node->next;
assert(NULL != node);
node = node->xmlChildrenNode;
while (NULL != node while (NULL != node
&& xmlStrcmp(node->name, (const xmlChar *)"data") != 0) && xmlStrcmp(node->name, (const xmlChar *)"data") != 0)
node = node->next; node = node->next;
@ -170,7 +159,7 @@ static void mapload(const char *path)
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
memcpy(buf, p, sizeof(xmlChar) * (q - p)); memcpy(buf, p, sizeof(xmlChar) * (q - p));
assert(x < MAPWIDTH && y < MAPHEIGHT); assert(x < MAPWIDTH && y < MAPHEIGHT);
map[x][y] = (unsigned)atoi((const char *)buf); map[layeridx][x][y] = (unsigned)atoi((const char *)buf);
++x; ++x;
p = ++q; p = ++q;
break; break;
@ -179,7 +168,7 @@ static void mapload(const char *path)
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
memcpy(buf, p, sizeof(xmlChar) * (q - p)); memcpy(buf, p, sizeof(xmlChar) * (q - p));
assert(y < MAPHEIGHT); assert(y < MAPHEIGHT);
map[x][y] = (unsigned)atoi((const char *)buf); map[layeridx][x][y] = (unsigned)atoi((const char *)buf);
} }
x = chunk_x + MAPSHIFTX; x = chunk_x + MAPSHIFTX;
++y; ++y;
@ -193,13 +182,33 @@ static void mapload(const char *path)
} }
} }
static void mapload(const char *path)
{
xmlDocPtr doc;
xmlNodePtr node;
doc = xmlParseFile(path);
assert(NULL != doc);
node = xmlDocGetRootElement(doc);
assert(0 == xmlStrcmp(node->name, (const xmlChar *)"map"));
node = node->xmlChildrenNode;
for (int l = 0; l < MAPNLAYERS; ++l) {
do
node = node->next;
while (NULL != node
&& xmlStrcmp(node->name, (const xmlChar *)"layer") != 0);
assert(NULL != node);
maploadlayer(node, l);
}
}
static void mapdraw(void) static void mapdraw(void)
{ {
const int startx = TILESIZE * floor(vpos.x / TILESIZE); const int startx = TILESIZE * floor(vpos.x / TILESIZE);
const int starty = TILESIZE * floor(vpos.y / TILESIZE); const int starty = TILESIZE * floor(vpos.y / TILESIZE);
for (int l = 0; l < MAPNLAYERS; ++l) {
for (int y = starty; y < vpos.y + VIEWHEIGHT; y += TILESIZE) { for (int y = starty; y < vpos.y + VIEWHEIGHT; y += TILESIZE) {
for (int x = startx; x < vpos.x + VIEWWIDTH; x += TILESIZE) { for (int x = startx; x < vpos.x + VIEWWIDTH; x += TILESIZE) {
const unsigned tileid = tileat(x, y); const unsigned tileid = tileat(l, x, y);
if (0 == tileid) if (0 == tileid)
continue; continue;
const SDL_Rect src = { const SDL_Rect src = {
@ -218,6 +227,7 @@ static void mapdraw(void)
} }
} }
} }
}
static void entityupdate(entity_t *e, double dt) static void entityupdate(entity_t *e, double dt)
{ {