From d055cf69c8925e895cfcb726a4339f843f3ccfc1 Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Tue, 27 Dec 2022 09:05:33 +0100 Subject: work --- src/asset_defs.c | 5 +++++ src/map.c | 11 ++++++++++- src/objects.c | 29 +++++++++++++++-------------- src/players.c | 25 ++++++++++++++++++++++++- 4 files changed, 54 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/asset_defs.c b/src/asset_defs.c index da8b5f0..a136e5f 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -16,4 +16,9 @@ void load_assets() { img_tile_cobblestone = assets_load_image_from_file("data/imgs/tile_cobblestone.png"); img_spawner = assets_load_image_from_file("data/imgs/spawner.png"); + + img_obj_plants = assets_load_image_from_file("data/imgs/plants.png"); + img_obj_wall1 = assets_load_image_from_file("data/imgs/wall1.png"); + + img_player = assets_load_image_from_file("data/imgs/player.png"); } \ No newline at end of file diff --git a/src/map.c b/src/map.c index faa447e..2b22888 100644 --- a/src/map.c +++ b/src/map.c @@ -95,9 +95,18 @@ static int get_height_of_tile_tr(int current_height, int x, int y) { // load hardcoded map. void load_map_from_data() { + + // load map from file.. + file_content content = platform_read_file_content("data/maps/map1.dat", "rb"); + memcpy(&map_to_load, content.content, content.content_length); + + //map_to_load.width = MAP_SIZE_X; + //map_to_load.height = MAP_SIZE_Y; + //memcpy(map_to_load.heightmap, map, sizeof(map)); + for (int y = 0; y < MAP_SIZE_Y; y++) { for (int x = MAP_SIZE_X-1; x >= 0; x--) { - int h = map[y][x]; + int h = map_to_load.heightmap[y][x]; int highest_point_topleft = get_height_of_tile_tl(h, x, y); int highest_point_topright = get_height_of_tile_tr(h, x, y); int highest_point_bottomright = get_height_of_tile_br(h, x, y); diff --git a/src/objects.c b/src/objects.c index 7b3b7a0..fdb0daa 100644 --- a/src/objects.c +++ b/src/objects.c @@ -48,7 +48,7 @@ void draw_objects_at_row(platform_window* window, int row) { if (!o.active) continue; box box = get_box_of_object(window, o); - renderer->render_image(img_drop, box.tl_u.x, box.tl_u.y, + renderer->render_image(o.image, box.tl_u.x, box.tl_u.y, box.br_d.x - box.tl_d.x, box.br_d.y - box.tr_u.y); /* render_quad_with_outline(box.tl_d, box.tr_d, box.bl_d, box.br_d, rgb(200,200,0)); @@ -58,7 +58,7 @@ void draw_objects_at_row(platform_window* window, int row) { } } -void create_box(float x, float y, float h) { +void create_box(float x, float y, float h, image* img) { for (int i = 0; i < max_objects; i++) { object o = objects[i]; if (o.active) continue; @@ -67,6 +67,7 @@ void create_box(float x, float y, float h) { objects[i].position = (vec2f){x, y}; objects[i].h = h; objects[i].size = (vec3f){1,1,2}; + objects[i].image = img; break; } } @@ -75,24 +76,24 @@ void create_objects() { // rechts naar links op map. for (int i = MAP_SIZE_X-1; i >= 0; i--) { - create_box(i, 0, 0); - create_box(i, MAP_SIZE_Y-1, 0); + create_box(i, 0, 0, img_obj_wall1); + create_box(i, MAP_SIZE_Y-1, 0, img_obj_wall1); } for (int i = MAP_SIZE_Y-1; i >= 0; i--) { - create_box(0, i, 0); - create_box(MAP_SIZE_X-1, i, 0); + create_box(0, i, 0, img_obj_wall1); + create_box(MAP_SIZE_X-1, i, 0, img_obj_wall1); } - create_box(16, 8, 0); - create_box(14, 8, 0); - create_box(11, 8, 0); - create_box(10, 8, 0); + create_box(16, 8, 0, img_obj_plants); + create_box(14, 8, 0, img_obj_plants); + create_box(11, 8, 0, img_obj_plants); + create_box(10, 8, 0, img_obj_plants); - create_box(15, 10, 0); - create_box(14, 10, 0); - create_box(13, 10, 0); - create_box(11, 10, 0); + create_box(15, 10, 0, img_obj_plants); + create_box(14, 10, 0, img_obj_plants); + create_box(13, 10, 0, img_obj_plants); + create_box(11, 10, 0, img_obj_plants); create_spawner((vec2){15, 5}); create_spawner((vec2){3, 8}); diff --git a/src/players.c b/src/players.c index 886c782..6409b77 100644 --- a/src/players.c +++ b/src/players.c @@ -40,6 +40,7 @@ void spawn_player(u32 id, network_client client) { players[i].guntype = GUN_MP5; players[i].height = 0.0f; players[i].client = client; + players[i].sprite = create_sprite(img_player, 5, 87, 100, 0.07f); gun g = get_gun_by_type(players[i].guntype); players[i].total_ammo = g.max_ammunition; @@ -139,10 +140,23 @@ int get_my_player_index() { return -1; } +static void take_update_debug(platform_window* window) { + if (keyboard_is_key_down(KEY_LEFT_CONTROL) && keyboard_is_key_pressed(KEY_S)) { + platform_write_file_content("../data/maps/map1.dat", "wb", (u8*)&map_to_load, sizeof(map_to_load)); + platform_write_file_content("data/maps/map1.dat", "wb", (u8*)&map_to_load, sizeof(map_to_load)); + + log_info("Saved map"); + } +} + void take_player_input(platform_window* window) { player* p = get_player_by_id(player_id); if (!p) return; +#ifdef MODE_DEBUG + take_update_debug(window); +#endif + if (keyboard_is_key_down(KEY_W)) { if (!global_state.server) { network_message message = create_protocol_user_moved(MOVE_UP, player_id); @@ -208,6 +222,7 @@ void update_players_server() { for (int i = 0; i < MAX_PLAYERS; i++) { if (!players[i].active) continue; players[i].sec_since_last_shot += SERVER_TICK_RATE; + update_sprite(&players[i].sprite); } } @@ -222,15 +237,23 @@ void draw_players(platform_window* window) { players[i].height = height; box box = get_render_box_of_square(window, (vec3f){players[i].playerx, players[i].playery, height}, (vec3f){size,size,0.8f}); + /* render_quad_with_outline(box.tl_d, box.tr_d, box.bl_d, box.br_d, rgb(200,150,120)); render_quad_with_outline(box.tl_u, box.tr_u, box.bl_u, box.br_u, rgb(200,150,120)); render_quad_with_outline(box.tl_u, box.tl_d, box.bl_u, box.bl_d, rgb(200,150,120)); render_quad_with_outline(box.bl_u, box.br_u, box.bl_d, box.br_d, rgb(200,150,120)); +*/ + sprite_frame frame = sprite_get_frame(&players[i].sprite); + renderer->render_image_quad_partial(players[i].sprite.image, + box.tl_u.x, box.tl_u.y, + box.bl_d.x, box.bl_d.y, + box.br_d.x, box.br_d.y, + box.tr_u.x, box.tr_u.y, + frame.tl, frame.tr, frame.bl, frame.br); int size = get_tile_width(window) / 2; map_info info = get_map_info(window); - float player_render_x = players[i].playerx*info.tile_width + (players[i].playery*info.px_incline); float player_render_y = players[i].playery*info.tile_height - (height*info.px_raised_per_h); -- cgit v1.2.3-70-g09d2