Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix inverted pitch in the second third person view

Browse Source
This commit is contained in:
daoge_cmd
2026-03-04 14:40:52 +08:00
parent 779cf56f4b
commit b1b4435c01
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Minecraft.Client/GameRenderer.cpp
View File

@@ -501,23 +501,26 @@ void GameRenderer::moveCameraToPlayer(float a)
else else
{ {
// 4J - corrected bug where this used to just take player->xRot & yRot directly and so wasn't taking into account interpolation, allowing camera to go through walls // 4J - corrected bug where this used to just take player->xRot & yRot directly and so wasn't taking into account interpolation, allowing camera to go through walls
float playerYRot = player->yRotO + (player->yRot - player->yRotO) * a; float yRot = player->yRotO + (player->yRot - player->yRotO) * a;
float playerXRot = player->xRotO + (player->xRot - player->xRotO) * a; float xRot = player->xRotO + (player->xRot - player->xRotO) * a;
float yRot = playerYRot;
float xRot = playerXRot;
// Thirdperson view values are now 0 for disabled, 1 for original mode, 2 for reversed. // Thirdperson view values are now 0 for disabled, 1 for original mode, 2 for reversed.
if( localplayer->ThirdPersonView() == 2 ) if( localplayer->ThirdPersonView() == 2 )
{ {
// Reverse x rotation - note that this is only used in doing collision to calculate our view // Reverse y rotation - note that this is only used in doing collision to calculate our view
// distance, the actual rotation itself is just below this else {} block // distance, the actual rotation itself is just below this else {} block
xRot += 180.0f; yRot += 180.0f;
} }
double xd = -Mth::sin(yRot / 180 * PI) * Mth::cos(xRot / 180 * PI) * cameraDist; double xd = -Mth::sin(yRot / 180 * PI) * Mth::cos(xRot / 180 * PI) * cameraDist;
double zd = Mth::cos(yRot / 180 * PI) * Mth::cos(xRot / 180 * PI) * cameraDist; double zd = Mth::cos(yRot / 180 * PI) * Mth::cos(xRot / 180 * PI) * cameraDist;
double yd = -Mth::sin(xRot / 180 * PI) * cameraDist; double yd = -Mth::sin(xRot / 180 * PI) * cameraDist;
if (localplayer->ThirdPersonView() == 2)
{
yd = Mth::sin(xRot / 180 * PI) * cameraDist;
}
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
{ {
float xo = (float)((i & 1) * 2 - 1); float xo = (float)((i & 1) * 2 - 1);
@@ -538,16 +541,7 @@ void GameRenderer::moveCameraToPlayer(float a)
} }
} }
if ( localplayer->ThirdPersonView() == 2)
{
glRotatef(180, 0, 1, 0);
}
glRotatef(playerXRot - xRot, 1, 0, 0);
glRotatef(playerYRot - yRot, 0, 1, 0);
glTranslatef(0, 0, (float) -cameraDist); glTranslatef(0, 0, (float) -cameraDist);
glRotatef(yRot - playerYRot, 0, 1, 0);
glRotatef(xRot - playerXRot, 1, 0, 0);
} }
} }
else else
@@ -557,8 +551,21 @@ void GameRenderer::moveCameraToPlayer(float a)
if (!mc->options->fixedCamera) if (!mc->options->fixedCamera)
{ {
glRotatef(player->xRotO + (player->xRot - player->xRotO) * a, 1, 0, 0); float pitch = player->xRotO + (player->xRot - player->xRotO) * a;
glRotatef(player->yRotO + (player->yRot - player->yRotO) * a + 180, 0, 1, 0); if (localplayer->ThirdPersonView() == 2)
{
pitch = -pitch;
}
glRotatef(pitch, 1, 0, 0);
if (localplayer->ThirdPersonView() == 2)
{
glRotatef(player->yRotO + (player->yRot - player->yRotO) * a, 0, 1, 0);
}
else
{
glRotatef(player->yRotO + (player->yRot - player->yRotO) * a + 180, 0, 1, 0);
}
} }
glTranslatef(0, heightOffset, 0); glTranslatef(0, heightOffset, 0);