mirrors/mcpe
1
0
Fork 0
mirror of https://github.com/ReMinecraftPE/mcpe.git synced 2025-01-23 01:31:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "* Start Menu: Add 3D alpha-style title screen logo."

Browse source 
This reverts commit 792a120703.

This is because Android has an interesting graphical glitch regarding this feature. I'll add it back when it's fixed.
This commit is contained in:
iProgramInCpp 2023-12-25 17:42:07 +02:00
parent 105eb3a79c
commit b3cc044375
3 changed files with 61 additions and 355 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

284
source/client/gui/screens/StartMenuScreen.cpp
View file

@ -17,20 +17,6 @@
#define CAN_QUIT #define CAN_QUIT
#endif #endif
const char gLogoLine1[] = "??? ??? # # # # # ### ### ### ### ### ### $$$ $$$";
const char gLogoLine2[] = "? ? ? ## ## # ## # # # # # # # # # $ $ $ ";
const char gLogoLine3[] = "?? ?? # # # # # # # ## # ## ### ## # $$ $$ ";
const char gLogoLine4[] = "? ? ? # # # # ## # # # # # # # # $ $ ";
const char gLogoLine5[] = "? ? ??? # # # # # ### ### # # # # # # $ $$$";
const char* gLogoLines[] = {
gLogoLine1,
gLogoLine2,
gLogoLine3,
gLogoLine4,
gLogoLine5,
};
// actual name // actual name
const char* gSplashes[] = const char* gSplashes[] =
{ {
@ -352,17 +338,7 @@ StartMenuScreen::StartMenuScreen() :
m_testButton (999, 0, 0, 78, 22, "Test"), m_testButton (999, 0, 0, 78, 22, "Test"),
m_buyButton (5, 0, 0, 78, 22, "Buy") m_buyButton (5, 0, 0, 78, 22, "Buy")
{ {
m_pTiles = nullptr;
m_chosenSplash = -1; m_chosenSplash = -1;
// note: do it here because we don't want the title to
// show up differently when you resize
TitleTile::regenerate();
}
StartMenuScreen::~StartMenuScreen()
{
SAFE_DELETE(m_pTiles);
} }
void StartMenuScreen::_updateLicense() void StartMenuScreen::_updateLicense()
@ -479,17 +455,21 @@ bool StartMenuScreen::isInGameScreen()
return false; return false;
} }
void StartMenuScreen::drawLegacyTitle() void StartMenuScreen::render(int a, int b, float c)
{ {
//renderBackground();
renderMenuBackground(c);
Textures* tx = m_pMinecraft->m_pTextures; Textures* tx = m_pMinecraft->m_pTextures;
bool crampedMode = false; int id = tx->loadTexture("gui/title.png", true);
Texture *pTex = tx->getTemporaryTextureData(id);
//int titleYPos = 4; //int titleYPos = 4;
//int titleYPos = 30; // -- MC Java position //int titleYPos = 30; // -- MC Java position
int titleYPos = 15; int titleYPos = 15;
int id = tx->loadTexture("gui/title.png", true); bool crampedMode = false;
Texture* pTex = tx->getTemporaryTextureData(id);
if (pTex) if (pTex)
{ {
@ -500,7 +480,7 @@ void StartMenuScreen::drawLegacyTitle()
} }
int left = (m_width - pTex->m_width) / 2; int left = (m_width - pTex->m_width) / 2;
int width = pTex->m_width; int width = pTex->m_width;
int height = pTex->m_height; int height = pTex->m_height;
if (m_width * 3 / 4 < width) if (m_width * 3 / 4 < width)
@ -512,34 +492,13 @@ void StartMenuScreen::drawLegacyTitle()
Tesselator& t = Tesselator::instance; Tesselator& t = Tesselator::instance;
glColor4f(1, 1, 1, 1); glColor4f(1, 1, 1, 1);
t.begin(); t.begin();
t.vertexUV(float(left), float(height + titleYPos), field_4, 0.0f, 1.0f); t.vertexUV(float(left), float(height + titleYPos), field_4, 0.0f, 1.0f);
t.vertexUV(float(left + width), float(height + titleYPos), field_4, 1.0f, 1.0f); t.vertexUV(float(left + width), float(height + titleYPos), field_4, 1.0f, 1.0f);
t.vertexUV(float(left + width), titleYPos, field_4, 1.0f, 0.0f); t.vertexUV(float(left + width), titleYPos, field_4, 1.0f, 0.0f);
t.vertexUV(float(left), titleYPos, field_4, 0.0f, 0.0f); t.vertexUV(float(left), titleYPos, field_4, 0.0f, 0.0f);
t.draw(); t.draw();
} }
}
void StartMenuScreen::render(int a, int b, float c)
{
//renderBackground();
renderMenuBackground(c);
//int titleYPos = 4;
//int titleYPos = 30; // -- MC Java position
int titleYPos = 15;
bool crampedMode = false;
if (m_width * 3 / 4 < 256)
{
crampedMode = true;
titleYPos = 4;
}
//drawLegacyTitle()
draw3dTitle(c);
drawString(m_pFont, field_170, field_188, 58 + titleYPos, 0xFFCCCCCC); drawString(m_pFont, field_170, field_188, 58 + titleYPos, 0xFFCCCCCC);
drawString(m_pFont, field_154, field_16C, m_height - 10, 0x00FFFFFF); drawString(m_pFont, field_154, field_16C, m_height - 10, 0x00FFFFFF);
@ -553,132 +512,8 @@ void StartMenuScreen::render(int a, int b, float c)
void StartMenuScreen::tick() void StartMenuScreen::tick()
{ {
Screen::tick(); Screen::tick();
_updateLicense(); _updateLicense();
if (m_pTiles)
{
int Width = int(sizeof gLogoLine1 - 1);
int Height = int(sizeof gLogoLines / sizeof * gLogoLines);
for (int i = 0; i < Width * Height; i++)
m_pTiles[i]->tick();
}
}
void StartMenuScreen::draw3dTitle(float f)
{
int Width = int(sizeof gLogoLine1 - 1);
int Height = int(sizeof gLogoLines / sizeof * gLogoLines);
if (!m_pTiles)
{
m_pTiles = new TitleTile*[Width * Height];
for (int y = 0; y < Height; y++)
for (int x = 0; x < Width; x++)
m_pTiles[y * Width + x] = new TitleTile(this, x, y);
}
int titleHeight = int(120 / Gui::InvGuiScale);
if (m_width * 3 / 4 < 256) // cramped mode
titleHeight = int(80 / Gui::InvGuiScale);
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
gluPerspective(70.0f, float(Minecraft::width) / titleHeight, 0.05f, 100.0f);
glViewport(0, Minecraft::height - titleHeight, Minecraft::width, titleHeight);
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();
glDisable(GL_CULL_FACE);
glCullFace(GL_BACK);
glDepthMask(true);
for (int i = 0; i < 3; i++)
{
glPushMatrix();
glTranslatef(0.4f, 0.6f, -12.0f);
if (i == 0)
{
glClear(GL_DEPTH_BUFFER_BIT);
glTranslatef(0.0f, -0.5f, 0.0f);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendFunc(GL_SRC_COLOR, GL_ZERO);
glBlendFunc(GL_DST_COLOR, GL_ZERO);
}
if (i == 1)
{
glDisable(GL_BLEND);
glClear(GL_DEPTH_BUFFER_BIT);
}
if (i == 2)
{
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_COLOR, GL_ONE);
}
glScalef(1.0f, -1.0f, 1.0f);
glRotatef(8.0f, 1.0f, 0.0f, 0.0f);
//glRotatef(15.0f, 1.0f, 0.0f, 0.0f);
glScalef(0.89f, 1.0f, 0.4f);
glTranslatef(-Width * 0.5f, -Height * 0.5f, 0.0f);
m_pMinecraft->m_pTextures->loadAndBindTexture("terrain.png");
if (i == 0) {
// No title/black.png so we'll just simulate it in a cheap way
}
for (int y = 0; y < Height; y++)
{
for (int x = 0; x < Width; x++)
{
if (gLogoLines[y][x] == ' ')
continue;
Tile* pTile = TitleTile::getTileFromChar(gLogoLines[y][x]);
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 scale = 1.0f;
float bright = 1.0f;
float rotation = 1.0f;
if (i == 0)
{
scale = z * 0.04f + 1.0f;
bright = 1.0f / scale;
z = 0.0f;
}
glTranslatef(float(x), float(y), z);
glScalef(scale, scale, scale);
glRotatef(rotation, 0.0f, 1.0f, 0.0f);
// rotate 180 deg on the Z axis to correct lighting
glRotatef(-180.0f, 0.0f, 0.0f, 1.0f);
m_tileRenderer.renderTile(pTile, 0, bright);
glPopMatrix();
}
}
glPopMatrix();
}
glDisable(GL_BLEND);
glMatrixMode(GL_PROJECTION);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
glViewport(0, 0, Minecraft::width, Minecraft::height);
glEnable(GL_CULL_FACE);
} }
void StartMenuScreen::drawSplash() void StartMenuScreen::drawSplash()
@ -720,95 +555,4 @@ bool StartMenuScreen::handleBackEvent(bool b)
m_pMinecraft->quit(); m_pMinecraft->quit();
} }
return true; return true;
} }
Tile* TitleTile::_tiles[3];
Random TitleTile::_random;
TitleTile::TitleTile(StartMenuScreen* pScreen, int x, int y)
{
height = float(10 + y) + 32.0f * pScreen->m_random.nextFloat() + float(y);
lastHeight = height;
dropVel = 0;
}
void TitleTile::tick()
{
lastHeight = height;
if (height > 0.0f)
dropVel -= 0.6f;
height += dropVel;
dropVel *= 0.9f;
if (height < 0.0f)
{
height = 0.0f;
dropVel = 0.0f;
}
}
Tile* TitleTile::getTileFromChar(char c)
{
switch (c)
{
case '?': return _tiles[1];
case '$': return _tiles[2];
default: return _tiles[0];
}
}
// NOTE: Using the tile enum instead of Tile::tileName->id, may want to.. not?
static const int _tileBlockList[] = {
TILE_BOOKSHELF,
TILE_CLOTH, // TODO: fix these? There's way too many black wool tiles
TILE_CLOTH_00,
TILE_CLOTH_01,
TILE_CLOTH_10,
TILE_CLOTH_41,
TILE_STAIRS_WOOD,
TILE_STAIRS_STONE,
TILE_TOPSNOW,
TILE_GRASS,
TILE_INFO_UPDATEGAME1,
TILE_INFO_UPDATEGAME2,
TILE_STONESLAB_HALF,
};
static const int _tileBlockListSize = sizeof _tileBlockList / sizeof(int);
Tile* TitleTile::getRandomTile(Tile* except1, Tile* except2)
{
TileID id;
for (;;)
{
id = _random.nextInt(256);
for (int i = 0; i < _tileBlockListSize; i++) {
if (_tileBlockList[i] == id) {
// N.B. Air does not have a tile
id = TILE_AIR;
break;
}
}
if (!Tile::tiles[id])
continue;
// If found a tile, check if it can be rendered
Tile* pTile = Tile::tiles[id];
if (!TileRenderer::canRender(pTile->getRenderShape()))
continue;
if (pTile == except1 || pTile == except2)
continue;
return pTile;
}
}
void TitleTile::regenerate()
{
_tiles[0] = getRandomTile(nullptr, nullptr);
_tiles[1] = getRandomTile(_tiles[0], nullptr);
_tiles[2] = getRandomTile(_tiles[0], _tiles[1]);
}

37
source/client/gui/screens/StartMenuScreen.hpp
View file

@ -9,38 +9,11 @@
#pragma once #pragma once
#include "../Screen.hpp" #include "../Screen.hpp"
#include "client/renderer/TileRenderer.hpp"
class StartMenuScreen;
class TitleTile
{
public:
TitleTile(StartMenuScreen*, int x, int y);
void tick();
static Tile* getTileFromChar(char c);
static void regenerate();
protected:
friend class StartMenuScreen;
float height;
float lastHeight;
float dropVel;
private:
static Tile* _tiles[3];
static Random _random;
static Tile* getRandomTile(Tile* except1, Tile* except2);
};
class StartMenuScreen : public Screen class StartMenuScreen : public Screen
{ {
public: public:
StartMenuScreen(); StartMenuScreen();
~StartMenuScreen();
void _updateLicense(); void _updateLicense();
void init() override; void init() override;
@ -50,16 +23,12 @@ public:
void tick() override; void tick() override;
void drawSplash(); void drawSplash();
void draw3dTitle(float f);
void drawLegacyTitle();
std::string getSplashString(); std::string getSplashString();
bool handleBackEvent(bool b) override; bool handleBackEvent(bool b) override;
protected: private:
friend class TitleTile;
Button m_startButton; Button m_startButton;
Button m_joinButton; Button m_joinButton;
Button m_optionsButton; Button m_optionsButton;
@ -71,9 +40,5 @@ protected:
int field_188; int field_188;
int m_chosenSplash; int m_chosenSplash;
TileRenderer m_tileRenderer;
Random m_random;
TitleTile** m_pTiles;
}; };

95
source/client/renderer/TileRenderer.cpp
View file

@ -2402,70 +2402,67 @@ void TileRenderer::renderTile(Tile* tile, int data RENDER_TILE_ARG_PATCH)
#endif #endif
int shape = tile->getRenderShape(); int shape = tile->getRenderShape();
switch (shape) if (shape == SHAPE_SOLID)
{ {
case SHAPE_SOLID: glTranslatef(-0.5f, -0.5f, -0.5f);
default: t.begin();
SHADE_DEFINE;
SHADE_PREPARE;
SHADE_IF_NEEDED(1.0f);
renderFaceDown(tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_YPOS, data));
SHADE_FIXUP_GRASS;
SHADE_IF_NEEDED(0.5f);
renderFaceUp (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_YNEG, data));
SHADE_IF_NEEDED(0.8f);
renderNorth (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_ZNEG, data));
renderSouth (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_ZPOS, data));
SHADE_IF_NEEDED(0.6f);
renderWest (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_XNEG, data));
renderEast (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_XPOS, data));
SHADE_IF_NEEDED(1.0f);
t.draw();
glTranslatef(0.5f, 0.5f, 0.5f);
return;
}
if (shape == SHAPE_CROSS)
{
// unused
t.begin();
tesselateCrossTexture(tile, data, -0.5f, -0.5f, -0.5f);
t.draw();
return;
}
if (shape == SHAPE_STAIRS)
{
// Fixed version from 0.1.1j+
t.addOffset(-0.5f, -0.5f, -0.5f);
for (int i = 0; i < 2; i++)
{ {
glTranslatef(-0.5f, -0.5f, -0.5f); if (!i)
tile->setShape(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.5f);
else
tile->setShape(0.0f, 0.0f, 0.5f, 1.0f, 0.5f, 1.0f);
t.begin(); t.begin();
SHADE_DEFINE; SHADE_DEFINE;
SHADE_PREPARE; SHADE_PREPARE;
SHADE_IF_NEEDED(1.0f);
renderFaceDown(tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_YPOS, data));
SHADE_FIXUP_GRASS;
SHADE_IF_NEEDED(0.5f); SHADE_IF_NEEDED(0.5f);
renderFaceUp (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_YNEG, data)); renderFaceUp (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_YNEG, data));
SHADE_IF_NEEDED(0.8f); SHADE_IF_NEEDED(1.0f);
renderFaceDown(tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_YPOS, data));
SHADE_IF_NEEDED(0.6f);
renderNorth (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_ZNEG, data)); renderNorth (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_ZNEG, data));
renderSouth (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_ZPOS, data)); renderSouth (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_ZPOS, data));
SHADE_IF_NEEDED(0.6f); SHADE_IF_NEEDED(0.8f);
renderWest (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_XNEG, data)); renderWest (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_XNEG, data));
renderEast (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_XPOS, data)); renderEast (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_XPOS, data));
SHADE_IF_NEEDED(1.0f); SHADE_IF_NEEDED(1.0f);
t.draw(); t.draw();
glTranslatef(0.5f, 0.5f, 0.5f);
break;
} }
case SHAPE_CROSS: t.addOffset(0.5f, 0.5f, 0.5f);
{
// unused as cross items render like regular items in the hand
t.begin();
tesselateCrossTexture(tile, data, -0.5f, -0.5f, -0.5f);
t.draw();
break;
}
case SHAPE_STAIRS:
{
// Fixed version from 0.1.1j+
t.addOffset(-0.5f, -0.5f, -0.5f);
for (int i = 0; i < 2; i++)
{
if (!i)
tile->setShape(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.5f);
else
tile->setShape(0.0f, 0.0f, 0.5f, 1.0f, 0.5f, 1.0f);
return;
t.begin();
SHADE_DEFINE;
SHADE_PREPARE;
SHADE_IF_NEEDED(0.5f);
renderFaceUp (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_YNEG, data));
SHADE_IF_NEEDED(1.0f);
renderFaceDown(tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_YPOS, data));
SHADE_IF_NEEDED(0.6f);
renderNorth (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_ZNEG, data));
renderSouth (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_ZPOS, data));
SHADE_IF_NEEDED(0.8f);
renderWest (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_XNEG, data));
renderEast (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_XPOS, data));
SHADE_IF_NEEDED(1.0f);
t.draw();
}
t.addOffset(0.5f, 0.5f, 0.5f);
break;
}
} }
} }