keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

[1.14.x] Fix text positioning issues caused by scaling loading screen (#5932)

This commit is contained in:
its_meow 2019-07-16 15:41:21 -04:00 committed by LexManos
parent a46b7cb67a
commit 5cf2af569f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java
View File

@ -79,7 +79,7 @@ public class EarlyLoaderGUI {
final float fade = MathHelper.clamp((4000.0f - (float) pair.getLeft() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f); final float fade = MathHelper.clamp((4000.0f - (float) pair.getLeft() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
if (fade <0.01f) continue; if (fade <0.01f) continue;
StartupMessageManager.Message msg = pair.getRight(); StartupMessageManager.Message msg = pair.getRight();
renderMessage(msg.getText(), msg.getTypeColour(), i, fade); renderMessage(msg.getText(), msg.getTypeColour(), ((window.getScaledHeight() - 15) / 10) - i + 1, fade);
} }
renderMemoryInfo(); renderMemoryInfo();
} }
@ -96,7 +96,7 @@ public class EarlyLoaderGUI {
memorycolour[2] = ((i) & 0xFF) / 255.0f; memorycolour[2] = ((i) & 0xFF) / 255.0f;
memorycolour[1] = ((i >> 8 ) & 0xFF) / 255.0f; memorycolour[1] = ((i >> 8 ) & 0xFF) / 255.0f;
memorycolour[0] = ((i >> 16 ) & 0xFF) / 255.0f; memorycolour[0] = ((i >> 16 ) & 0xFF) / 255.0f;
renderMessage(memory, memorycolour, 21, 1.0f); renderMessage(memory, memorycolour, 1, 1.0f);
} }
void renderMessage(final String message, final float[] colour, int line, float alpha) { void renderMessage(final String message, final float[] colour, int line, float alpha) {
@ -110,7 +110,7 @@ public class EarlyLoaderGUI {
GlStateManager.blendFunc(GlStateManager.SourceFactor.CONSTANT_ALPHA, GlStateManager.DestFactor.ONE_MINUS_CONSTANT_ALPHA); GlStateManager.blendFunc(GlStateManager.SourceFactor.CONSTANT_ALPHA, GlStateManager.DestFactor.ONE_MINUS_CONSTANT_ALPHA);
GlStateManager.color3f(colour[0],colour[1],colour[2]); GlStateManager.color3f(colour[0],colour[1],colour[2]);
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.translatef(10, window.getScaledHeight() - 15 - line * 10, 0); GlStateManager.translatef(10, line * 10, 0);
GlStateManager.scalef(1, 1, 0); GlStateManager.scalef(1, 1, 0);
GlStateManager.drawArrays(GL11.GL_QUADS, 0, quads * 4); GlStateManager.drawArrays(GL11.GL_QUADS, 0, quads * 4);
GlStateManager.popMatrix(); GlStateManager.popMatrix();