mirror of
https://gitea.sffnetwork.ru/Kolyah35/minecraft-pe-0.6.1.git
synced 2026-11-22 10:29:48 +00:00
FIX: Steve skin hand, containers open in creative, crash when downfalls is nullptr, build on android (hope)
This commit is contained in:
parent
d7a51b09f1
commit
9a743b9aea
11 changed files with 42 additions and 22 deletions
|
|
@ -291,14 +291,13 @@ void ItemInHandRenderer::render( float a )
|
|||
Lighting::turnOn(mc);
|
||||
glPopMatrix2();
|
||||
|
||||
if (localPlayer) // shredder added, basically does the hand swaying animation from b1.8
|
||||
{
|
||||
float xrr = localPlayer->xBobO + (localPlayer->xBob - localPlayer->xBobO) * a;
|
||||
float yrr = localPlayer->yBobO + (localPlayer->yBob - localPlayer->yBobO) * a;
|
||||
// 4J - was using player->xRot and yRot directly here rather than interpolating between old & current with a
|
||||
float yr = player->yRotO + (player->yRot - player->yRotO) * a;
|
||||
glRotatef((xr - xrr) * 0.1f, 1, 0, 0);
|
||||
glRotatef((yr - yrr) * 0.1f, 0, 1, 0);
|
||||
if (localPlayer) { // shredder added, basically does the hand swaying animation from b1.8
|
||||
float xrr = localPlayer->xBobO + (localPlayer->xBob - localPlayer->xBobO) * a;
|
||||
float yrr = localPlayer->yBobO + (localPlayer->yBob - localPlayer->yBobO) * a;
|
||||
// 4J - was using player->xRot and yRot directly here rather than interpolating between old & current with a
|
||||
float yr = player->yRotO + (player->yRot - player->yRotO) * a;
|
||||
glRotatef((xr - xrr) * 0.1f, 1, 0, 0);
|
||||
glRotatef((yr - yrr) * 0.1f, 0, 1, 0);
|
||||
}
|
||||
|
||||
float br = mc->level->getBrightness(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
|
||||
|
|
@ -425,6 +424,8 @@ void ItemInHandRenderer::render( float a )
|
|||
|
||||
EntityRenderer* er = EntityRenderDispatcher::getInstance()->getRenderer(mc->player);
|
||||
HumanoidMobRenderer* playerRenderer = (HumanoidMobRenderer*) er;
|
||||
EntityRenderDispatcher::getInstance()->setModernSkin((Entity*)(player));
|
||||
|
||||
float ss = 1;
|
||||
glScalef2(ss, ss, ss);
|
||||
playerRenderer->renderHand();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue