1 files changed, 60 insertions, 21 deletions

diff --git a/src/editor.c b/src/editor.c
index e465408..673432b 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -26,6 +26,9 @@ void update_editor(platform_window* window)
 		camera_x += update_delta*cam_speed;
 	}
 
+	_next_camera_pos.x = -(window->width / 2) + camera_x;
+	_next_camera_pos.y = -(window->height / 2) + camera_y;
+
 	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));
@@ -33,29 +36,65 @@ void update_editor(platform_window* window)
 	}
 }
 
+void draw_placing_rectangle(platform_window* window) {
+	map_info info = get_map_info(window);
+	int mouse_tile_y = (_global_mouse.y + _global_camera.y) / info.tile_height;
+	int mouse_tile_x = (((_global_mouse.x + _global_camera.x) - (info.px_incline * mouse_tile_y)) / info.tile_width);
+
+	if (mouse_tile_x < 0 || mouse_tile_y < 0) return;
+	if (mouse_tile_x >= loaded_map.width || mouse_tile_y >= loaded_map.height) return;
+
+	tile t = loaded_map.heightmap[mouse_tile_y][mouse_tile_x];
+	renderer->render_rectangle_outline(t.tl.x, t.tl.y, t.tr.x - t.tl.x, t.br.y - t.tr.y, 2, rgb(255,0,0));
+
+	if (is_left_clicked()) {
+		map_to_load.heightmap[mouse_tile_y][mouse_tile_x]++;
+		load_mapdata_into_world();
+	}
+	if (is_right_clicked()) {
+		map_to_load.heightmap[mouse_tile_y][mouse_tile_x]--;
+		load_mapdata_into_world();
+	}
+}
+
+static bool push_icon_button(int x, int y, int w, image* img) {
+	if (img) renderer->render_image(img,_global_camera.x+ x,_global_camera.y+ y, w, w);
+	renderer->render_rectangle_outline(_global_camera.x+ x,_global_camera.y+ y, w, w, 1, rgb(255,0,0));
+
+	return false;
+}
+
+void draw_tile_panel(platform_window* window) {
+	int start_y = 1;
+	int width = 200;
+	int cols = 4;
+	int tile_w = width / cols;
+
+	renderer->render_rectangle(_global_camera.x, _global_camera.y, width, window->height, rgb(200,150,100));
+
+	if (push_icon_button(tile_w*0, 0, tile_w, img_arrow_up)) {
+
+	}
+	if (push_icon_button(tile_w*1, 0, tile_w, img_arrow_down)) {
+		
+	}
+	if (push_icon_button(tile_w*2, 0, tile_w, img_cancel)) {
+		
+	}
+
+	for (int i = 0; i < TILE_END; i++) {
+		int x = i % cols * tile_w;
+		int y = (start_y + (i / cols)) * tile_w;
+
+		image* img = get_image_from_tiletype((tile_type)i);
+		push_icon_button(x, y, tile_w, img);
+	}
+}
+
 void draw_editor(platform_window* window)
 {
 	if (is_editing_map) {
-		_next_camera_pos.x = -(window->width / 2) + camera_x;
-		_next_camera_pos.y = -(window->height / 2) + camera_y;
-
-		map_info info = get_map_info(window);
-		int mouse_tile_y = (_global_mouse.y + _global_camera.y) / info.tile_height;
-		int mouse_tile_x = (((_global_mouse.x + _global_camera.x) - (info.px_incline * mouse_tile_y)) / info.tile_width);
-
-		if (mouse_tile_x < 0 || mouse_tile_y < 0) return;
-		if (mouse_tile_x >= loaded_map.width || mouse_tile_y >= loaded_map.height) return;
-
-		tile t = loaded_map.heightmap[mouse_tile_y][mouse_tile_x];
-		renderer->render_rectangle_outline(t.tl.x, t.tl.y, t.tr.x - t.tl.x, t.br.y - t.tr.y, 2, rgb(255,0,0));
-
-		if (is_left_clicked()) {
-			map_to_load.heightmap[mouse_tile_y][mouse_tile_x]++;
-			load_mapdata_into_world();
-		}
-		if (is_right_clicked()) {
-			map_to_load.heightmap[mouse_tile_y][mouse_tile_x]--;
-			load_mapdata_into_world();
-		}
+		draw_placing_rectangle(window);
+		draw_tile_panel(window);
 	}
 }
\ No newline at end of file