From c906c43b8be6c4ca49aceac4c984793ddfc5c3ac Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Mon, 25 Feb 2019 13:12:22 +0100 Subject: [PATCH] Updated TeaVM to the latest snapshot and fixed panels history behaviour --- Flow | 2 +- bigdecimal-math | 2 +- core/.classpath | 2 +- core/pom.xml | 2 +- .../cavallium/warppi/gui/DisplayManager.java | 99 ++++++++++--------- desktop/.classpath | 2 +- desktop/.settings/org.eclipse.jdt.core.prefs | 8 +- engine-jogl/.classpath | 2 +- hardware/.classpath | 2 +- hardware/.settings/org.eclipse.jdt.core.prefs | 8 +- pom.xml | 21 ++-- rules/.classpath | 2 +- teavm/.classpath | 2 +- teavm/.settings/org.eclipse.jdt.core.prefs | 8 +- teavm/pom.xml | 4 +- util/.classpath | 2 +- 16 files changed, 90 insertions(+), 78 deletions(-) diff --git a/Flow b/Flow index 59b89e9d..92db616e 160000 --- a/Flow +++ b/Flow @@ -1 +1 @@ -Subproject commit 59b89e9d165c3fc615ca44aa742b531caf13fcb6 +Subproject commit 92db616ef508f16fe30e8e37d17d7d7a18f56f4a diff --git a/bigdecimal-math b/bigdecimal-math index b08a4a6a..40d89e53 160000 --- a/bigdecimal-math +++ b/bigdecimal-math @@ -1 +1 @@ -Subproject commit b08a4a6aca41fbc6bf0c4bd252f716d518d368a5 +Subproject commit 40d89e539223aaa9202326833a2c813bed3c6eef diff --git a/core/.classpath b/core/.classpath index 61560899..4328dab5 100644 --- a/core/.classpath +++ b/core/.classpath @@ -18,7 +18,7 @@ - + diff --git a/core/pom.xml b/core/pom.xml index 39c3ca38..ba81e79a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -17,7 +17,7 @@ it.cavallium warppi-flow - 0.9.0a3 + 1.0.1 it.cavallium diff --git a/core/src/main/java/it/cavallium/warppi/gui/DisplayManager.java b/core/src/main/java/it/cavallium/warppi/gui/DisplayManager.java index cf913787..1efbabb6 100644 --- a/core/src/main/java/it/cavallium/warppi/gui/DisplayManager.java +++ b/core/src/main/java/it/cavallium/warppi/gui/DisplayManager.java @@ -92,32 +92,23 @@ public final class DisplayManager implements RenderingLoop { } /* - * private void load_skin() { - * try { - * skin_tex = glGenTextures(); - * glBindTexture(GL_TEXTURE_2D, skin_tex); - * glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + * private void load_skin() { try { skin_tex = glGenTextures(); + * glBindTexture(GL_TEXTURE_2D, skin_tex); glPixelStorei(GL_UNPACK_ALIGNMENT, + * 1); * - * InputStream in = new FileInputStream("skin.png"); - * PNGDecoder decoder = new PNGDecoder(in); + * InputStream in = new FileInputStream("skin.png"); PNGDecoder decoder = new + * PNGDecoder(in); * * System.out.println("width="+decoder.getWidth()); * System.out.println("height="+decoder.getHeight()); * * ByteBuffer buf = * ByteBuffer.allocateDirect(4*decoder.getWidth()*decoder.getHeight()); - * decoder.decode(buf, decoder.getWidth()*4, Format.RGBA); - * buf.flip(); + * decoder.decode(buf, decoder.getWidth()*4, Format.RGBA); buf.flip(); * - * skin = buf; - * skin_w = decoder.getWidth(); - * skin_h = decoder.getHeight(); - * glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, skin_w, - * skin_h, 0, GL_RGBA, GL_UNSIGNED_BYTE, skin); - * } catch (IOException ex) { - * ex.printStackTrace(); - * } - * } + * skin = buf; skin_w = decoder.getWidth(); skin_h = decoder.getHeight(); + * glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, skin_w, skin_h, 0, GL_RGBA, + * GL_UNSIGNED_BYTE, skin); } catch (IOException ex) { ex.printStackTrace(); } } */ private GraphicEngine chooseGraphicEngine() { @@ -139,7 +130,8 @@ public final class DisplayManager implements RenderingLoop { } d = Utils.getOrDefault(Engine.getPlatform().getEnginesList(), "headless 24 bit engine", null); if (d != null && d.isSupported()) { - System.err.println("Using Headless 24 bit Engine! This is a problem! No other graphic engines are available."); + System.err.println( + "Using Headless 24 bit Engine! This is a problem! No other graphic engines are available."); return d; } d = Utils.getOrDefault(Engine.getPlatform().getEnginesList(), "headless 256 colors engine", null); @@ -149,12 +141,14 @@ public final class DisplayManager implements RenderingLoop { } d = Utils.getOrDefault(Engine.getPlatform().getEnginesList(), "headless 8 colors engine", null); if (d != null && d.isSupported()) { - System.err.println("Using Headless basic Engine! This is a problem! No other graphic engines are available."); + System.err + .println("Using Headless basic Engine! This is a problem! No other graphic engines are available."); return d; } d = Utils.getOrDefault(Engine.getPlatform().getEnginesList(), "HTML5 engine", null); if (d != null && d.isSupported()) { - Engine.getPlatform().getConsoleUtils().out().println(ConsoleUtils.OUTPUTLEVEL_NODEBUG, "Using Html Graphic Engine"); + Engine.getPlatform().getConsoleUtils().out().println(ConsoleUtils.OUTPUTLEVEL_NODEBUG, + "Using Html Graphic Engine"); return d; } d = new NoGuiEngine(); @@ -165,8 +159,6 @@ public final class DisplayManager implements RenderingLoop { throw new UnsupportedOperationException("No graphic engines available."); } - - public void closeScreen() { boolean isLastSession = sessions[1] == null; if (!isLastSession) { @@ -186,10 +178,10 @@ public final class DisplayManager implements RenderingLoop { } else { currentSession = 0; } - updateCurrentScreen(sessions[currentSession]); + updateCurrentScreen(sessions[currentSession]); } } - + public void setScreen(final Screen screen) { boolean mustBeAddedToHistory = screen.initialized == false; if (!mustBeAddedToHistory) { @@ -200,34 +192,44 @@ public final class DisplayManager implements RenderingLoop { mustBeAddedToHistory |= !found; } if (mustBeAddedToHistory) { - if (screen.historyBehavior == HistoryBehavior.NORMAL || screen.historyBehavior == HistoryBehavior.ALWAYS_KEEP_IN_HISTORY) { + if (screen.historyBehavior == HistoryBehavior.NORMAL + || screen.historyBehavior == HistoryBehavior.ALWAYS_KEEP_IN_HISTORY) { if (currentSession > 0) { - final int sl = sessions.length; //TODO: I don't know why if i don't add +5 or more some items disappear + final int sl = sessions.length; // TODO: I don't know why if i don't add +5 or more some items + // disappear List newSessions = new LinkedList<>(); int i = 0; for (Screen s : sessions) { + if (i == currentSession) { + currentSession = newSessions.size(); + newSessions.add(screen); + } if (s != null) { if (i < currentSession) { - if (s.historyBehavior != HistoryBehavior.DONT_KEEP_IN_HISTORY) - newSessions.add(s); - } else { if (s.historyBehavior == HistoryBehavior.ALWAYS_KEEP_IN_HISTORY) { newSessions.add(s); } + } else { + if (s.historyBehavior != HistoryBehavior.DONT_KEEP_IN_HISTORY) + newSessions.add(s); } } i++; } - sessions = newSessions.toArray(new Screen[5]); - currentSession = newSessions.indexOf(screen); -// sessions = Arrays.copyOfRange(sessions, currentSession, sl); + for (int j = 0; j < sl; j++) { + if (j < newSessions.size()) { + sessions[j] = newSessions.get(j); + } else { + sessions[j] = null; + } + } } else { currentSession = 0; + for (int i = sessions.length - 1; i >= 1; i--) { + sessions[i] = sessions[i - 1]; + } + sessions[0] = screen; } - for (int i = sessions.length - 1; i >= 1; i--) { - sessions[i] = sessions[i - 1]; - } - sessions[0] = screen; } else { currentSession = -1; } @@ -254,7 +256,8 @@ public final class DisplayManager implements RenderingLoop { public void replaceScreen(final Screen screen) { if (screen.initialized == false) { - if (screen.historyBehavior == HistoryBehavior.NORMAL || screen.historyBehavior == HistoryBehavior.ALWAYS_KEEP_IN_HISTORY) { + if (screen.historyBehavior == HistoryBehavior.NORMAL + || screen.historyBehavior == HistoryBehavior.ALWAYS_KEEP_IN_HISTORY) { sessions[currentSession] = screen; } else { currentSession = -1; @@ -300,7 +303,8 @@ public final class DisplayManager implements RenderingLoop { public void goBack() { if (canGoBack()) { - if (currentSession >= 0 && screen != sessions[currentSession]) {} else { + if (currentSession >= 0 && screen != sessions[currentSession]) { + } else { currentSession += 1; } screen = sessions[currentSession]; @@ -359,8 +363,8 @@ public final class DisplayManager implements RenderingLoop { fonts[1] = engine.loadFont("smallest"); fonts[2] = engine.loadFont("norm"); fonts[3] = engine.loadFont("smal"); - //4 - //fonts[5] = engine.loadFont("square"); + // 4 + // fonts[5] = engine.loadFont("square"); } private void draw_init() { @@ -391,7 +395,9 @@ public final class DisplayManager implements RenderingLoop { fnt.use(engine); } renderer.glColor3i(129, 28, 22); - renderer.glDrawStringRight(StaticVars.screenSize[0] - 2, StaticVars.screenSize[1] - (fnt.getCharacterHeight() + 2), Engine.getPlatform().getSettings().getCalculatorNameUppercase() + " CALCULATOR"); + renderer.glDrawStringRight(StaticVars.screenSize[0] - 2, + StaticVars.screenSize[1] - (fnt.getCharacterHeight() + 2), + Engine.getPlatform().getSettings().getCalculatorNameUppercase() + " CALCULATOR"); renderer.glColor3i(149, 32, 26); renderer.glDrawStringCenter(StaticVars.screenSize[0] / 2, 22, error); renderer.glColor3i(164, 34, 28); @@ -409,14 +415,16 @@ public final class DisplayManager implements RenderingLoop { if (fonts[0] != null && fonts[0] != engine.getRenderer().getCurrentFont()) { fonts[0].use(engine); } - if (hud.visible) hud.renderBackground(); + if (hud.visible) + hud.renderBackground(); screen.render(); if (hud.visible) { hud.render(); hud.renderTopmostBackground(); } screen.renderTopmost(); - if (hud.visible) hud.renderTopmost(); + if (hud.visible) + hud.renderTopmost(); } } @@ -483,7 +491,8 @@ public final class DisplayManager implements RenderingLoop { engine.start(getDrawable()); } catch (final Exception ex) { ex.printStackTrace(); - } finally {} + } finally { + } } public void changeBrightness(final float change) { diff --git a/desktop/.classpath b/desktop/.classpath index e33daad6..d0ba9370 100644 --- a/desktop/.classpath +++ b/desktop/.classpath @@ -23,7 +23,7 @@ - + diff --git a/desktop/.settings/org.eclipse.jdt.core.prefs b/desktop/.settings/org.eclipse.jdt.core.prefs index b8947ec6..46855213 100644 --- a/desktop/.settings/org.eclipse.jdt.core.prefs +++ b/desktop/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/engine-jogl/.classpath b/engine-jogl/.classpath index f3872e63..c9dea96e 100644 --- a/engine-jogl/.classpath +++ b/engine-jogl/.classpath @@ -18,7 +18,7 @@ - + diff --git a/hardware/.classpath b/hardware/.classpath index f3872e63..c9dea96e 100644 --- a/hardware/.classpath +++ b/hardware/.classpath @@ -18,7 +18,7 @@ - + diff --git a/hardware/.settings/org.eclipse.jdt.core.prefs b/hardware/.settings/org.eclipse.jdt.core.prefs index b8947ec6..46855213 100644 --- a/hardware/.settings/org.eclipse.jdt.core.prefs +++ b/hardware/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/pom.xml b/pom.xml index c1f1acbf..1ef610bf 100755 --- a/pom.xml +++ b/pom.xml @@ -28,9 +28,10 @@ UTF-8 - 1.8 - 1.8 - 1.8 + 11 + 11 + 11 + 11 src/main/java src/main/java src/main/resources @@ -43,7 +44,7 @@ bigdecimal-math Flow rules - + desktop engine-jogl teavm @@ -138,10 +139,6 @@ org.apache.maven.plugins maven-compiler-plugin 3.8.0 - - ${maven.compiler.source} - ${maven.compiler.target} - org.apache.maven.plugins @@ -161,6 +158,12 @@ org.apache.maven.plugins maven-surefire-plugin 2.22.0 + + false + + --illegal-access=permit + + org.apache.felix @@ -212,7 +215,7 @@ - + diff --git a/rules/.classpath b/rules/.classpath index f3872e63..c9dea96e 100644 --- a/rules/.classpath +++ b/rules/.classpath @@ -18,7 +18,7 @@ - + diff --git a/teavm/.classpath b/teavm/.classpath index d0e5faff..19368e50 100644 --- a/teavm/.classpath +++ b/teavm/.classpath @@ -13,7 +13,7 @@ - + diff --git a/teavm/.settings/org.eclipse.jdt.core.prefs b/teavm/.settings/org.eclipse.jdt.core.prefs index b8947ec6..46855213 100644 --- a/teavm/.settings/org.eclipse.jdt.core.prefs +++ b/teavm/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/teavm/pom.xml b/teavm/pom.xml index d3212794..6aaf5c92 100644 --- a/teavm/pom.xml +++ b/teavm/pom.xml @@ -27,7 +27,7 @@ org.teavm teavm-classlib - 0.6.0-dev-567 + 0.6.0-dev-682 provided @@ -86,7 +86,7 @@ org.teavm teavm-maven-plugin - 0.6.0-dev-567 + 0.6.0-dev-682 diff --git a/util/.classpath b/util/.classpath index 5e8a55fe..4559ca0b 100644 --- a/util/.classpath +++ b/util/.classpath @@ -13,7 +13,7 @@ - +