backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-26 21:12:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '4jcraft:dev' into dev

Browse source
This commit is contained in:
Nikita Edel 2026-03-09 19:44:18 +01:00 committed by GitHub
parent 81e9256b7a 9c996b6014
commit d36433cafc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
4J.Render/4J_Render.cpp
View file

@ -94,7 +94,7 @@ void C4JRender::Initialise()
}
glfwMakeContextCurrent(s_window);
glfwSwapInterval(1); // vsync
glfwSwapInterval(0); // vsync
// Keep viewport in sync with OS-driven window resizes.
glfwSetFramebufferSizeCallback(s_window, onFramebufferResize);

18
Minecraft.Client/Rendering/GameRenderer.cpp
View file

@ -777,11 +777,14 @@ void GameRenderer::renderItemInHand(float a, int eye)
{
if (!mc->options->hideGui && !mc->gameMode->isCutScene())
{
turnOnLightLayer(a);
//turnOnLightLayer(a); // disable light layer on handrenderer similarly to how it was done on the chunk render (this makes the hand look proper)
PIXBeginNamedEvent(0,"Item in hand render");
itemInHandRenderer->render(a);
// add null pointer check to itemInHandRenderer to prevent a occasional seg fault
if (itemInHandRenderer != nullptr) {
itemInHandRenderer->render(a);
}
PIXEndNamedEvent();
turnOffLightLayer(a);
//turnOffLightLayer(a); // disable light layer on handrenderer similarly to how it was done on the chunk render (this makes the hand look proper)
}
}
glPopMatrix();
@ -789,7 +792,10 @@ void GameRenderer::renderItemInHand(float a, int eye)
//if (!mc->options->thirdPersonView && !mc->cameraTargetPlayer->isSleeping())
if (!localplayer->ThirdPersonView() && !mc->cameraTargetPlayer->isSleeping())
{
itemInHandRenderer->renderScreenEffect(a);
// add null pointer check to itemInHandRenderer to prevent a occasional seg fault
if (itemInHandRenderer != nullptr) {
itemInHandRenderer->renderScreenEffect(a);
}
bobHurt(a);
}
// 4J-PB - changing this to be per player
@ -1068,11 +1074,11 @@ void GameRenderer::render(float a, bool bFirst)
int xMouse = Mouse::getX() * screenWidth / fbw;
int yMouse = screenHeight - Mouse::getY() * screenHeight / fbh - 1;
int maxFps = getFpsCap(mc->options->framerateLimit);
int maxFps = 0;//getFpsCap(mc->options->framerateLimit);
if (mc->level != NULL)
{
if (mc->options->framerateLimit == 0)
if (maxFps == 0)
{
renderLevel(a, 0);
}