Skip to content

Commit cc34587

Browse files
committed
New splash screen and team select screen. Game screen up next.
1 parent e425136 commit cc34587

File tree

1 file changed

+43
-5
lines changed

1 file changed

+43
-5
lines changed

laser_tag_app.c

+43-5
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,55 @@ static void laser_tag_app_draw_callback(Canvas* canvas, void* context) {
6565
FURI_LOG_D(TAG, "Entering draw callback");
6666

6767
if(app->state == LaserTagStateSplashScreen) {
68-
FURI_LOG_D(TAG, "Drawing splash screen");
6968
canvas_clear(canvas);
7069
canvas_set_font(canvas, FontPrimary);
71-
canvas_draw_str(canvas, 32, 32, "Laser Tag!");
70+
canvas_draw_str(canvas, 5, 20, "Laser Tag!");
71+
canvas_set_font(canvas, FontSecondary);
72+
canvas_draw_str(canvas, 5, 40, "https://github.com/");
73+
canvas_draw_str(canvas, 5, 50, "RocketGod-git/");
74+
canvas_draw_str(canvas, 5, 60, "Flipper-Zero-Laser-Tag");
75+
canvas_draw_frame(canvas, 0, 0, 128, 64);
76+
canvas_draw_line(canvas, 0, 30, 127, 30);
77+
canvas_draw_circle(canvas, 110, 15, 12);
78+
canvas_draw_disc(canvas, 110, 15, 4);
79+
7280
} else if(app->state == LaserTagStateTeamSelect) {
73-
FURI_LOG_D(TAG, "Drawing team selection screen");
7481
canvas_clear(canvas);
82+
canvas_draw_frame(canvas, 0, 0, 128, 64);
83+
7584
canvas_set_font(canvas, FontPrimary);
76-
canvas_draw_str(canvas, 32, 32, "Select Team:");
85+
canvas_draw_str(canvas, 14, 13, "SELECT TEAM");
86+
87+
canvas_draw_line(canvas, 0, 16, 127, 16);
88+
7789
canvas_set_font(canvas, FontSecondary);
78-
canvas_draw_str(canvas, 32, 48, "LEFT: Red RIGHT: Blue");
90+
canvas_draw_str(canvas, 5, 30, "LEFT");
91+
canvas_draw_str(canvas, 95, 30, "RIGHT");
92+
93+
canvas_set_font(canvas, FontPrimary);
94+
canvas_draw_str(canvas, 10, 45, "RED");
95+
canvas_draw_str(canvas, 95, 45, "BLUE");
96+
97+
// Gun icon for Red team
98+
canvas_draw_line(canvas, 10, 50, 25, 50);
99+
canvas_draw_line(canvas, 25, 50, 25, 55);
100+
canvas_draw_line(canvas, 10, 55, 25, 55);
101+
canvas_draw_line(canvas, 15, 55, 15, 60);
102+
103+
// Gun icon for Blue team (facing left)
104+
canvas_draw_line(canvas, 95, 50, 110, 50);
105+
canvas_draw_line(canvas, 95, 50, 95, 55);
106+
canvas_draw_line(canvas, 95, 55, 110, 55);
107+
canvas_draw_line(canvas, 105, 55, 105, 60);
108+
109+
// Laser beams
110+
canvas_draw_line(canvas, 25, 52, 60, 32);
111+
canvas_draw_line(canvas, 95, 52, 60, 32);
112+
113+
// Targets where lasers hit
114+
canvas_draw_circle(canvas, 60, 32, 5);
115+
canvas_draw_circle(canvas, 60, 32, 2);
116+
79117
} else if(app->view) {
80118
FURI_LOG_D(TAG, "Drawing game view");
81119
laser_tag_view_draw(laser_tag_view_get_view(app->view), canvas);

0 commit comments

Comments
 (0)