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

String_MakeUInt32 -> String_UInt32ToDigits, and remove obsolete menuinputwidget render code

Browse source
This commit is contained in:
UnknownShadow200 2020-03-19 16:22:54 +11:00
parent a83b936f4c
commit 21392c8906
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/String.h
View file

@ -86,7 +86,7 @@ CC_API int String_CaselessEquals(const String* a, const String* b);
CC_API int String_CaselessEqualsConst(const String* a, const char* b);
/* Breaks down an integer into an array of digits, and returns number of digits. */
/* NOTE: Digits are in reverse order, so e.g. '200' becomes '0','0','2' */
int String_MakeUInt32(cc_uint32 num, char* digits);
int String_UInt32ToDigits(cc_uint32 num, char* digits);
/* Attempts to append a character. */
/* Does nothing if str->length == str->capcity. */

23
src/Widgets.c
View file

@ -1000,6 +1000,13 @@ static void InputWidget_RenderCaret(struct InputWidget* w, double delta) {
if (second < 0.5f) Texture_RenderShaded(&w->caretTex, w->caretCol);
}
static void InputWidget_RenderCaret2(struct InputWidget* w, int offset) {
if (w->showCaret && Math_Mod1((float)w->caretAccumulator) < 0.5f) {
Gfx_BindTexture(w->caretTex.ID);
Gfx_DrawVb_IndexedTris_Range(4, offset);
}
}
static void InputWidget_OnPressedEnter(void* widget) {
struct InputWidget* w = (struct InputWidget*)widget;
InputWidget_Clear(w);
@ -1393,12 +1400,6 @@ const struct MenuInputVTABLE StringInput_VTABLE = {
/*########################################################################################################################*
*-----------------------------------------------------MenuInputWidget-----------------------------------------------------*
*#########################################################################################################################*/
static void MenuInputWidget_Render(void* widget, double delta) {
struct InputWidget* w = (struct InputWidget*)widget;
Texture_Render(&w->inputTex);
InputWidget_RenderCaret(w, delta);
}
static void MenuInputWidget_BuildMesh(void* widget, VertexP3fT2fC4b** vertices) {
struct InputWidget* w = (struct InputWidget*)widget;
Gfx_Make2DQuad(&w->inputTex, PACKEDCOL_WHITE, vertices);
@ -1409,13 +1410,9 @@ static int MenuInputWidget_Render2(void* widget, int offset) {
struct InputWidget* w = (struct InputWidget*)widget;
Gfx_BindTexture(w->inputTex.ID);
Gfx_DrawVb_IndexedTris_Range(4, offset);
offset += 4;
if (w->showCaret && Math_Mod1((float)w->caretAccumulator) < 0.5f) {
Gfx_BindTexture(w->caretTex.ID);
Gfx_DrawVb_IndexedTris_Range(4, offset);
}
return offset + 4;
InputWidget_RenderCaret2(w, offset + 4);
return offset + 8;
}
static void MenuInputWidget_RemakeTexture(void* widget) {
@ -1489,7 +1486,7 @@ static cc_bool MenuInputWidget_AllowedChar(void* widget, char c) {
static int MenuInputWidget_GetMaxLines(void) { return 1; }
static const struct WidgetVTABLE MenuInputWidget_VTABLE = {
MenuInputWidget_Render, InputWidget_Free, InputWidget_Reposition,
NULL, InputWidget_Free, InputWidget_Reposition,
InputWidget_KeyDown, InputWidget_KeyUp, Widget_MouseScroll,
InputWidget_PointerDown, Widget_Pointer, Widget_PointerMove,
MenuInputWidget_BuildMesh, MenuInputWidget_Render2