forked from mirrors/kolyah35-minecraft-pe-0.6.1
Fixes and New Additions
Added GUI Styles with 3 options: Java, Pi/Xperia and Pocket Hopefully fixed touch input eating and breaking blocks bug Fire should render on all mobs now Fixed only one side of the first person burning animation being animated Added Window Scaling Option for PC Users (Hasn't been tested on other platforms Render Distance is now configurable from the settings menu Tried to fix shadows again on IOS and Android, hopefully works? Block Outline Selection now has a thicker outline for better visibility
This commit is contained in:
parent
792d4b32e7
commit
890604256b
17 changed files with 264 additions and 110 deletions
|
|
@ -23,12 +23,15 @@ DeathScreen::~DeathScreen()
|
|||
|
||||
void DeathScreen::init()
|
||||
{
|
||||
if (/* minecraft->useTouchscreen() */ true) {
|
||||
if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 0) {
|
||||
bRespawn = new Touch::TButton(1, "Respawn!");
|
||||
bTitle = new Touch::TButton(2, "Main menu");
|
||||
} else {
|
||||
} else if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 1) {
|
||||
bRespawn = new Button(1, "Respawn!");
|
||||
bTitle = new Button(2, "Main menu");
|
||||
} else {
|
||||
bRespawn = new Button(1, 0, 0, 200, 20, "Respawn");
|
||||
bTitle = new Button(2, 0, 0, 200, 20, "Title menu");
|
||||
}
|
||||
buttons.push_back(bRespawn);
|
||||
buttons.push_back(bTitle);
|
||||
|
|
@ -39,13 +42,23 @@ void DeathScreen::init()
|
|||
|
||||
void DeathScreen::setupPositions()
|
||||
{
|
||||
bRespawn->width = bTitle->width = width / 4;
|
||||
if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
|
||||
bRespawn->width = 200;
|
||||
bTitle->width = 200;
|
||||
|
||||
int centerX = (width / 2) - (bRespawn->width / 2);
|
||||
bRespawn->x = centerX;
|
||||
bTitle->x = centerX;
|
||||
|
||||
bRespawn->y = (height / 2);
|
||||
bTitle->y = bRespawn->y + 24;
|
||||
} else {
|
||||
bRespawn->width = bTitle->width = width / 4;
|
||||
bRespawn->y = bTitle->y = height / 2;
|
||||
bRespawn->x = width/2 - bRespawn->width - 10;
|
||||
bTitle->x = width/2 + 10;
|
||||
|
||||
LOGI("xyz: %d, %d (%d, %d)\n", bTitle->x, bTitle->y, width, height);
|
||||
}
|
||||
// LOGI("xyz: %d, %d (%d, %d)\n", bTitle->x, bTitle->y, width, height);
|
||||
}
|
||||
|
||||
void DeathScreen::tick() {
|
||||
|
|
@ -56,10 +69,20 @@ void DeathScreen::render( int xm, int ym, float a )
|
|||
{
|
||||
fillGradient(0, 0, width, height, 0x60500000, 0xa0803030);
|
||||
|
||||
if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
|
||||
glPushMatrix2();
|
||||
glScalef2(2, 2, 2);
|
||||
drawCenteredString(font, "Game over!", width / 2 / 2, height / 8, 0xffffff);
|
||||
glPopMatrix2();
|
||||
std::stringstream ss;
|
||||
ss << "Score: &e" << minecraft->player->getScore();
|
||||
drawCenteredString(font, ss.str(), width / 2, (height / 4) + 32, 0xffffff);
|
||||
} else {
|
||||
glPushMatrix2();
|
||||
glScalef2(2, 2, 2);
|
||||
drawCenteredString(font, "You died!", width / 2 / 2, height / 8, 0xffffff);
|
||||
glPopMatrix2();
|
||||
}
|
||||
|
||||
if (_tick >= WAIT_TICKS)
|
||||
Screen::render(xm, ym, a);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue