mirrors/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-01-22 09:01:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Move MenuOptionsScreen to new rendering method

Browse source
This commit is contained in:
UnknownShadow200 2020-03-19 14:44:44 +11:00
parent ffa1b1e45f
commit a83b936f4c
3 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Gui.c
View file

@ -308,14 +308,13 @@ void TextAtlas_Free(struct TextAtlas* atlas) { Gfx_DeleteTexture(&atlas->tex.ID)
void TextAtlas_Add(struct TextAtlas* atlas, int charI, VertexP3fT2fC4b** vertices) {
struct Texture part = atlas->tex;
int width = atlas->widths[charI];
PackedCol white = PACKEDCOL_WHITE;
part.X = atlas->curX; part.Width = width;
part.uv.U1 = atlas->offsets[charI] * atlas->uScale;
part.uv.U2 = part.uv.U1 + width * atlas->uScale;
atlas->curX += width;
Gfx_Make2DQuad(&part, white, vertices);
Gfx_Make2DQuad(&part, PACKEDCOL_WHITE, vertices);
}
void TextAtlas_AddInt(struct TextAtlas* atlas, int value, VertexP3fT2fC4b** vertices) {

28
src/Menus.c
View file

@ -452,13 +452,6 @@ void ListScreen_Show(void) {
/*########################################################################################################################*
*--------------------------------------------------------MenuScreen-------------------------------------------------------*
*#########################################################################################################################*/
static void MenuScreen_Render(void* screen, double delta) {
Menu_RenderBounds();
Gfx_SetTexturing(true);
Screen_RenderWidgets(screen, delta);
Gfx_SetTexturing(false);
}
static void MenuScreen_Render2(void* screen, double delta) {
Menu_RenderBounds();
Gfx_SetTexturing(true);
@ -1970,6 +1963,7 @@ static struct MenuOptionsScreen {
struct Texture extHelpTextures[5]; /* max lines is 5 */
struct ButtonWidget buttons[10], done;
} MenuOptionsScreen_Instance;
#define MENUOPTIONS_MAX_VERTICES (BUTTONWIDGET_MAX * 13 + MENUINPUTWIDGET_MAX)
static void Menu_GetBool(String* raw, cc_bool v) {
String_AppendConst(raw, v ? "ON" : "OFF");
@ -2219,6 +2213,7 @@ static void MenuOptionsScreen_Init(void* screen) {
struct MenuOptionsScreen* s = (struct MenuOptionsScreen*)screen;
int i;
s->maxVertices = MENUOPTIONS_MAX_VERTICES;
s->widgets = widgets;
/* The various menu options screens might have different number of widgets */
for (i = 0; i < Array_Elems(widgets); i++) { s->widgets[i] = NULL; }
@ -2228,6 +2223,12 @@ static void MenuOptionsScreen_Init(void* screen) {
s->DoInit(s);
Event_RegisterVoid(&UserEvents.HackPermissionsChanged, screen, MenuOptionsScreen_OnHacksChanged);
}
static void MenuOptionsScreen_Update2(void* screen, double delta) {
struct MenuOptionsScreen* s = (struct MenuOptionsScreen*)screen;
if (s->activeI == -1) return;
s->input.base.caretAccumulator += delta;
}
#define EXTHELP_PAD 5 /* padding around extended help box */
static void MenuOptionsScreen_Render(void* screen, double delta) {
@ -2235,7 +2236,7 @@ static void MenuOptionsScreen_Render(void* screen, double delta) {
struct TextGroupWidget* w;
PackedCol tableCol = PackedCol_Make(20, 20, 20, 200);
MenuScreen_Render(s, delta);
MenuScreen_Render2(screen, delta);
if (!s->extHelp.lines) return;
w = &s->extHelp;
@ -2270,6 +2271,8 @@ static void MenuOptionsScreen_ContextLost(void* screen) {
static void MenuOptionsScreen_ContextRecreated(void* screen) {
struct MenuOptionsScreen* s = (struct MenuOptionsScreen*)screen;
int i;
Screen_CreateVb(screen);
Menu_MakeTitleFont(&s->titleFont);
Menu_MakeBodyFont(&s->textFont);
@ -2284,11 +2287,9 @@ static void MenuOptionsScreen_ContextRecreated(void* screen) {
MenuOptionsScreen_RedrawInput(s);
}
static void MenuOptionsScreen_BuildMesh(void* screen) { }
static const struct ScreenVTABLE MenuOptionsScreen_VTABLE = {
MenuOptionsScreen_Init, Screen_NullUpdate, MenuOptionsScreen_Free,
MenuOptionsScreen_Render, MenuOptionsScreen_BuildMesh,
MenuOptionsScreen_Init, MenuOptionsScreen_Update2, MenuOptionsScreen_Free,
MenuOptionsScreen_Render, Screen_BuildMesh,
MenuOptionsScreen_KeyDown, Screen_TInput, MenuOptionsScreen_KeyPress, MenuOptionsScreen_TextChanged,
Menu_PointerDown, Screen_TPointer, MenuOptionsScreen_PointerMove, Screen_TMouseScroll,
MenuOptionsScreen_Layout, MenuOptionsScreen_ContextLost, MenuOptionsScreen_ContextRecreated
@ -3020,8 +3021,7 @@ static void TexIdsOverlay_BuildMesh(void* screen) { }
static void TexIdsOverlay_RenderTerrain(struct TexIdsOverlay* s) {
VertexP3fT2fC4b* ptr;
struct Texture tex;
int size, count;
int i, idx, end;
int size, i, idx, end;
size = s->tileSize;
tex.uv.U1 = 0.0f; tex.uv.U2 = UV2_Scale;

4
src/Program.c
View file

@ -108,8 +108,8 @@ static int Program_Run(int argc, char** argv) {
#ifdef _MSC_VER
/* NOTE: Make sure to comment this out before pushing a commit */
//String rawArgs = String_FromConst("UnknownShadow200 fffff 127.0.0.1 25565");
//String rawArgs = String_FromConst("UnknownShadow200");
//argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4);
String rawArgs = String_FromConst("UnknownShadow200");
argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4);
#endif
if (argsCount == 0) {