andreacavalli
/
WarpPI
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix

This commit is contained in:
Andrea Cavalli 2018-04-01 17:16:50 +02:00
parent 7209e0dca1
commit 7d27a3e9cb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -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/

3
src/main/java/org/warp/picalculator/gui/screens/MarioScreen.java
View File

@ -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);