diff --git a/.gitignore b/.gitignore index b2dfaa67..c868ec0d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,9 +9,10 @@ *.jar *.ear *Thumbs.db -font_easter.png -font_easter.rft -font_fu32.rft +font_gputest1.rft +font_gputest12.rft +font_gputest2.rft +font_gputest3.png VBO_Example.java /target/ diff --git a/src/main/java/org/warp/picalculator/gui/screens/MarioScreen.java b/src/main/java/org/warp/picalculator/gui/screens/MarioScreen.java index 025fb1e1..66b3e77c 100755 --- a/src/main/java/org/warp/picalculator/gui/screens/MarioScreen.java +++ b/src/main/java/org/warp/picalculator/gui/screens/MarioScreen.java @@ -57,6 +57,7 @@ public class MarioScreen extends Screen { try { gpuTest1 = DisplayManager.INSTANCE.engine.loadFont("gputest12"); gpuTest12 = true; + StaticVars.windowZoom = 1; } catch (Exception ex) { gpuTest12 = false; try { @@ -162,7 +163,7 @@ public class MarioScreen extends Screen { DisplayManager.INSTANCE.renderer.glFillColor(DisplayManager.INSTANCE.engine.getWidth()-(gpuTest12 ? 512 : 256), DisplayManager.INSTANCE.engine.getHeight() / 2 - (gpuTest12 ? 256 : 128), gpuTest12 ? 512 : 256, gpuTest12 ? 512 : 256); gpuTest1.use(DisplayManager.INSTANCE.engine); DisplayManager.INSTANCE.renderer.glColor3f(0, 0, 0); - DisplayManager.INSTANCE.renderer.glDrawStringRight(DisplayManager.INSTANCE.engine.getWidth(), DisplayManager.INSTANCE.engine.getHeight() / 2 - 128, gpuCharTest1[gpuCharTest1Num]); + DisplayManager.INSTANCE.renderer.glDrawStringRight(DisplayManager.INSTANCE.engine.getWidth(), DisplayManager.INSTANCE.engine.getHeight() / 2 - (gpuTest12 ? 256 : 128), gpuCharTest1[gpuCharTest1Num]); } if (gpuTest3 != null) { gpuTest3.use(DisplayManager.INSTANCE.engine);