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

iOS Support (#113)

Browse Source 
undefined
This commit is contained in:
Brent
2024-01-22 09:22:41 -06:00
committed by GitHub
parent 90a15340b1
commit afe875e4fa
109 changed files with 6523 additions and 1105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/client/gui/screens/StartMenuScreen.cpp
View File

@@ -13,7 +13,7 @@
#include "SelectWorldScreen.hpp"
#include "JoinGameScreen.hpp"
#if defined(_WIN32) || defined(TARGET_OS_MAC)
#if defined(_WIN32) || (defined(TARGET_OS_MAC) && TARGET_OS_IPHONE == 0)
#define CAN_QUIT
#endif
@@ -75,7 +75,7 @@ const char* gSplashes[] =
"Minecraft!",
"Yaaay!",
"Multiplayer!",
"Not yet touch compatible!",// "Touch compatible!",
"Touch compatible!",
"Undocumented!",
"Ingots!",
"Exploding creepers!",
@@ -600,27 +600,27 @@ void StartMenuScreen::draw3dTitle(float f)
{
glPushMatrix();
glTranslatef(0.4f, 0.6f, -12.0f);
if (i == 0)
switch (i)
{
glClear(GL_DEPTH_BUFFER_BIT);
glTranslatef(0.0f, -0.5f, -0.5f);
glEnable(GL_BLEND);
//force set alpha
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
case 0:
glClear(GL_DEPTH_BUFFER_BIT);
glTranslatef(0.0f, -0.5f, -0.5f);
glEnable(GL_BLEND);
//force set alpha
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
break;
if (i == 1)
{
glDisable(GL_BLEND);
glClear(GL_DEPTH_BUFFER_BIT);
//revert
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
if (i == 2)
{
glEnable(GL_BLEND);
//glBlendFunc(GL_SRC_COLOR, GL_ONE);
case 1:
glDisable(GL_BLEND);
glClear(GL_DEPTH_BUFFER_BIT);
//revert
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
break;
case 2:
glEnable(GL_BLEND);
//glBlendFunc(GL_SRC_COLOR, GL_ONE);
break;
}
glScalef(1.0f, -1.0f, 1.0f);
@@ -646,8 +646,7 @@ void StartMenuScreen::draw3dTitle(float f)
glPushMatrix();
TitleTile* pTTile = m_pTiles[y * Width + x];
// @TODO: After merging the iOS port, change to Mth::Lerp
float z = Lerp(pTTile->lastHeight, pTTile->height, f);
float z = Mth::Lerp(pTTile->lastHeight, pTTile->height, f);
float scale = 1.0f;
float bright = 1.0f;
float rotation = 180.0f;