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

WIP Android Port (#79)

Browse Source 
* WIP Android Port

Android port. Still needs touch controls and mouse turning (if that's even possible on android) and file saving and SoundSystemSL
You control the camera and movement with your controller for now. You can navigate the gui using touch.
Options.cpp,LocalPlayer.cpp,Minecraft.cpp is configured to use controller.
Blocked out some code in ControllerTurnInput.cpp,Controller.cpp that didn't make sense.

* Fix glClear

glClear is supossed to use GL_DEPTH_BUFFER_BIT (thx TheBrokenRail)

* * Fix build.

* * Ignore assets.

* * More stuff

* * Fix more build errors.

* * It finally built

What I needed to do is rebuild the debug keystore because apparently android studio created it with sha1 digest alg which isn't supported by ant

* * Clean up filters.

* * Add cramped mode to the pause screen.

* * Fix a bug with the hotbar

* * In NinecraftApp::handleBack, pause the game if there is no screen.

* * AppPlatform_android: Add placeholder SoundSystem instance till we get SoundSystemSL working

* * Add properly working touch code.

* * Oh, remove some testing things

* * Fix state resetting when going in background and back in foreground
* Fix bug where the sky isn't being regenerated on graphics reset
* Fix bug where the m_currBoundTex isn't reset in Textures::clear potentially leaving a texture with that ID unassigned and corrupted
* Fix bug in CThread where the thread is detached and then also joined.
* Don't log anything if the program isn't in debug mode.

* * Add virtual keyboard support.

The screen instance slides so that the focused text box is kept visible.

* Rename from com.minecraftcpp to com.reminecraftpe

---------

Co-authored-by: iProgramInCpp <iprogramincpp@gmail.com>
This commit is contained in:
f
2023-11-03 11:54:39 +01:00
committed by GitHub
parent f119d89048
commit f83ead9f8d
59 changed files with 5742 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
source/client/gui/Screen.cpp
View File

@@ -15,6 +15,7 @@ Screen::Screen()
field_10 = false;
m_tabButtonIndex = 0;
m_pClickedButton = 0;
m_yOffset = -1;
}
Screen::~Screen()
@@ -253,6 +254,25 @@ void Screen::mouseClicked(int xPos, int yPos, int d) // d = clicked?
TextInputBox* textInput = m_textInputs[i];
textInput->onClick(xPos, yPos);
}
// if the keyboard is shown:
if (m_pMinecraft->platform()->getKeyboardUpOffset())
{
// if there are none focused at the moment:
bool areAnyFocused = false;
for (int i = 0; i < int(m_textInputs.size()); i++)
{
TextInputBox* textInput = m_textInputs[i];
if (textInput->m_bFocused)
{
areAnyFocused = true;
break;
}
}
if (!areAnyFocused)
m_pMinecraft->platform()->showKeyboard(false);
}
#endif
}
@@ -306,6 +326,59 @@ void Screen::setSize(int width, int height)
init();
}
void Screen::onRender(int mouseX, int mouseY, float f)
{
m_yOffset = getYOffset();
if (m_yOffset != 0) {
// push the entire screen up
glPushMatrix();
glTranslatef(0.0f, -float(m_yOffset), 0.0f);
}
render(mouseX, mouseY, f);
if (m_yOffset != 0)
glPopMatrix();
}
int Screen::getYOffset()
{
int keybOffset = m_pMinecraft->platform()->getKeyboardUpOffset();
if (!keybOffset)
return 0;
int offset = 0;
// look through every text box, see if one's open
// and determine its offset from there
for (int i = 0; i < int(m_textInputs.size()); i++)
{
TextInputBox* pBox = m_textInputs[i];
if (!pBox->m_bFocused)
continue;
int heightLeft = m_height - int(float(keybOffset) * Gui::InvGuiScale);
// we want to keep the center of the text box in the center of the screen
int textCenterY = pBox->m_yPos + pBox->m_height / 2;
int scrnCenterY = heightLeft / 2;
int diff = textCenterY - scrnCenterY;
// Prevent the difference from revealing the outside of the screen.
if (diff > m_height - heightLeft)
diff = m_height - heightLeft;
if (diff < 0)
diff = 0;
offset = diff;
break;
}
return offset;
}
void Screen::updateEvents()
{
if (field_10) return;
@@ -329,9 +402,9 @@ void Screen::mouseEvent()
if (pAction->isButton())
{
if (Mouse::getEventButtonState())
mouseClicked (m_width * pAction->_posX / Minecraft::width, m_height * pAction->_posY / Minecraft::height - 1, Mouse::getEventButton());
mouseClicked (m_width * pAction->_posX / Minecraft::width, m_height * pAction->_posY / Minecraft::height - 1 + getYOffset(), Mouse::getEventButton());
else
mouseReleased(m_width * pAction->_posX / Minecraft::width, m_height * pAction->_posY / Minecraft::height - 1, Mouse::getEventButton());
mouseReleased(m_width * pAction->_posX / Minecraft::width, m_height * pAction->_posY / Minecraft::height - 1 + getYOffset(), Mouse::getEventButton());
}
}
@@ -339,7 +412,9 @@ void Screen::renderBackground(int unk)
{
if (m_pMinecraft->isLevelGenerated())
{
fillGradient(0, 0, m_width, m_height, 0xC0101010, 0xD0101010);
// draw the background offset by the Y offset so that the smaller virtual
// keyboards don't reveal undrawn areas
fillGradient(0, m_yOffset, m_width, m_height, 0xC0101010, 0xD0101010);
}
else
{
@@ -361,11 +436,13 @@ void Screen::renderDirtBackground(int unk)
Tesselator& t = Tesselator::instance;
t.begin();
t.offset(0, m_yOffset, 0);
t.color(0x404040);
t.vertexUV(0.0f, float(m_height), 0, 0, float(unk) + float(m_height) / 32.0f);
t.vertexUV(float(m_width), float(m_height), 0, float(m_width) / 32.0f, float(unk) + float(m_height) / 32.0f);
t.vertexUV(float(m_width), 0, 0, float(m_width) / 32.0f, float(unk) + 0.0f);
t.vertexUV(0.0f, 0, 0, 0, float(unk) + 0.0f);
t.offset(0, 0, 0);
t.draw();
}