From b61900447713fcc091e8ef483c9787699ddac28b Mon Sep 17 00:00:00 2001 From: Willem Date: Thu, 3 Mar 2022 00:50:26 +0100 Subject: [PATCH] Added SystemGdxFont --- gdxapp4d-boot-desktop/pom.xml | 4 - gdxapp4d-tos4/pom.xml | 11 +++ .../gdxapp4d/tos4/GDXAppTos4.java | 4 +- .../gdxapp4d/tos4/GDXAppTos4Activator.java | 95 ++++++++++++++----- .../gdxapp4d/tos4/GDXAppTos4BootFactory.java | 1 + ...rpBootArgs.java => SystemGdxBootArgs.java} | 15 +-- .../gdxapp4d/tos4/service/SystemGdxFont.java | 11 +++ ...ystemWarpLogger.java => SystemGdxLog.java} | 2 +- ...rpTerminal.java => SystemGdxTerminal.java} | 2 +- gdxapp4d-vrgem4/pom.xml | 1 + .../gdxapp4d/vrgem4/GDXAppVrGem4.java | 12 +-- .../vrgem4/GDXAppVrGem4Activator.java | 33 ++++--- .../vrgem4/GDXAppVrGem4BootScreen.java | 6 +- .../gdxapp4d/vrgem4/TestComponent.java | 4 +- .../vrgem4/desktop/DeskTopScreenMenu.java | 8 +- .../vrgem4/screen/AbstractScreenDesktop.java | 6 +- .../vrgem4/screen/ScreenDesktop1.java | 4 +- .../vrgem4/screen/ScreenDesktop2.java | 4 +- .../vrgem4/screen/ScreenDesktop3.java | 4 +- .../vrgem4/screen/ScreenDesktop4.java | 4 +- 20 files changed, 146 insertions(+), 85 deletions(-) rename gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/{SystemWarpBootArgs.java => SystemGdxBootArgs.java} (60%) create mode 100644 gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxFont.java rename gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/{SystemWarpLogger.java => SystemGdxLog.java} (96%) rename gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/{SystemWarpTerminal.java => SystemGdxTerminal.java} (91%) diff --git a/gdxapp4d-boot-desktop/pom.xml b/gdxapp4d-boot-desktop/pom.xml index b988f688..a597035e 100644 --- a/gdxapp4d-boot-desktop/pom.xml +++ b/gdxapp4d-boot-desktop/pom.xml @@ -16,10 +16,6 @@ com.badlogicgames.gdx gdx-backend-lwjgl3 - - com.badlogicgames.gdx - gdx-platform - games.spooky.gdx gdx-nativefilechooser-desktop diff --git a/gdxapp4d-tos4/pom.xml b/gdxapp4d-tos4/pom.xml index ed53bafb..bfb26291 100644 --- a/gdxapp4d-tos4/pom.xml +++ b/gdxapp4d-tos4/pom.xml @@ -49,6 +49,17 @@ org.osgi.service.component.annotations 1.4.0 + + com.badlogicgames.gdx + gdx-freetype + 1.10.0 + + + com.badlogicgames.gdx + gdx-freetype-platform + 1.10.0 + natives-desktop + diff --git a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4.java b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4.java index 4599eece..411f76c2 100644 --- a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4.java +++ b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4.java @@ -19,13 +19,13 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinʸᴰ; import love.distributedrebirth.bassboonyd.BãßBȍőnPackageInfoʸᴰ; import love.distributedrebirth.bassboonyd.jmx.DefaultEnumInstanceᴶᴹˣ; import love.distributedrebirth.bassboonyd.jmx.GuageCounterᴶᴹˣ; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpTerminal; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; import net.spookygames.gdx.nativefilechooser.NativeFileChooser; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @BãßBȍőnClassInfoʸᴰ(name = "GDXAppTos4", purpose = "Main loop render dispatcher and bootup.") @BãßBȍőnPackageInfoʸᴰ(name = "love.distributedrebirth.gdxapp4d.tos4") -public enum GDXAppTos4 implements DefaultEnumInstanceᴶᴹˣ, ApplicationListener, SystemWarpTerminal { +public enum GDXAppTos4 implements DefaultEnumInstanceᴶᴹˣ, ApplicationListener, SystemGdxTerminal { INSTANCE; diff --git a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4Activator.java b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4Activator.java index e3922bd6..f99c612f 100644 --- a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4Activator.java +++ b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4Activator.java @@ -18,13 +18,19 @@ import org.slf4j.LoggerFactory; import org.x4o.xml.io.X4OConnectionException; import org.xml.sax.SAXException; +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.g2d.BitmapFont; +import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; +import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter; + import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpBase; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpBootArgs; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpLogger; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxFont; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxLog; import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpSea; import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpShip; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpTerminal; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; import love.distributedrebirth.warpme.Warpᵐᵉ; import love.distributedrebirth.warpme.sea.WaterOcean; import love.distributedrebirth.warpme.sea.WaterOceanDriver; @@ -43,9 +49,10 @@ public class GDXAppTos4Activator implements BundleActivator { private NativeFileChooser fileChooser; private File hyperdriveHome; private File warpshipHome; + private BitmapFont gdxFont; private Properties localOverrides; private WaterDevice warpshipDevice; - private SystemWarpTerminal systemWarpTerminal; + private SystemGdxTerminal systemGdxTerminal; private List listeners = new ArrayList<>(); private static final String SYSTEM_USER_HOME = "user.home"; @@ -55,12 +62,12 @@ public class GDXAppTos4Activator implements BundleActivator { public GDXAppTos4Activator() { } - public void BãßInit(List args, int viewWidth, int viewHeight,NativeFileChooser fileChooser, SystemWarpTerminal systemWarpTerminal) { + public void BãßInit(List args, int viewWidth, int viewHeight,NativeFileChooser fileChooser, SystemGdxTerminal systemGdxTerminal) { this.args = args; this.viewWidth = viewWidth; this.viewHeight = viewHeight; this.fileChooser = fileChooser; - this.systemWarpTerminal = systemWarpTerminal; + this.systemGdxTerminal = systemGdxTerminal; } private void fireMessageEvent(String message) { @@ -138,13 +145,34 @@ public class GDXAppTos4Activator implements BundleActivator { } } + FreeTypeFontParameter parameter = new FreeTypeFontParameter(); + parameter.characters = FreeTypeFontGenerator.DEFAULT_CHARS + getRangeUnicodeUsed(); + parameter.size = 14; + Gdx.app.postRunnable(new Runnable() { + @Override + public void run() { + FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal("font/code-2000.ttf")); + gdxFont = generator.generateFont(parameter); + } + }); + while (gdxFont == null) { + try { + Thread.sleep(100); + } catch (InterruptedException ignored) { + } + } + fireMessageEvent("gdx-font: "+parameter.characters.length()+" glyphs loaded."); + + SystemWarpShipImpl systemWarpShip = new SystemWarpShipImpl(); - context.registerService(SystemWarpLogger.class.getName(), new SystemWarpLoggerImpl(), new Hashtable()); context.registerService(SystemWarpBase.class.getName(), new SystemWarpBaseImpl(), new Hashtable()); - context.registerService(SystemWarpBootArgs.class.getName(), new SystemWarpBootArgsImpl(), new Hashtable()); context.registerService(SystemWarpShip.class.getName(), systemWarpShip, new Hashtable()); - context.registerService(SystemWarpTerminal.class.getName(), systemWarpTerminal, new Hashtable()); + + context.registerService(SystemGdxFont.class.getName(), new SystemGdxFontImpl(gdxFont), new Hashtable()); + context.registerService(SystemGdxLog.class.getName(), new SystemGdxLogImpl(), new Hashtable()); + context.registerService(SystemGdxBootArgs.class.getName(), new SystemGdxBootArgsImpl(), new Hashtable()); + context.registerService(SystemGdxTerminal.class.getName(), systemGdxTerminal, new Hashtable()); int result = 0; try { @@ -161,6 +189,16 @@ public class GDXAppTos4Activator implements BundleActivator { } } + private static String getRangeUnicodeUsed() { + StringBuilder buf = new StringBuilder(); + buf.append("©Δ∞ 仙上主天"); + buf.append("BãßBȍőnAuthorInfoʸᴰ"); + for (int c=0x0100;c<=0x0200;c++) { + buf.append(""+(char)c); + } + return buf.toString(); + } + public class SystemWarpSeaImpl implements SystemWarpSea { private final WaterOcean warpSea; @@ -189,20 +227,20 @@ public class GDXAppTos4Activator implements BundleActivator { } - public class SystemWarpBootArgsImpl implements SystemWarpBootArgs { + public class SystemGdxBootArgsImpl implements SystemGdxBootArgs { @Override - public List getBootArgs() { - return args; + public boolean isWarpCoreNoLock() { + return args.contains("warpcore-nolock"); } - + @Override - public int getBootWindowWidth() { + public int getWindowWidth() { return viewWidth; } @Override - public int getBootWindowHeight() { + public int getWindowHeight() { return viewHeight; } @@ -210,11 +248,6 @@ public class GDXAppTos4Activator implements BundleActivator { public NativeFileChooser getFileChooser() { return fileChooser; } - - @Override - public Properties getLocalOverrides() { - return localOverrides; - } } public class SystemWarpShipImpl implements SystemWarpShip { @@ -290,26 +323,40 @@ public class GDXAppTos4Activator implements BundleActivator { } } - public static class SystemWarpLoggerImpl implements SystemWarpLogger { + public static class SystemGdxLogImpl implements SystemGdxLog { @Override public void infoTag(String tag, String message, Object...args) { LoggerFactory.getLogger(tag).info(message, args); } - + @Override public void debugTag(String tag, String message, Object...args) { LoggerFactory.getLogger(tag).debug(message, args); } - + @Override public void errorTag(String tag, String message, Object...args) { LoggerFactory.getLogger(tag).error(message, args); } - + @Override public void errorTag(String tag, String message, Throwable exception) { LoggerFactory.getLogger(tag).error(message, exception); } } + + public static class SystemGdxFontImpl implements SystemGdxFont { + + private final BitmapFont font; + + public SystemGdxFontImpl(BitmapFont font) { + this.font = font; + } + + @Override + public BitmapFont getFont() { + return font; + } + } } diff --git a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java index 5294ea12..fef73161 100644 --- a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java +++ b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java @@ -51,6 +51,7 @@ public class GDXAppTos4BootFactory { "com.badlogic.gdx.files,"+ "com.badlogic.gdx.graphics,"+ "com.badlogic.gdx.graphics.g2d,"+ + "com.badlogic.gdx.graphics.g2d.freetype,"+ "com.badlogic.gdx.graphics.g3d,"+ "com.badlogic.gdx.graphics.g3d.attributes,"+ "com.badlogic.gdx.graphics.g3d.decals,"+ diff --git a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemWarpBootArgs.java b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxBootArgs.java similarity index 60% rename from gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemWarpBootArgs.java rename to gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxBootArgs.java index 121f6633..73c058bc 100644 --- a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemWarpBootArgs.java +++ b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxBootArgs.java @@ -1,21 +1,16 @@ package love.distributedrebirth.gdxapp4d.tos4.service; -import java.util.List; -import java.util.Properties; - import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import net.spookygames.gdx.nativefilechooser.NativeFileChooser; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public interface SystemWarpBootArgs { - - List getBootArgs(); +public interface SystemGdxBootArgs { - int getBootWindowWidth(); + boolean isWarpCoreNoLock(); - int getBootWindowHeight(); + int getWindowWidth(); + + int getWindowHeight(); NativeFileChooser getFileChooser(); - - Properties getLocalOverrides(); } diff --git a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxFont.java b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxFont.java new file mode 100644 index 00000000..219e9aca --- /dev/null +++ b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxFont.java @@ -0,0 +1,11 @@ +package love.distributedrebirth.gdxapp4d.tos4.service; + +import com.badlogic.gdx.graphics.g2d.BitmapFont; + +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") +public interface SystemGdxFont { + + BitmapFont getFont(); +} diff --git a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemWarpLogger.java b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxLog.java similarity index 96% rename from gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemWarpLogger.java rename to gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxLog.java index 33b51f3b..16777657 100644 --- a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemWarpLogger.java +++ b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxLog.java @@ -3,7 +3,7 @@ package love.distributedrebirth.gdxapp4d.tos4.service; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public interface SystemWarpLogger { +public interface SystemGdxLog { void infoTag(String tag, String message, Object...args); diff --git a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemWarpTerminal.java b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxTerminal.java similarity index 91% rename from gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemWarpTerminal.java rename to gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxTerminal.java index 14e0fa0a..6a023a5e 100644 --- a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemWarpTerminal.java +++ b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/service/SystemGdxTerminal.java @@ -5,7 +5,7 @@ import com.badlogic.gdx.Screen; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public interface SystemWarpTerminal { +public interface SystemGdxTerminal { void registrateScreen(Screen screen); diff --git a/gdxapp4d-vrgem4/pom.xml b/gdxapp4d-vrgem4/pom.xml index ebe6b61f..abbe1298 100644 --- a/gdxapp4d-vrgem4/pom.xml +++ b/gdxapp4d-vrgem4/pom.xml @@ -44,6 +44,7 @@ com.badlogic.gdx.files, com.badlogic.gdx.graphics, com.badlogic.gdx.graphics.g2d, + com.badlogic.gdx.graphics.g2d.freetype, com.badlogic.gdx.graphics.g3d, com.badlogic.gdx.graphics.g3d.attributes, com.badlogic.gdx.graphics.g3d.decals, diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4.java index 776622c9..d0f4c548 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4.java @@ -8,7 +8,7 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpenʸᴰ; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinʸᴰ; import love.distributedrebirth.bassboonyd.BãßBȍőnPackageInfoʸᴰ; import love.distributedrebirth.bassboonyd.jmx.DefaultEnumInstanceᴶᴹˣ; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpTerminal; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; import love.distributedrebirth.gdxapp4d.vrgem4.music.MusicManager; @@ -19,7 +19,7 @@ public enum GDXAppVrGem4 implements DefaultEnumInstanceᴶᴹˣ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); @@ -30,13 +30,9 @@ public enum GDXAppVrGem4 implements DefaultEnumInstanceᴶᴹˣ args, SystemWarpTerminal terminal) { - boolean musicStop = args.contains("music-stop"); - if (musicStop) { - System.out.println("music-stop: requested"); - } + public void init(SystemGdxTerminal terminal) { music = new MusicManager(); - music.init(musicStop); + music.init(false); this.terminal = terminal; } diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java index 90e43a70..61d5dc63 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java @@ -1,7 +1,5 @@ package love.distributedrebirth.gdxapp4d.vrgem4; -import java.util.List; - import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -11,9 +9,10 @@ import com.badlogic.gdx.Gdx; import imgui.type.ImBoolean; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpenʸᴰ; import love.distributedrebirth.bassboonyd.jmx.DefaultEnumBaseᴶᴹˣ; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxFont; import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpShip; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpTerminal; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenCredits; import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenDesktop1; import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenDesktop2; @@ -25,8 +24,6 @@ import love.distributedrebirth.numberxd.base2t.Base2PartsFactory; import love.distributedrebirth.numberxd.base2t.Base2Terminator; import love.distributedrebirth.numberxd.base2t.part.warp.TOSWarpCore; import love.distributedrebirth.numberxd.glyph.BaseGlyphSet; -import love.distributedrebirth.warpme.core.WaterBucket; -import love.distributedrebirth.warpme.core.WaterBucketDriver; import love.distributedrebirth.warpme.ship.WaterShipOcean; public class GDXAppVrGem4Activator implements BundleActivator { @@ -46,10 +43,13 @@ public class GDXAppVrGem4Activator implements BundleActivator { } catch (InterruptedException ignored) { } - ServiceReference termRef = context.getServiceReference(SystemWarpTerminal.class); - SystemWarpTerminal terminal = context.getService(termRef); + ServiceReference termRef = context.getServiceReference(SystemGdxTerminal.class); + SystemGdxTerminal terminal = context.getService(termRef); - GDXAppVrGem4BootScreen bootScreen = new GDXAppVrGem4BootScreen(); + ServiceReference gdxFontRef = context.getServiceReference(SystemGdxFont.class); + SystemGdxFont gdxFont = context.getService(gdxFontRef); + + GDXAppVrGem4BootScreen bootScreen = new GDXAppVrGem4BootScreen(gdxFont.getFont()); Gdx.app.postRunnable(new Runnable() { @Override public void run() { @@ -91,10 +91,10 @@ public class GDXAppVrGem4Activator implements BundleActivator { } bootScreen.bootLine("ImGui Loaded"); - ServiceReference bootArgsRef = context.getServiceReference(SystemWarpBootArgs.class); - SystemWarpBootArgs bootArgs = context.getService(bootArgsRef); - List args = bootArgs.getBootArgs(); + ServiceReference bootArgsRef = context.getServiceReference(SystemGdxBootArgs.class); + SystemGdxBootArgs bootArgs = context.getService(bootArgsRef); + /* bootScreen.bootLine("warpcore: Check request"); try { if (args.contains("warpcore-load")) { @@ -110,13 +110,15 @@ public class GDXAppVrGem4Activator implements BundleActivator { } catch (Exception e) { throw new RuntimeException(e); } - if (!args.contains("warpcore-nolock")) { + */ + if (!bootArgs.isWarpCoreNoLock()) { bootScreen.bootLine("warpcore-lock: BãßLockWarpCipher"); TOSWarpCore.INSTANCE.BãßLockWarpCipher(v -> {}); } else { bootScreen.bootLine("warpcore-nolock: requested"); } + /* if (args.contains("full-screen")) { bootScreen.bootLine("full-screen: requested"); Gdx.app.postRunnable(new Runnable() { @@ -126,9 +128,10 @@ public class GDXAppVrGem4Activator implements BundleActivator { } }); } + */ bootScreen.bootLine("vrGEM4: init"); - GDXAppVrGem4.INSTANCE.init(args, terminal); + GDXAppVrGem4.INSTANCE.init(terminal); bootScreen.bootLine("terminal: added screens"); Gdx.app.postRunnable(new Runnable() { @@ -167,7 +170,7 @@ public class GDXAppVrGem4Activator implements BundleActivator { } else { bootScreen.bootLine("vrGEM4: chains resolved."); try { - Thread.sleep(2000); + Thread.sleep(6000); } catch (InterruptedException ignored) { } Gdx.app.postRunnable(new Runnable() { diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4BootScreen.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4BootScreen.java index aa50f03e..2dbea26a 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4BootScreen.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4BootScreen.java @@ -11,18 +11,18 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch; public class GDXAppVrGem4BootScreen extends ScreenAdapter implements GDXAppVrGem4BootListener { - private BitmapFont font; + private final BitmapFont font; private SpriteBatch batch; private Texture backgroundImage; private List messages = new ArrayList<>(); - public GDXAppVrGem4BootScreen() { + public GDXAppVrGem4BootScreen(BitmapFont font) { + this.font = font; } public void create() { batch = new SpriteBatch(); backgroundImage = new Texture(Gdx.files.internal("background/temple-os.png")); - font = new BitmapFont(); } @Override diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/TestComponent.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/TestComponent.java index 57bda70c..ae2a5ed7 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/TestComponent.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/TestComponent.java @@ -5,14 +5,14 @@ import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Reference; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpLogger; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxLog; import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpShip; @Component public class TestComponent { @Reference - private SystemWarpLogger log; + private SystemGdxLog log; @Reference private SystemWarpShip warpShip; diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/desktop/DeskTopScreenMenu.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/desktop/DeskTopScreenMenu.java index 6538d2f5..79815096 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/desktop/DeskTopScreenMenu.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/desktop/DeskTopScreenMenu.java @@ -8,7 +8,7 @@ import com.badlogic.gdx.Gdx; import imgui.ImGui; import imgui.type.ImBoolean; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; import love.distributedrebirth.gdxapp4d.vrgem4.FontAwesomeIcons; import love.distributedrebirth.gdxapp4d.vrgem4.GDXAppLauncher; import love.distributedrebirth.gdxapp4d.vrgem4.GDXAppVrGem4; @@ -29,13 +29,13 @@ import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenHelp; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class DeskTopScreenMenu { - private SystemWarpBootArgs bootArgs; + private SystemGdxBootArgs bootArgs; private List apps; private ImBoolean fileMinimizeSelected = new ImBoolean(false); private ImBoolean fileCloseSelected = new ImBoolean(false); private ImBoolean tosSelfSelected = new ImBoolean(false); - public DeskTopScreenMenu(SystemWarpBootArgs bootArgs) { + public DeskTopScreenMenu(SystemGdxBootArgs bootArgs) { this.bootArgs = bootArgs; apps = new ArrayList<>(); apps.add(new GDXAppLauncher("Basic Console", () -> new BasicConsoleApp())); @@ -225,7 +225,7 @@ public class DeskTopScreenMenu { ImGui.separator(); if (Gdx.graphics.isFullscreen()) { if (ImGui.menuItem(FontAwesomeIcons.Wheelchair + " Window Mode")) { - Gdx.graphics.setWindowedMode(bootArgs.getBootWindowWidth(), bootArgs.getBootWindowHeight()); + Gdx.graphics.setWindowedMode(bootArgs.getWindowWidth(), bootArgs.getWindowHeight()); } } else { if (ImGui.menuItem(FontAwesomeIcons.FighterJet + " Full Screen")) { diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/AbstractScreenDesktop.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/AbstractScreenDesktop.java index 927dce6b..315456f9 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/AbstractScreenDesktop.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/AbstractScreenDesktop.java @@ -17,7 +17,7 @@ import imgui.ImGui; import imgui.flag.ImGuiCond; import imgui.flag.ImGuiWindowFlags; import imgui.type.ImBoolean; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; import love.distributedrebirth.gdxapp4d.vrgem4.ImGuiSetup; import love.distributedrebirth.gdxapp4d.vrgem4.desktop.DeskApp; import love.distributedrebirth.gdxapp4d.vrgem4.desktop.DeskAppContourSection; @@ -42,7 +42,7 @@ public abstract class AbstractScreenDesktop extends ScreenAdapter implements Des private ModelBatch modelBatch; private Array modelInstances = new Array(); - public AbstractScreenDesktop(String name, SystemWarpBootArgs bootArgs) { + public AbstractScreenDesktop(String name, SystemGdxBootArgs bootArgs) { this.create(bootArgs); deskAppScreen = new DeskAppScreen(name); deskAppScreen.addDeskAppListener(new DeskAppScreenListener() { @@ -62,7 +62,7 @@ public abstract class AbstractScreenDesktop extends ScreenAdapter implements Des } - private void create(SystemWarpBootArgs bootArgs) { + private void create(SystemGdxBootArgs bootArgs) { batch = new SpriteBatch(); font = new BitmapFont(); camera = new OrthographicCamera(); diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop1.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop1.java index b4ea6ecb..79fe92e2 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop1.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop1.java @@ -9,13 +9,13 @@ import com.badlogic.gdx.graphics.g3d.utils.ModelBuilder; import com.badlogic.gdx.utils.Array; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenDesktop1 extends AbstractScreenDesktop { private Model grid; - public ScreenDesktop1(SystemWarpBootArgs bootArgs) { + public ScreenDesktop1(SystemGdxBootArgs bootArgs) { super("Desktop1", bootArgs); //backgroundImage = new Texture(Gdx.files.internal("background/terrydavis-front.png")); } diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop2.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop2.java index c5464132..e07cb238 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop2.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop2.java @@ -9,13 +9,13 @@ import com.badlogic.gdx.graphics.g3d.utils.ModelBuilder; import com.badlogic.gdx.utils.Array; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenDesktop2 extends AbstractScreenDesktop { private Model grid; - public ScreenDesktop2(SystemWarpBootArgs bootArgs) { + public ScreenDesktop2(SystemGdxBootArgs bootArgs) { super("Desktop2", bootArgs); //backgroundImage = new Texture(Gdx.files.internal("background/terrydavis-nose.png")); } diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop3.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop3.java index 3c764c94..a76f559a 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop3.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop3.java @@ -9,13 +9,13 @@ import com.badlogic.gdx.graphics.g3d.utils.ModelBuilder; import com.badlogic.gdx.utils.Array; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenDesktop3 extends AbstractScreenDesktop { private Model grid; - public ScreenDesktop3(SystemWarpBootArgs bootArgs) { + public ScreenDesktop3(SystemGdxBootArgs bootArgs) { super("Desktop3", bootArgs); } diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop4.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop4.java index e2822537..7f75ee01 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop4.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop4.java @@ -20,7 +20,7 @@ import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.viewport.ScreenViewport; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenDesktop4 extends AbstractScreenDesktop { @@ -36,7 +36,7 @@ public class ScreenDesktop4 extends AbstractScreenDesktop { private float colorFade = 0f; private boolean colorPositive = true; - public ScreenDesktop4(SystemWarpBootArgs bootArgs) { + public ScreenDesktop4(SystemGdxBootArgs bootArgs) { super("Desktop4", bootArgs); shader = new UserColorShader(); shader.init();