Red-exe-Engineer/minecraft-pi-reborn
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix Crash On NVIDIA + Improve Splash Oscillation

Browse Source
This commit is contained in:
TheBrokenRail 2024-12-17 21:17:45 -05:00
parent 5d8aa28113
commit 71042da861
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependencies/glfw/src vendored

@ -1 +1 @@
Subproject commit b35641f4a3c62aa86a0b3c983d163bc0fe36026d Subproject commit 21fea01161e0d6b70c0c5c1f52dc8e7a7df14a50

2
launcher/src/client/ui.cpp
View File

@ -118,7 +118,7 @@ void ConfigurationUI::draw_main() const {
int gui_scale_int = int(state.gui_scale); // Fractional GUI Scales Are Messy int gui_scale_int = int(state.gui_scale); // Fractional GUI Scales Are Messy
std::string scale_format = "%ix"; std::string scale_format = "%ix";
if (gui_scale_int <= AUTO_GUI_SCALE) { if (gui_scale_int <= AUTO_GUI_SCALE) {
scale_format = "Auto"; scale_format = "Automatic";
} }
if (ImGui::SliderInt(labels[2], &gui_scale_int, 0, 8, scale_format.c_str())) { if (ImGui::SliderInt(labels[2], &gui_scale_int, 0, 8, scale_format.c_str())) {
state.gui_scale = float(gui_scale_int); state.gui_scale = float(gui_scale_int);

2
libreborn/src/util/glfw.cpp
View File

@ -40,6 +40,8 @@ GLFWwindow *create_glfw_window(const char *title, const int width, const int hei
void cleanup_glfw(GLFWwindow *window) { void cleanup_glfw(GLFWwindow *window) {
// Ignore GLFW Errors During Termination // Ignore GLFW Errors During Termination
glfwSetErrorCallback(nullptr); glfwSetErrorCallback(nullptr);
// Workaround Segmentation Fault On NVIDIA
glfwPollEvents();
// Terminate GLFW // Terminate GLFW
glfwDestroyWindow(window); glfwDestroyWindow(window);
glfwTerminate(); glfwTerminate();

2
mods/src/misc/tinting.cpp
View File

@ -62,7 +62,7 @@ static int32_t TallGrass_getColor_injection(TallGrass_getColor_t original, TallG
// Grass Side Tinting // Grass Side Tinting
CUSTOM_VTABLE(grass_side, Tile) { CUSTOM_VTABLE(grass_side, Tile) {
vtable->shouldRenderFace = [](Tile *self, LevelSource *level_source, const int x, const int y, const int z, const int face) { vtable->shouldRenderFace = [](Tile *self, LevelSource *level_source, const int x, const int y, const int z, const int face) {
return face != 0 && face != 1 && Tile_vtable::base->shouldRenderFace(self, level_source, x, y, z, face); return face > 1 && Tile_vtable::base->shouldRenderFace(self, level_source, x, y, z, face);
}; };
vtable->getColor = [](Tile *self, LevelSource *level_source, const int32_t x, const int32_t y, const int32_t z) { vtable->getColor = [](Tile *self, LevelSource *level_source, const int32_t x, const int32_t y, const int32_t z) {
return GrassTile_getColor_injection(nullptr, (GrassTile *) self, level_source, x, y, z); return GrassTile_getColor_injection(nullptr, (GrassTile *) self, level_source, x, y, z);

7
mods/src/title-screen/splashes.cpp
View File

@ -114,8 +114,11 @@ static bool draw_splash(const StartMenuScreen *screen, const float y_factor, con
media_glRotatef(SplashLine::angle, 0.0f, 0.0f, 1.0f); media_glRotatef(SplashLine::angle, 0.0f, 0.0f, 1.0f);
// Oscillate // Oscillate
const float timeMS = float(Common::getTimeMs() % 1000) / 1000.0f; const float timeMS = float(Common::getTimeMs() % 1000) / 1000.0f;
const float oscillation = (scale / SplashLine::max_scale) * 0.1f; const float time = 4.0f * float(M_PI) * timeMS;
scale = scale - Mth::abs(oscillation * Mth::sin(2.0f * float(M_PI) * timeMS)); float oscillation = 0.1f;
oscillation /= 2.0f;
oscillation = 1.0f + (oscillation * Mth::cos(time)) - oscillation;
scale *= oscillation;
// Scale // Scale
media_glTranslatef(splash_width / 2.0f, 0, 0); media_glTranslatef(splash_width / 2.0f, 0, 0);
media_glScalef(scale, scale, 1); media_glScalef(scale, scale, 1);