AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 01:26:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify DisconnectScreen a bit

Browse Source
This commit is contained in:
UnknownShadow200 2020-03-09 16:29:24 +11:00
parent af6600ecfc
commit 6aa2dceb22
1 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/Screens.c
View File

@ -1418,7 +1418,7 @@ void GeneratingScreen_Show(void) {
*#########################################################################################################################*/ *#########################################################################################################################*/
static struct DisconnectScreen { static struct DisconnectScreen {
Screen_Body Screen_Body
TimeMS initTime; double initTime;
cc_bool canReconnect, lastActive; cc_bool canReconnect, lastActive;
int lastSecsLeft; int lastSecsLeft;
struct ButtonWidget reconnect; struct ButtonWidget reconnect;
@ -1436,38 +1436,25 @@ static struct Widget* disconnect_widgets[3] = {
(struct Widget*)&DisconnectScreen.reconnect (struct Widget*)&DisconnectScreen.reconnect
}; };
#define DISCONNECT_MAX_VERTICES (2 * TEXTWIDGET_MAX + BUTTONWIDGET_MAX) #define DISCONNECT_MAX_VERTICES (2 * TEXTWIDGET_MAX + BUTTONWIDGET_MAX)
#define DISCONNECT_DELAY_MS 5000 #define DISCONNECT_DELAY_SECS 5
static void DisconnectScreen_UpdateReconnect(struct DisconnectScreen* s) {
String msg; char msgBuffer[STRING_SIZE];
int elapsed, secsLeft;
String_InitArray(msg, msgBuffer);
static void DisconnectScreen_ReconnectMessage(struct DisconnectScreen* s, String* msg) {
if (s->canReconnect) { if (s->canReconnect) {
int elapsedMS = (int)(DateTime_CurrentUTC_MS() - s->initTime); elapsed = (int)(Game.Time - s->initTime);
int secsLeft = (DISCONNECT_DELAY_MS - elapsedMS) / MILLIS_PER_SEC; secsLeft = DISCONNECT_DELAY_SECS - elapsed;
if (secsLeft > 0) { if (secsLeft > 0) {
String_Format1(msg, "Reconnect in %i", &secsLeft); String_Format1(&msg, "Reconnect in %i", &secsLeft);
} else { } else {
String_AppendConst(msg, "Reconnect"); String_AppendConst(&msg, "Reconnect");
} }
s->reconnect.disabled = secsLeft > 0;
} }
}
static void DisconnectScreen_UpdateDelayLeft(struct DisconnectScreen* s, double delta) {
String msg; char msgBuffer[STRING_SIZE];
int elapsedMS, secsLeft;
elapsedMS = (int)(DateTime_CurrentUTC_MS() - s->initTime);
secsLeft = (DISCONNECT_DELAY_MS - elapsedMS) / MILLIS_PER_SEC;
if (secsLeft < 0) secsLeft = 0;
if (s->lastSecsLeft == secsLeft && s->reconnect.active == s->lastActive) return;
String_InitArray(msg, msgBuffer);
DisconnectScreen_ReconnectMessage(s, &msg);
ButtonWidget_Set(&s->reconnect, &msg, &s->titleFont); ButtonWidget_Set(&s->reconnect, &msg, &s->titleFont);
s->reconnect.disabled = secsLeft != 0;
s->lastSecsLeft = secsLeft;
s->lastActive = s->reconnect.active;
s->dirty = true;
} }
static void DisconnectScreen_ContextLost(void* screen) { static void DisconnectScreen_ContextLost(void* screen) {
@ -1478,7 +1465,6 @@ static void DisconnectScreen_ContextLost(void* screen) {
} }
static void DisconnectScreen_ContextRecreated(void* screen) { static void DisconnectScreen_ContextRecreated(void* screen) {
String msg; char msgBuffer[STRING_SIZE];
struct DisconnectScreen* s = (struct DisconnectScreen*)screen; struct DisconnectScreen* s = (struct DisconnectScreen*)screen;
Screen_CreateVb(screen); Screen_CreateVb(screen);
@ -1486,10 +1472,7 @@ static void DisconnectScreen_ContextRecreated(void* screen) {
Drawer2D_MakeFont(&s->messageFont, 16, FONT_STYLE_NORMAL); Drawer2D_MakeFont(&s->messageFont, 16, FONT_STYLE_NORMAL);
TextWidget_Set(&s->title, &s->titleStr, &s->titleFont); TextWidget_Set(&s->title, &s->titleStr, &s->titleFont);
TextWidget_Set(&s->message, &s->messageStr, &s->messageFont); TextWidget_Set(&s->message, &s->messageStr, &s->messageFont);
DisconnectScreen_UpdateReconnect(s);
String_InitArray(msg, msgBuffer);
DisconnectScreen_ReconnectMessage(s, &msg);
ButtonWidget_Set(&s->reconnect, &msg, &s->titleFont);
} }
static void DisconnectScreen_Init(void* screen) { static void DisconnectScreen_Init(void* screen) {
@ -1506,15 +1489,27 @@ static void DisconnectScreen_Init(void* screen) {
/* NOTE: changing VSync can't be done within frame, causes crash on some GPUs */ /* NOTE: changing VSync can't be done within frame, causes crash on some GPUs */
Gfx_SetFpsLimit(Game_FpsLimit == FPS_LIMIT_VSYNC, 1000 / 5.0f); Gfx_SetFpsLimit(Game_FpsLimit == FPS_LIMIT_VSYNC, 1000 / 5.0f);
s->initTime = DateTime_CurrentUTC_MS(); s->initTime = Game.Time;
s->lastSecsLeft = DISCONNECT_DELAY_MS / MILLIS_PER_SEC; s->lastSecsLeft = DISCONNECT_DELAY_SECS;
s->widgets = disconnect_widgets; s->widgets = disconnect_widgets;
s->numWidgets = s->canReconnect ? 3 : 2; s->numWidgets = s->canReconnect ? 3 : 2;
} }
static void DisconnectScreen_Update(void* screen, double delta) { static void DisconnectScreen_Update(void* screen, double delta) {
struct DisconnectScreen* s = (struct DisconnectScreen*)screen; struct DisconnectScreen* s = (struct DisconnectScreen*)screen;
if (s->canReconnect) DisconnectScreen_UpdateDelayLeft(s, delta); int elapsed, secsLeft;
if (!s->canReconnect) return;
elapsed = (int)(Game.Time - s->initTime);
secsLeft = DISCONNECT_DELAY_SECS - elapsed;
if (secsLeft < 0) secsLeft = 0;
if (s->lastSecsLeft == secsLeft && s->reconnect.active == s->lastActive) return;
DisconnectScreen_UpdateReconnect(s);
s->lastSecsLeft = secsLeft;
s->lastActive = s->reconnect.active;
s->dirty = true;
} }
static void DisconnectScreen_Render(void* screen, double delta) { static void DisconnectScreen_Render(void* screen, double delta) {