summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAldrik Ramaekers <aldrik@amftech.nl>2023-12-24 22:09:56 +0100
committerAldrik Ramaekers <aldrik@amftech.nl>2023-12-24 22:09:56 +0100
commit2a85823f96ec4e9fa62905490ac93910187dfefc (patch)
treecc3360a19f61b481091e2c161b5aab575cda501c /src
parent03930634b437dc390354accd30563050d681a08d (diff)
metal wall texture
Diffstat (limited to 'src')
-rw-r--r--src/asset_defs.c1
-rw-r--r--src/map.c4
-rw-r--r--src/objects.c6
3 files changed, 9 insertions, 2 deletions
diff --git a/src/asset_defs.c b/src/asset_defs.c
index c4caf68..a9cddfe 100644
--- a/src/asset_defs.c
+++ b/src/asset_defs.c
@@ -40,6 +40,7 @@ void load_assets() {
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_metal_wall_front = assets_load_image_from_file("data/imgs/objects/metal_wall_front.png");
// Players
img_player_running = assets_load_image_from_file("data/imgs/players/player1_running.png");
diff --git a/src/map.c b/src/map.c
index a449514..e27026e 100644
--- a/src/map.c
+++ b/src/map.c
@@ -207,6 +207,10 @@ void create_empty_map() {
}
}
+ for (int x = 0; x < MAP_SIZE_X; x++) {
+ map_to_load.objects[50+x] = (object){.active = true, .position = (vec3f){x, 0, 0}, .size = (vec3f){1,1,1}, .type = OBJECT_METAL_WALL_FRONT};
+ }
+
map_to_load.objects[0] = (object){.active = true, .position = (vec3f){16, 8, 0}, .size = (vec3f){1,1,2}, .type = OBJECT_PLANTBOX1};
map_to_load.objects[1] = (object){.active = true, .position = (vec3f){0, 0, 0}, .size = (vec3f){1,1,2}, .type = OBJECT_COBBLESTONEWALL1};
diff --git a/src/objects.c b/src/objects.c
index c1335fb..46714a4 100644
--- a/src/objects.c
+++ b/src/objects.c
@@ -45,6 +45,8 @@ image* get_image_from_objecttype(object_type tile) {
return img_obj_wall1;
case OBJECT_PLANTBOX1:
return img_obj_plants;
+ case OBJECT_METAL_WALL_FRONT:
+ return img_metal_wall_front;
default:
return 0;
}
@@ -61,17 +63,17 @@ void draw_objects_at_row(platform_window* window, int row) {
if (!o.active) continue;
box box = get_box_of_object(window, o);
- /*
image* img = get_image_from_objecttype(o.type);
if (img) {
renderer->render_image(img, 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));
render_quad_with_outline(box.tl_u, box.tr_u, box.bl_u, box.br_u, rgb(200,200,0));
render_quad_with_outline(box.tl_u, box.tl_d, box.bl_u, box.bl_d, rgb(200,200,0));
render_quad_with_outline(box.bl_u, box.br_u, box.bl_d, box.br_d, rgb(200,200,0));
+ */
}
}