celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2026-09-17 20:10:23 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Split gui to interface, potentially new ui interface is possible

Browse Source
This commit is contained in:
Er2
2023-12-09 13:58:05 +03:00
parent 7b5f2b61f9
commit 5e311cbbb3
31 changed files with 460 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/player/input/TouchInputHolder.cpp
View File

@@ -58,6 +58,6 @@ void TouchInputHolder::setScreenSize(int width, int height)
{
m_touchScreenInput.setScreenSize(width, height);
m_unifiedTurnBuild.field_40 = m_touchScreenInput.getRectangleArea();
m_unifiedTurnBuild.field_58 = m_pMinecraft->m_gui.getRectangleArea(false);
m_unifiedTurnBuild.field_58 = getRectangleArea(m_pMinecraft->m_pGui, false);
m_unifiedTurnBuild.setScreenSize(width, height);
}

12
source/client/player/input/TouchInputHolder.hpp
View File

@@ -8,6 +8,7 @@
#pragma once
#include "client/app/Minecraft.hpp"
#include "IInputHolder.hpp"
#include "TouchscreenInput_TestFps.hpp"
#include "UnifiedTurnBuild.hpp"
@@ -15,6 +16,17 @@
class Minecraft;
class Options;
static inline RectangleArea getRectangleArea(IGui *gui, bool b)
{
float centerX = Minecraft::width / 2;
float hotbarWidthHalf = (10 * gui->getNumSlots() + 5) / gui->scale;
return RectangleArea(
b ? (centerX - hotbarWidthHalf) : 0,
Minecraft::height - 24.0f / gui->scale,
centerX + hotbarWidthHalf,
Minecraft::height);
}
class TouchInputHolder : public IInputHolder
{
public:

17
source/client/player/input/TouchscreenInput_TestFps.cpp
View File

@@ -221,7 +221,7 @@ void TouchscreenInput_TestFps::tick(Player* pPlayer)
}
}
static void RenderTouchButton(Tesselator* t, PolygonArea* pArea, int srcX, int srcY)
static void RenderTouchButton(Tesselator* t, PolygonArea* pArea, int srcX, int srcY, float scale)
{
float tc[8];
@@ -237,8 +237,8 @@ static void RenderTouchButton(Tesselator* t, PolygonArea* pArea, int srcX, int s
for (int i = 0; i < pArea->m_count; i++)
{
t->vertexUV(
Gui::InvGuiScale * pArea->m_xPos[i],
Gui::InvGuiScale * pArea->m_yPos[i],
scale * pArea->m_xPos[i],
scale * pArea->m_yPos[i],
0.0f,
tc[(2 * i) % 8],
tc[(2 * i + 1) % 8]
@@ -253,24 +253,25 @@ void TouchscreenInput_TestFps::render(float f)
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
m_pMinecraft->m_pTextures->loadAndBindTexture("gui/gui.png");
float scale = m_pMinecraft->m_pGui->scale;
Tesselator& t = Tesselator::instance;
t.begin();
t.color(isButtonDown(100 + INPUT_LEFT) ? 0xC0C0C0 : 0xFFFFFF, 0x80);
RenderTouchButton(&t, m_pAreaLeft, 64, 112);
RenderTouchButton(&t, m_pAreaLeft, 64, 112, scale);
t.color(isButtonDown(100 + INPUT_RIGHT) ? 0xC0C0C0 : 0xFFFFFF, 0x80);
RenderTouchButton(&t, m_pAreaRight, 192, 112);
RenderTouchButton(&t, m_pAreaRight, 192, 112, scale);
t.color(isButtonDown(100 + INPUT_FORWARD) ? 0xC0C0C0 : 0xFFFFFF, 0x80);
RenderTouchButton(&t, m_pAreaForward, 0, 112);
RenderTouchButton(&t, m_pAreaForward, 0, 112, scale);
t.color(isButtonDown(100 + INPUT_BACKWARD) ? 0xC0C0C0 : 0xFFFFFF, 0x80);
RenderTouchButton(&t, m_pAreaBackward, 128, 112);
RenderTouchButton(&t, m_pAreaBackward, 128, 112, scale);
t.color(isButtonDown(100 + INPUT_JUMP) ? 0xC0C0C0 : 0xFFFFFF, 0x80);
RenderTouchButton(&t, m_pAreaJump, 0, 176);
RenderTouchButton(&t, m_pAreaJump, 0, 176, scale);
t.draw();