Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add key shortcuts to toggle debug/UI #180

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add key shortcuts to toggle debug/UI #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ the client.
- Backquote (`) to write text on any block (signs).
- Arrow keys emulate mouse movement.
- Enter emulates mouse click.
- F3 to toggle debug info text.
- F1 to toggle all user interface elements.

### Chat Commands

Expand Down
2 changes: 2 additions & 0 deletions src/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
#define CRAFT_KEY_CHAT 't'
#define CRAFT_KEY_COMMAND '/'
#define CRAFT_KEY_SIGN '`'
#define CRAFT_KEY_DEBUG GLFW_KEY_F3
#define CRAFT_KEY_UI GLFW_KEY_F1

// advanced parameters
#define CREATE_CHUNK_RADIUS 10
Expand Down
22 changes: 16 additions & 6 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ typedef struct {
Block block1;
Block copy0;
Block copy1;
int show_info_text;
int show_ui;
} Model;

static Model model;
Expand Down Expand Up @@ -2200,6 +2202,12 @@ void on_key(GLFWwindow *window, int key, int scancode, int action, int mods) {
glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
}
}
if (key == CRAFT_KEY_DEBUG) {
g->show_info_text = !g->show_info_text;
}
if (key == CRAFT_KEY_UI) {
g->show_ui = !g->show_ui;
}
if (key == GLFW_KEY_ENTER) {
if (g->typing) {
if (mods & GLFW_MOD_SHIFT) {
Expand Down Expand Up @@ -2581,6 +2589,8 @@ void reset_model() {
g->day_length = DAY_LENGTH;
glfwSetTime(g->day_length / 3.0);
g->time_changed = 1;
g->show_info_text = SHOW_INFO_TEXT;
g->show_ui = 1;
}

int main(int argc, char **argv) {
Expand Down Expand Up @@ -2838,16 +2848,16 @@ int main(int argc, char **argv) {
render_signs(&text_attrib, player);
render_sign(&text_attrib, player);
render_players(&block_attrib, player);
if (SHOW_WIREFRAME) {
if (SHOW_WIREFRAME && g->show_ui) {
render_wireframe(&line_attrib, player);
}

// RENDER HUD //
glClear(GL_DEPTH_BUFFER_BIT);
if (SHOW_CROSSHAIRS) {
if (SHOW_CROSSHAIRS && g->show_ui) {
render_crosshairs(&line_attrib);
}
if (SHOW_ITEM) {
if (SHOW_ITEM && g->show_ui) {
render_item(&block_attrib);
}

Expand All @@ -2856,7 +2866,7 @@ int main(int argc, char **argv) {
float ts = 12 * g->scale;
float tx = ts / 2;
float ty = g->height - ts;
if (SHOW_INFO_TEXT) {
if (g->show_info_text && g->show_ui) {
int hour = time_of_day() * 24;
char am_pm = hour < 12 ? 'a' : 'p';
hour = hour % 12;
Expand All @@ -2870,7 +2880,7 @@ int main(int argc, char **argv) {
render_text(&text_attrib, ALIGN_LEFT, tx, ty, ts, text_buffer);
ty -= ts * 2;
}
if (SHOW_CHAT_TEXT) {
if (SHOW_CHAT_TEXT && g->show_ui) {
for (int i = 0; i < MAX_MESSAGES; i++) {
int index = (g->message_index + i) % MAX_MESSAGES;
if (strlen(g->messages[index])) {
Expand All @@ -2885,7 +2895,7 @@ int main(int argc, char **argv) {
render_text(&text_attrib, ALIGN_LEFT, tx, ty, ts, text_buffer);
ty -= ts * 2;
}
if (SHOW_PLAYER_NAMES) {
if (SHOW_PLAYER_NAMES && g->show_ui) {
if (player != me) {
render_text(&text_attrib, ALIGN_CENTER,
g->width / 2, ts, ts, player->name);
Expand Down