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

Integrate touch related development. (#90)

Browse Source 
* * Add BuildActionIntention crap

* * Set Client and World projects to use MP compilation

* asd

* * Use the new BuildActionIntention to break and place blocks.

* * Reverse engineer the IArea system.

* * Copy break logic from survival into creative conditionally

* * Reverse IBuildInput and MouseHandler
* Replace the new relative paths in the client project with $(MC_ROOT) again

* * Reverse Multitouch, MouseDevice

* * Reverse a bunch of auxiliary classes for input.

* * Use CustomInputHolder instead of holding inputs manually.

* * Reverse a whole BUNCH of things!

* * Add feedback textures to the gitignore.

* * D-pad now renders! Also loads of other work.

* * More Stuff

* * Finish touch control bug fixing.

* * Finalize work.

* * One last thing..

* * Add a "cramped" mode to the options screen and start menu.

* * Oh, forgot to do something
This commit is contained in:
iProgramInCpp
2023-11-02 00:49:11 +02:00
committed by GitHub
parent 98d6b4e5e8
commit 60b21356a1
87 changed files with 3439 additions and 916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
source/client/gui/screens/OptionsScreen.cpp
View File

@@ -43,11 +43,11 @@ OptionsScreen::OptionsScreen()
{
}
#ifndef ORIGINAL_CODE
static std::string BoolOptionStr(bool b)
{
return b ? "ON" : "OFF";
}
static std::string ViewDistanceStr(int dist)
{
switch (dist)
@@ -66,7 +66,7 @@ static std::string ViewDistanceStr(int dist)
}
}
void OptionsScreen::UpdateTexts()
void OptionsScreen::updateTexts()
{
Options& o = *(m_pMinecraft->getOptions());
@@ -78,20 +78,62 @@ void OptionsScreen::UpdateTexts()
m_flightHaxButton.m_text = "Flight hax: " + BoolOptionStr(o.m_bFlyCheat);
m_autoJumpButton.m_text = "Auto Jump: " + BoolOptionStr(o.m_bAutoJump);
m_viewDistButton.m_text = "View distance: " + ViewDistanceStr(o.m_iViewDistance);
m_srvVisButton.m_text = "Server " + std::string(o.m_bServerVisibleDefault ? "visible" : "invisible") + " by default";
m_blockLinesButton.m_text = "Block outlines: " + BoolOptionStr(o.m_bBlockOutlines);
if (!isCramped())
m_srvVisButton.m_text = "Server " + std::string(o.m_bServerVisibleDefault ? "visible" : "invisible") + " by default";
else
m_srvVisButton.m_text = "Server " + std::string(o.m_bServerVisibleDefault ? "visible" : "invisible");
}
bool OptionsScreen::isCramped()
{
return m_width < 150 * 2 + 20 || m_height < 200;
}
void OptionsScreen::setWidthAllButtons(int width)
{
m_AOButton.m_width =
m_srvVisButton.m_width =
m_fancyGfxButton.m_width =
m_viewDistButton.m_width =
m_blockLinesButton.m_width =
m_invertYButton.m_width =
m_anaglyphsButton.m_width =
m_viewBobButton.m_width =
m_flightHaxButton.m_width =
m_autoJumpButton.m_width = width;
}
#endif
void OptionsScreen::init()
{
m_pMinecraft->platform()->showDialog(AppPlatform::DLG_OPTIONS);
m_pMinecraft->platform()->createUserInput();
#ifndef ORIGINAL_CODE
bool crampedMode = isCramped();
int incrementY = 25;
int yPos = 40;
int backGap = 12;
// If the screen's width can't fit two buttons and a small amount of padding,
// consider ourselves cramped.
if (crampedMode)
{
crampedMode = true;
incrementY = 22;
yPos = 20;
backGap = 5;
setWidthAllButtons(125);
}
else
{
// Initialize the default buttons' widths.
setWidthAllButtons(150);
}
m_BackButton.m_xPos = m_width / 2 - m_BackButton.m_width / 2;
m_BackButton.m_yPos = m_height - 33;
m_BackButton.m_height = 20;
m_BackButton.m_yPos = m_height - m_BackButton.m_height - backGap;
m_buttons.push_back(&m_BackButton);
m_AOButton.m_xPos =
@@ -106,12 +148,11 @@ void OptionsScreen::init()
m_flightHaxButton.m_xPos =
m_autoJumpButton.m_xPos = m_width / 2 + 5;
int yPos = 40;
m_AOButton.m_yPos = m_invertYButton.m_yPos = yPos; yPos += 25;
m_srvVisButton.m_yPos = m_anaglyphsButton.m_yPos = yPos; yPos += 25;
m_fancyGfxButton.m_yPos = m_viewBobButton.m_yPos = yPos; yPos += 25;
m_viewDistButton.m_yPos = m_flightHaxButton.m_yPos = yPos; yPos += 25;
m_autoJumpButton.m_yPos = m_blockLinesButton.m_yPos = yPos; yPos += 25;
m_AOButton.m_yPos = m_invertYButton.m_yPos = yPos; yPos += incrementY;
m_srvVisButton.m_yPos = m_anaglyphsButton.m_yPos = yPos; yPos += incrementY;
m_fancyGfxButton.m_yPos = m_viewBobButton.m_yPos = yPos; yPos += incrementY;
m_viewDistButton.m_yPos = m_flightHaxButton.m_yPos = yPos; yPos += incrementY;
m_autoJumpButton.m_yPos = m_blockLinesButton.m_yPos = yPos; yPos += incrementY;
m_buttons.push_back(&m_AOButton);
m_buttons.push_back(&m_srvVisButton);
@@ -137,12 +178,11 @@ void OptionsScreen::init()
m_buttonTabList.push_back(&m_BackButton);
UpdateTexts();
updateTexts();
#ifdef __EMSCRIPTEN__
m_srvVisButton.m_bEnabled = false;
#endif
#endif
}
void OptionsScreen::render(int a, int b, float c)
@@ -158,7 +198,7 @@ void OptionsScreen::render(int a, int b, float c)
}
#ifndef ORIGINAL_CODE
drawCenteredString(m_pFont, "Options", m_width / 2, 20, 0xFFFFFF);
drawCenteredString(m_pFont, "Options", m_width / 2, isCramped() ? 5 : 20, 0xFFFFFF);
Screen::render(a, b, c);
#endif
@@ -188,17 +228,17 @@ void OptionsScreen::buttonClicked(Button* pButton)
o.m_bAmbientOcclusion = !o.m_bAmbientOcclusion;
Minecraft::useAmbientOcclusion = o.m_bAmbientOcclusion;
m_pMinecraft->m_pLevelRenderer->allChanged();
UpdateTexts();
updateTexts();
return;
case OB_FANCY_GFX:
o.m_bFancyGraphics ^= 1;
m_pMinecraft->m_pLevelRenderer->allChanged();
UpdateTexts();
updateTexts();
return;
case OB_VIEW_DIST:
// @TODO: fix the 'extreme' render distance
o.m_iViewDistance = (o.m_iViewDistance + 1) % 4;
UpdateTexts();
updateTexts();
return;
case OB_ANAGLYPHS:
@@ -228,7 +268,7 @@ void OptionsScreen::buttonClicked(Button* pButton)
return;
*pOption = !(*pOption);
UpdateTexts();
updateTexts();
}
#endif