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

Draw active regions for two of the directions

Browse Source
This commit is contained in:
UnknownShadow200 2020-10-21 22:49:59 +11:00
parent 4b2d596585
commit 88c0f476f5
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Screens.c
View File

@ -2024,7 +2024,7 @@ static void TouchScreen_Layout(void* screen) {
Widget_Layout(&s->btns[i]); Widget_Layout(&s->btns[i]);
} }
Widget_SetLocation(&s->thumbstick, ANCHOR_MIN, ANCHOR_MAX, 30, 30); Widget_SetLocation(&s->thumbstick, ANCHOR_MIN, ANCHOR_MAX, 30, 70);
} }
static const struct ScreenVTABLE TouchScreen_VTABLE = { static const struct ScreenVTABLE TouchScreen_VTABLE = {

13
src/Widgets.c
View File

@ -2516,9 +2516,15 @@ static void ThumbstickWidget_BuildMesh(void* widget, struct VertexTextured** ver
Gfx_Make2DQuad(&tex, PACKEDCOL_WHITE, vertices); Gfx_Make2DQuad(&tex, PACKEDCOL_WHITE, vertices);
/* The 4 sides.. not done */ /* The 4 sides.. not done */
/* Side 1 */
tex.Width /= 2;
tex.uv.U1 = 0.75f; tex.uv.U1 = 0.75f;
tex.uv.U2 = 1.0f; tex.uv.U2 = 1.00f;
Gfx_Make2DQuad(&tex, PACKEDCOL_WHITE, vertices); Gfx_Make2DQuad(&tex, PACKEDCOL_WHITE, vertices);
/* Side 2 */
tex.X += tex.Width;
tex.uv.U1 = 1.00f;
tex.uv.U2 = 0.75f;
Gfx_Make2DQuad(&tex, PACKEDCOL_WHITE, vertices); Gfx_Make2DQuad(&tex, PACKEDCOL_WHITE, vertices);
Gfx_Make2DQuad(&tex, PACKEDCOL_WHITE, vertices); Gfx_Make2DQuad(&tex, PACKEDCOL_WHITE, vertices);
Gfx_Make2DQuad(&tex, PACKEDCOL_WHITE, vertices); Gfx_Make2DQuad(&tex, PACKEDCOL_WHITE, vertices);
@ -2552,9 +2558,14 @@ static int ThumbstickWidget_CalcDirs(struct ThumbstickWidget* w) {
static int ThumbstickWidget_Render2(void* widget, int offset) { static int ThumbstickWidget_Render2(void* widget, int offset) {
struct ThumbstickWidget* w = (struct ThumbstickWidget*)widget; struct ThumbstickWidget* w = (struct ThumbstickWidget*)widget;
int flags = ThumbstickWidget_CalcDirs(w);
if (Gui.TouchTex) { if (Gui.TouchTex) {
Gfx_BindTexture(Gui.TouchTex); Gfx_BindTexture(Gui.TouchTex);
Gfx_DrawVb_IndexedTris_Range(4, offset); Gfx_DrawVb_IndexedTris_Range(4, offset);
if (flags & DIR_XMIN) Gfx_DrawVb_IndexedTris_Range(4, offset + 4);
if (flags & DIR_XMAX) Gfx_DrawVb_IndexedTris_Range(4, offset + 8);
} }
return offset + 20; return offset + 20;
} }