creikey
/
rpgpt
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Delete tiled and all tilemap code from project

Browse Source
main
Cameron Murphy Reikes 2 years ago
parent 6f5e5878b8
commit 41375cc902
3 changed files with 23 additions and 357 deletions
Show Stats Download Patch File Download Diff File

144
codegen.c
Unescape Escape View File

@ -195,148 +195,6 @@ int main(int argc, char **argv)
MD_S8ListPush(cg_arena, &declarations_list, MD_S8Fmt(cg_arena, "sg_image %.*s = {0};\n", MD_S8VArg(variable_name)));
MD_S8ListPush(cg_arena, &load_list, MD_S8Fmt(cg_arena, "%.*s = load_image(\"%.*s\");\n", MD_S8VArg(variable_name), MD_S8VArg(filepath)));
}
if (MD_S8Match(node->first_tag->string, MD_S8Lit("tileset"), 0)) {
// not a variable anymore
MD_String8 variable_name = MD_S8Fmt(cg_arena, "tileset_%.*s", MD_S8VArg(node->string));
Log("New tileset %.*s\n", MD_S8VArg(variable_name));
MD_String8 filepath = asset_file_path(ChildValue(node, MD_S8Lit("filepath")));
MD_String8 tileset_file_contents = MD_LoadEntireFile(cg_arena, filepath);
list_printf(&tileset_decls, "{\n", MD_S8VArg(variable_name));
list_printf(&tileset_decls, ".first_gid = %.*s,\n", MD_S8VArg(ChildValue(node, MD_S8Lit("firstgid"))));
list_printf(&tileset_decls, ".img = &%.*s,\n", MD_S8VArg(ChildValue(node, MD_S8Lit("image"))));
list_printf(&tileset_decls, ".animated = {\n");
char *end = tileset_file_contents.str + tileset_file_contents.size;
char *cur = tileset_file_contents.str;
int num_animated_tiles = 0;
while (cur < end) {
cur = goto_end_of(cur, end - cur, "<tile id=\"");
if (cur == NULL) break;
char *end_of_anim = goto_end_of(cur, end - cur, "</animation>");
if (end_of_anim == NULL) break;
char *new_cur = fillnull(cur, '"');
int frame_from = atoi(cur);
cur = new_cur;
list_printf(&tileset_decls, "{ .exists = true, .id_from = %d, .frames = { ", frame_from);
int num_frames = 0;
while (true) {
char *next_frame = goto_end_of(cur, end - cur, "<frame tileid=\"");
if (end_of_anim == NULL || next_frame == NULL || next_frame > end_of_anim) break;
char *new_cur = fillnull(next_frame, '"');
int frame = atoi(next_frame);
list_printf(&tileset_decls, "%d, ", frame);
num_frames++;
cur = new_cur;
}
list_printf(&tileset_decls, "}, .num_frames = %d },\n", num_frames);
num_animated_tiles++;
}
if (num_animated_tiles == 0) list_printf(&tileset_decls, "0");
list_printf(&tileset_decls, "}},\n");
}
if (MD_S8Match(node->first_tag->string, MD_S8Lit("level"), 0)) {
MD_String8 variable_name = MD_S8Fmt(cg_arena, "level_%.*s", MD_S8VArg(node->string));
Log("New level variable %.*s\n", MD_S8VArg(variable_name));
MD_String8 filepath = asset_file_path(ChildValue(node, MD_S8Lit("filepath")));
MD_ParseResult level_parse = MD_ParseWholeFile(cg_arena, filepath);
assert(!MD_NodeIsNil(level_parse.node->first_child)); // , MD_S8Lit("Failed to load level file"));
MD_Node *layers = MD_ChildFromString(level_parse.node->first_child, MD_S8Lit("layers"), 0);
fprintf(output, "Level %.*s = {\n", MD_S8VArg(variable_name));
MD_String8List tile_layer_decls = { 0 };
for (MD_EachNode(lay, layers->first_child)) {
MD_String8 type = MD_ChildFromString(lay, MD_S8Lit("type"), 0)->first_child->string;
if (MD_S8Match(type, MD_S8Lit("objectgroup"), 0)) {
fprintf(output, ".initial_entities = {\n");
for (MD_EachNode(object, MD_ChildFromString(lay, MD_S8Lit("objects"), 0)->first_child)) {
//dump(object);
// negative numbers for object position aren't supported here
MD_String8 name = MD_ChildFromString(object, MD_S8Lit("name"), 0)->first_child->string;
MD_String8 x_string = MD_ChildFromString(object, MD_S8Lit("x"), 0)->first_child->string;
MD_String8 y_string = MD_ChildFromString(object, MD_S8Lit("y"), 0)->first_child->string;
y_string = MD_S8Fmt(cg_arena, "-%.*s", MD_S8VArg(y_string));
MD_String8List props = { 0 };
for (MD_EachNode(prop_object, MD_ChildFromString(object, S8("properties"), 0)->first_child))
{
list_printf(&props, ".%.*s = %.*s, ", S8V(ChildValue(prop_object, S8("name"))), S8V(ChildValue(prop_object, S8("value"))));
}
MD_StringJoin join = (MD_StringJoin) { 0 };
MD_String8 props_string = MD_S8ListJoin(cg_arena, props, &join);
if (has_decimal(x_string)) x_string = MD_S8Fmt(cg_arena, "%.*sf", MD_S8VArg(x_string));
if (has_decimal(y_string)) y_string = MD_S8Fmt(cg_arena, "%.*sf", MD_S8VArg(y_string));
MD_String8 class = MD_ChildFromString(object, MD_S8Lit("class"), 0)->first_child->string;
if (MD_S8Match(class , MD_S8Lit("PROP"), 0))
{
fprintf(output, "{ .exists = true, .is_prop = true, .prop_kind = %.*s, .pos = { .X=%.*s, .Y=%.*s }, %.*s }, ", MD_S8VArg(name), MD_S8VArg(x_string), MD_S8VArg(y_string), MD_S8VArg(props_string));
}
else if (MD_S8Match(class, MD_S8Lit("MACHINE"), 0))
{
fprintf(output, "{ .exists = true, .is_machine = true, .pos = { .X=%.*s, .Y=%.*s }, %.*s .machine_kind = MACH_%.*s, }, ", MD_S8VArg(x_string), MD_S8VArg(y_string), MD_S8VArg(props_string), MD_S8VArg(name));
}
else if (MD_S8Match(class , MD_S8Lit("ITEM"), 0))
{
fprintf(output, "{ .exists = true, .is_item = true, .item_kind = ITEM_%.*s, .pos = { .X=%.*s, .Y=%.*s }, %.*s }, ", MD_S8VArg(name), MD_S8VArg(x_string), MD_S8VArg(y_string), MD_S8VArg(props_string));
}
else if (MD_S8Match(name, MD_S8Lit("PLAYER"), 0))
{
fprintf(output, "{ .exists = true, .is_character = true, .pos = { .X=%.*s, .Y=%.*s }, %.*s }, ", MD_S8VArg(x_string), MD_S8VArg(y_string), MD_S8VArg(props_string));
}
else
{
fprintf(output, "{ .exists = true, .is_npc = true, .npc_kind = NPC_%.*s, .pos = { .X=%.*s, .Y=%.*s }, %.*s }, ", MD_S8VArg(name), MD_S8VArg(x_string), MD_S8VArg(y_string), MD_S8VArg(props_string));
}
}
fprintf(output, "\n}, // entities\n");
}
if (MD_S8Match(type, MD_S8Lit("tilelayer"), 0)) {
int width = atoi(nullterm(MD_ChildFromString(layers->first_child, MD_S8Lit("width"), 0)->first_child->string));
int height = atoi(nullterm(MD_ChildFromString(layers->first_child, MD_S8Lit("height"), 0)->first_child->string));
MD_Node *data = MD_ChildFromString(lay, MD_S8Lit("data"), 0);
int num_index = 0;
MD_String8List cur_layer_decl = { 0 };
list_printf(&cur_layer_decl, "{ \n");
list_printf(&cur_layer_decl, "{ ");
for (MD_EachNode(tile_id_node, data->first_child)) {
list_printf(&cur_layer_decl, "%.*s, ", MD_S8VArg(tile_id_node->string));
if (num_index % width == width - 1) {
if (MD_NodeIsNil(tile_id_node->next)) {
list_printf(&cur_layer_decl, "},\n}, // tiles for this layer\n");
} else {
list_printf(&cur_layer_decl, "},\n{ ");
}
}
num_index += 1;
}
MD_StringJoin join = MD_ZERO_STRUCT;
MD_String8 layer_decl_string = MD_S8ListJoin(cg_arena, cur_layer_decl, &join);
MD_S8ListPush(cg_arena, &tile_layer_decls, layer_decl_string);
}
}
fprintf(output, ".tiles = {\n");
// layer decls
{
MD_StringJoin join = MD_ZERO_STRUCT;
MD_String8 layers_string = MD_S8ListJoin(cg_arena, tile_layer_decls, &join);
fprintf(output, "%.*s\n", MD_S8VArg(layers_string));
//MD_S8ListPush(cg_arena, &tile_layer_delcs, layer_decl_string);
}
fprintf(output, "} // tiles\n");
fprintf(output, "\n}; // %.*s\n", MD_S8VArg(variable_name));
}
}
@ -345,8 +203,6 @@ int main(int argc, char **argv)
MD_String8 loads = MD_S8ListJoin(cg_arena, load_list, &join);
fprintf(output, "%.*s\nvoid load_assets() {\n%.*s\n}\n", MD_S8VArg(declarations), MD_S8VArg(loads));
fprintf(output, "TileSet tilesets[] = { %.*s\n };\n", MD_S8VArg(MD_S8ListJoin(cg_arena, tileset_decls, &join)));
fprintf(output, "sg_image * anim_img_table[] = {\n");
ARR_ITER(AnimatedSprite, sprites)
{

225
main.c
Unescape Escape View File

@ -218,48 +218,8 @@ typedef struct Quad
};
} Quad;
typedef struct TileInstance
{
uint16_t kind;
} TileInstance;
typedef struct AnimatedTile
{
uint16_t id_from;
bool exists;
int num_frames;
uint16_t frames[32];
} AnimatedTile;
typedef struct TileSet
{
sg_image *img;
uint16_t first_gid;
AnimatedTile animated[128];
} TileSet;
#include "makeprompt.h"
typedef struct Overlap
{
bool is_tile; // in which case e will be null, naturally
TileInstance t;
Entity *e;
} Overlap;
typedef BUFF(Overlap, 16) Overlapping;
typedef struct Level
{
TileInstance tiles[LAYERS][LEVEL_TILES][LEVEL_TILES];
Entity initial_entities[MAX_ENTITIES]; // shouldn't be directly modified, only used to initialize gs.entities on loading of level
} Level;
typedef struct TileCoord
{
int x; // column
int y; // row
} TileCoord;
typedef BUFF(Entity*, 16) Overlapping;
// no alignment etc because lazy
typedef struct Arena
@ -717,70 +677,10 @@ Vec2 entity_aabb_size(Entity *e)
}
}
bool is_tile_solid(TileInstance t)
{
uint16_t tile_id = t.kind;
uint16_t collideable[] = {
57 , 58 , 59 ,
121, 122, 123,
185, 186, 187,
249, 250, 251,
313, 314, 315,
377, 378, 379,
};
for (int i = 0; i < ARRLEN(collideable); i++)
{
if (tile_id == collideable[i] + 1) return true;
}
return false;
//return tile_id == 53 || tile_id == 0 || tile_id == 367 || tile_id == 317 || tile_id == 313 || tile_id == 366 || tile_id == 368;
}
bool is_overlap_collision(Overlap o)
{
if (o.is_tile)
{
return is_tile_solid(o.t);
}
else
{
assert(o.e);
return !o.e->is_item;
}
}
// tilecoord is integer tile position, not like tile coord
Vec2 tilecoord_to_world(TileCoord t)
{
return V2((float)t.x * (float)TILE_SIZE * 1.0f, -(float)t.y * (float)TILE_SIZE * 1.0f);
}
// points from tiled editor have their own strange and alien coordinate system (local to the tilemap Y+ down)
Vec2 tilepoint_to_world(Vec2 tilepoint)
{
Vec2 tilecoord = MulV2F(tilepoint, 1.0 / TILE_SIZE);
return tilecoord_to_world((TileCoord) { (int)tilecoord.X, (int)tilecoord.Y });
}
TileCoord world_to_tilecoord(Vec2 w)
bool is_overlap_collision(Entity *e)
{
// world = V2(tilecoord.x * tile_size, -tilecoord.y * tile_size)
// world.x = tilecoord.x * tile_size
// world.x / tile_size = tilecoord.x
// world.y = -tilecoord.y * tile_size
// - world.y / tile_size = tilecoord.y
return (TileCoord) { (int)floorf(w.X / TILE_SIZE), (int)floorf(-w.Y / TILE_SIZE) };
}
AABB tile_aabb(TileCoord t)
{
return (AABB)
{
.upper_left = tilecoord_to_world(t),
.lower_right = AddV2(tilecoord_to_world(t), V2(TILE_SIZE, -TILE_SIZE)),
};
return !e->is_item;
}
Vec2 rotate_counter_clockwise(Vec2 v)
@ -825,23 +725,6 @@ AABB entity_aabb(Entity *e)
return entity_aabb_at(e, at);
}
TileInstance get_tile_layer(Level *l, int layer, TileCoord t)
{
bool out_of_bounds = false;
out_of_bounds |= t.x < 0;
out_of_bounds |= t.x >= LEVEL_TILES;
out_of_bounds |= t.y < 0;
out_of_bounds |= t.y >= LEVEL_TILES;
//assert(!out_of_bounds);
if (out_of_bounds) return (TileInstance) { 0 };
return l->tiles[layer][t.y][t.x];
}
TileInstance get_tile(Level *l, TileCoord t)
{
return get_tile_layer(l, 0, t);
}
sg_image load_image(const char *path)
{
sg_image to_return = { 0 };
@ -1843,19 +1726,13 @@ void reset_level()
{
// load level
gs.won = false;
Level *to_load = &level_level0;
{
assert(ARRLEN(to_load->initial_entities) == ARRLEN(gs.entities));
memcpy(gs.entities, to_load->initial_entities, sizeof(Entity) * MAX_ENTITIES);
for (Entity *it = gs.entities; it < gs.entities + ARRLEN(gs.entities); it++)
{
if(it->exists && it->generation == 0)
if(!player)
{
it->generation = 1;
}
}
Entity *pl = new_entity();
pl->is_character = true;
}
update_player_from_entities();
player->pos = V2(0,0);
#ifdef DEVTOOLS
if(false)
@ -1881,6 +1758,7 @@ void reset_level()
// parse and enact the drama document
if(0)
{
MD_String8List drama_errors = {0};
@ -2953,12 +2831,6 @@ Quad quad_at(Vec2 at, Vec2 size)
return to_return;
}
Quad tile_quad(TileCoord coord)
{
Quad to_return = quad_at(tilecoord_to_world(coord), V2(TILE_SIZE, TILE_SIZE));
return to_return;
}
// out must be of at least length 4
Quad quad_centered(Vec2 at, Vec2 size)
@ -3610,32 +3482,17 @@ void draw_animated_sprite(DrawnAnimatedSprite d)
// gets aabbs overlapping the input aabb, including gs.entities and tiles
Overlapping get_overlapping(Level *l, AABB aabb)
Overlapping get_overlapping(AABB aabb)
{
Overlapping to_return = { 0 };
Quad q = quad_aabb(aabb);
// the corners, jessie
PROFILE_SCOPE("checking the corners")
for (int i = 0; i < 4; i++)
{
TileCoord to_check = world_to_tilecoord(q.points[i]);
TileInstance t = get_tile_layer(l, 2, to_check);
if (is_tile_solid(t))
{
Overlap element = ((Overlap) { .is_tile = true, .t = t });
//{ (&to_return)[(&to_return)->cur_index++] = element; assert((&to_return)->cur_index < ARRLEN((&to_return)->data)); }
BUFF_APPEND(&to_return, element);
}
}
// the gs.entities jessie
PROFILE_SCOPE("checking the entities")
ENTITIES_ITER(gs.entities)
{
if (!(it->is_character && it->is_rolling) && overlapping(aabb, entity_aabb(it)))
{
BUFF_APPEND(&to_return, (Overlap) { .e = it });
BUFF_APPEND(&to_return, it);
}
}
@ -3673,33 +3530,10 @@ Vec2 move_and_slide(MoveSlideParams p)
typedef struct
{
AABB aabb;
Entity *e; // optional
Entity *e; // required
} CollisionObj;
BUFF(CollisionObj, 256) to_check = { 0 };
// add tilemap boxes
{
Vec2 at_new_size_vector = SubV2(at_new.lower_right, at_new.upper_left);
Vec2 points_to_check[] = {
AddV2(at_new.upper_left, V2(0.0, 0.0)),
AddV2(at_new.upper_left, V2(at_new_size_vector.X, 0.0)),
AddV2(at_new.upper_left, V2(at_new_size_vector.X, at_new_size_vector.Y)),
AddV2(at_new.upper_left, V2(0.0, at_new_size_vector.Y)),
};
for (int i = 0; i < ARRLEN(points_to_check); i++)
{
Vec2 *it = &points_to_check[i];
TileCoord tilecoord_to_check = world_to_tilecoord(*it);
if (is_tile_solid(get_tile_layer(&level_level0, 2, tilecoord_to_check)))
{
AABB t = tile_aabb(tilecoord_to_check);
BUFF_APPEND(&to_check, ((CollisionObj){t, 0}));
}
}
}
// add entity boxes
if (!p.dont_collide_with_entities && !(p.from->is_character && p.from->is_rolling))
{
@ -4432,8 +4266,6 @@ void frame(void)
sg_apply_pipeline(state.pip);
Level *cur_level = &level_level0;
// Draw Tilemap draw tilemap tilemap drawing
#if 0
PROFILE_SCOPE("tilemap")
@ -4909,8 +4741,8 @@ void frame(void)
PROFILE_SCOPE("Checking for overlap")
{
Overlapping overlapping_at_want = get_overlapping(&level_level0, entity_aabb_at(e, cur_pos));
BUFF_ITER(Overlap, &overlapping_at_want) if (is_overlap_collision(*it) && !(it->e && it->e == e)) would_block_me = true;
Overlapping overlapping_at_want = get_overlapping(entity_aabb_at(e, cur_pos));
BUFF_ITER(Entity*, &overlapping_at_want) if (is_overlap_collision(*it) && *it != e) would_block_me = true;
}
if (would_block_me)
@ -5342,31 +5174,29 @@ void frame(void)
{
AABB dialog_rect = aabb_centered(player->pos, V2(dialog_interact_size , dialog_interact_size));
dbgrect(dialog_rect);
Overlapping possible_dialogs = get_overlapping(cur_level, dialog_rect);
Overlapping possible_dialogs = get_overlapping(dialog_rect);
float closest_interact_with_dist = INFINITY;
BUFF_ITER(Overlap, &possible_dialogs)
BUFF_ITER(Entity*, &possible_dialogs)
{
bool entity_talkable = true;
if (entity_talkable) entity_talkable = entity_talkable && !it->is_tile;
if (entity_talkable) entity_talkable = entity_talkable && it->e->is_npc;
//if(entity_talkable) entity_talkable = entity_talkable && !(it->e->npc_kind == NPC_Skeleton);
if (entity_talkable) entity_talkable = entity_talkable && (*it)->is_npc;
#ifdef WEB
if (entity_talkable) entity_talkable = entity_talkable && it->e->gen_request_id == 0;
if (entity_talkable) entity_talkable = entity_talkable && (*it)->gen_request_id == 0;
#endif
bool entity_interactible = entity_talkable;
if(it->e && it->e->is_machine)
if((*it) && (*it)->is_machine)
{
entity_interactible = entity_interactible || (it->e->machine_kind == MACH_idol_dispenser && !it->e->has_given_idol);
entity_interactible = entity_interactible || ((*it)->machine_kind == MACH_idol_dispenser && !(*it)->has_given_idol);
}
if (entity_interactible)
{
float dist = LenV2(SubV2(it->e->pos, player->pos));
float dist = LenV2(SubV2((*it)->pos, player->pos));
if (dist < closest_interact_with_dist)
{
closest_interact_with_dist = dist;
closest_interact_with = it->e;
closest_interact_with = (*it);
}
}
}
@ -6172,19 +6002,9 @@ void frame(void)
dbgsquare(screen_to_world(mouse_pos));
// tile coord
if (show_devtools)
{
TileCoord hovering = world_to_tilecoord(screen_to_world(mouse_pos));
Vec2 points[4] = { 0 };
AABB q = tile_aabb(hovering);
dbgrect(q);
draw_text((TextParams) { false, tprint("%d", get_tile(&level_level0, hovering).kind), world_to_screen(tilecoord_to_world(hovering)), BLACK, 1.0f });
}
// debug draw font image
{
draw_quad((DrawParams) { quad_centered(V2(0.0, 0.0), V2(250.0, 250.0)), image_font, full_region(image_font), WHITE });
//draw_quad((DrawParams) { quad_centered(V2(0.0, 0.0), V2(250.0, 250.0)), image_font, full_region(image_font), WHITE });
}
// statistics @Place(debug statistics)
@ -6198,6 +6018,7 @@ void frame(void)
AABB bounds = draw_text((TextParams) { true, stats, pos, BLACK, 1.0f });
pos.Y -= bounds.upper_left.Y - screen_size().Y;
bounds = draw_text((TextParams) { true, stats, pos, BLACK, 1.0f });
// background panel
colorquad(quad_aabb(bounds), (Color) { 1.0, 1.0, 1.0, 0.3f });
draw_text((TextParams) { false, stats, pos, BLACK, 1.0f });

11
main.tiled-project
Unescape Escape View File

@ -1,11 +0,0 @@
{
"automappingRulesFile": "",
"commands": [
],
"extensionsPath": "extensions",
"folders": [
"."
],
"propertyTypes": [
]
}
Write Preview
Loading…
Cancel
Save