From 2f4353cf3d88e00de71b60e4548da12c4d4381c6 Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Tue, 8 Mar 2022 00:26:26 +0100 Subject: [PATCH] Removed GDXappVrGem4 instance --- .../gdxapp4d/vrgem4/GDXAppVrGem4.java | 36 ------------------- .../vrgem4/GDXAppVrGem4Activator.java | 17 +++++---- .../vrgem4/screen/AbstractScreenDesktop.java | 5 +-- .../vrgem4/screen/AbstractScrollScreen.java | 10 +++--- .../gdxapp4d/vrgem4/screen/ScreenCredits.java | 8 ++--- .../vrgem4/screen/ScreenDesktop1.java | 5 +-- .../vrgem4/screen/ScreenDesktop2.java | 5 +-- .../vrgem4/screen/ScreenDesktop3.java | 5 +-- .../vrgem4/screen/ScreenDesktop4.java | 5 +-- .../gdxapp4d/vrgem4/screen/ScreenHelp.java | 8 ++--- .../vrgem4/screen/ScreenIntroMission.java | 8 ++--- .../vrgem4/view/DeskTopScreenMenu.java | 18 +++++----- .../vrgem4/view/apps/Unicode4DApp.java | 1 - 13 files changed, 51 insertions(+), 80 deletions(-) delete mode 100644 gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4.java 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 deleted file mode 100644 index 88f20b14..00000000 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4.java +++ /dev/null @@ -1,36 +0,0 @@ -package love.distributedrebirth.gdxapp4d.vrgem4; - -import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; -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.SystemGdxTerminal; - - -@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -@BãßBȍőnClassInfoʸᴰ(name = "GDXAppMain", purpose = "Main loop render dispatcher and bootup.") -@BãßBȍőnPackageInfoʸᴰ(name = "love.distributedrebirth.gdxapp") -public enum GDXAppVrGem4 implements DefaultEnumInstanceᴶᴹˣ { - - INSTANCE; - - public SystemGdxTerminal terminal; - //public MusicManager music; - //public FontAtlas basePlane; - private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); - public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } - - private GDXAppVrGem4() { - BBC.BOON_INIT(this); - BȍőnJmxInit(GDXAppVrGem4Keyʸᴰ.JMX); - } - - public void init(SystemGdxTerminal terminal) { - //music = new MusicManager(); - //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 6349f11b..085a515a 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 @@ -147,7 +147,7 @@ public class GDXAppVrGem4Activator implements BundleActivator { */ bootScreen.bootLine("vrGEM⁴: init"); - GDXAppVrGem4.INSTANCE.init(terminal); + //GDXAppVrGem4.INSTANCE.init(terminal); VrGem4DeskAppServiceImpl deskAppService = new VrGem4DeskAppServiceImpl(); @@ -157,13 +157,13 @@ public class GDXAppVrGem4Activator implements BundleActivator { Gdx.app.postRunnable(new Runnable() { @Override public void run() { - terminal.registrateScreen(new ScreenDesktop1(bootArgs, deskAppService)); - terminal.registrateScreen(new ScreenDesktop2(bootArgs, deskAppService)); - terminal.registrateScreen(new ScreenDesktop3(bootArgs, deskAppService)); - terminal.registrateScreen(new ScreenDesktop4(bootArgs, deskAppService)); - terminal.registrateScreen(new ScreenCredits()); - terminal.registrateScreen(new ScreenHelp()); - terminal.registrateScreen(new ScreenIntroMission()); + terminal.registrateScreen(new ScreenDesktop1(bootArgs, terminal, deskAppService)); + terminal.registrateScreen(new ScreenDesktop2(bootArgs, terminal, deskAppService)); + terminal.registrateScreen(new ScreenDesktop3(bootArgs, terminal, deskAppService)); + terminal.registrateScreen(new ScreenDesktop4(bootArgs, terminal, deskAppService)); + terminal.registrateScreen(new ScreenCredits(terminal)); + terminal.registrateScreen(new ScreenHelp(terminal)); + terminal.registrateScreen(new ScreenIntroMission(terminal)); } }); try { @@ -217,7 +217,6 @@ public class GDXAppVrGem4Activator implements BundleActivator { @SuppressWarnings("unchecked") private > T[] coffinInstances() { return (T[]) new DefaultEnumBaseᴶᴹˣ[] { - GDXAppVrGem4.INSTANCE, BaseGlyphSet.values()[0], Base2Terminator.INSTANCE, Base2PartsFactory.INSTANCE, 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 e66bb168..c3400b3d 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 @@ -18,6 +18,7 @@ import imgui.flag.ImGuiCond; import imgui.flag.ImGuiWindowFlags; import imgui.type.ImBoolean; import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; import love.distributedrebirth.gdxapp4d.vrgem4.ImGuiSetup; import love.distributedrebirth.gdxapp4d.vrgem4.VrGem4DeskAppServiceImpl; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskApp; @@ -43,9 +44,9 @@ public abstract class AbstractScreenDesktop extends ScreenAdapter implements Des private ModelBatch modelBatch; private Array modelInstances = new Array(); - public AbstractScreenDesktop(String name, SystemGdxBootArgs bootArgs, VrGem4DeskAppServiceImpl deskAppService) { + public AbstractScreenDesktop(String name, SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) { this.create(); - screenMenu = new DeskTopScreenMenu(bootArgs, deskAppService); + screenMenu = new DeskTopScreenMenu(bootArgs, terminal, deskAppService); deskAppScreen = new DeskAppController(name); deskAppScreen.addDeskAppListener(new DeskAppSelectionListener() { diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/AbstractScrollScreen.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/AbstractScrollScreen.java index 624aacbb..708fb2c1 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/AbstractScrollScreen.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/AbstractScrollScreen.java @@ -10,7 +10,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.utils.ScreenUtils; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.gdxapp4d.vrgem4.GDXAppVrGem4; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") abstract public class AbstractScrollScreen extends ScreenAdapter { @@ -20,10 +20,12 @@ abstract public class AbstractScrollScreen extends ScreenAdapter { private int scrollIndex = 0; private int scrollLine = LINE_HEIGHT; private final Texture backgroundImage; + private final SystemGdxTerminal terminal; protected SpriteBatch batch; protected BitmapFont font; - public AbstractScrollScreen(String background) { + public AbstractScrollScreen(SystemGdxTerminal terminal, String background) { + this.terminal = terminal; batch = new SpriteBatch(); font = new BitmapFont(); backgroundImage = new Texture(Gdx.files.internal(background)); @@ -31,7 +33,7 @@ abstract public class AbstractScrollScreen extends ScreenAdapter { abstract protected String getScrollText(); - abstract protected Class getNextScreen(GDXAppVrGem4 main); + abstract protected Class getNextScreen(); @Override public final void render(float delta) { @@ -63,7 +65,7 @@ abstract public class AbstractScrollScreen extends ScreenAdapter { if (scrollText.length() >= 33) { if (scrollLine >=Gdx.graphics.getHeight() || Gdx.input.isTouched() || Gdx.input.isKeyPressed(Keys.ENTER) || Gdx.input.isKeyPressed(Keys.SPACE)) { - GDXAppVrGem4.INSTANCE.terminal.selectScreen(getNextScreen(GDXAppVrGem4.INSTANCE)); + terminal.selectScreen(getNextScreen()); } } } diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenCredits.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenCredits.java index 87cd0b7c..ab3655bf 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenCredits.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenCredits.java @@ -3,7 +3,7 @@ package love.distributedrebirth.gdxapp4d.vrgem4.screen; import com.badlogic.gdx.Screen; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.gdxapp4d.vrgem4.GDXAppVrGem4; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenCredits extends AbstractScrollScreen { @@ -62,8 +62,8 @@ public class ScreenCredits extends AbstractScrollScreen { " " ); - public ScreenCredits() { - super("background/doom-credits.png"); + public ScreenCredits(SystemGdxTerminal terminal) { + super(terminal, "background/doom-credits.png"); } @Override @@ -72,7 +72,7 @@ public class ScreenCredits extends AbstractScrollScreen { } @Override - protected Class getNextScreen(GDXAppVrGem4 main) { + protected Class getNextScreen() { return ScreenDesktop1.class; } 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 403b9f6b..dc97a949 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 @@ -15,6 +15,7 @@ import com.badlogic.gdx.utils.Array; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; import love.distributedrebirth.gdxapp4d.vrgem4.VrGem4DeskAppServiceImpl; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @@ -23,8 +24,8 @@ public class ScreenDesktop1 extends AbstractScreenDesktop { private Model background; private Model grid; - public ScreenDesktop1(SystemGdxBootArgs bootArgs, VrGem4DeskAppServiceImpl deskAppService) { - super("Desktop1", bootArgs, deskAppService); + public ScreenDesktop1(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) { + super("Desktop1", bootArgs, terminal, deskAppService); } 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 cae569b7..af825aef 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 @@ -15,6 +15,7 @@ import com.badlogic.gdx.utils.Array; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; import love.distributedrebirth.gdxapp4d.vrgem4.VrGem4DeskAppServiceImpl; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @@ -23,8 +24,8 @@ public class ScreenDesktop2 extends AbstractScreenDesktop { private Model background; private Model grid; - public ScreenDesktop2(SystemGdxBootArgs bootArgs, VrGem4DeskAppServiceImpl deskAppService) { - super("Desktop2", bootArgs, deskAppService); + public ScreenDesktop2(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) { + super("Desktop2", bootArgs, terminal, deskAppService); } protected void createModel(ModelBuilder modelBuilder, Array modelInstances) { 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 bbcc03e4..ef6813b8 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 @@ -15,6 +15,7 @@ import com.badlogic.gdx.utils.Array; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; import love.distributedrebirth.gdxapp4d.vrgem4.VrGem4DeskAppServiceImpl; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @@ -23,8 +24,8 @@ public class ScreenDesktop3 extends AbstractScreenDesktop { private Model background; private Model grid; - public ScreenDesktop3(SystemGdxBootArgs bootArgs, VrGem4DeskAppServiceImpl deskAppService) { - super("Desktop3", bootArgs, deskAppService); + public ScreenDesktop3(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) { + super("Desktop3", bootArgs, terminal, deskAppService); } protected void createModel(ModelBuilder modelBuilder, Array modelInstances) { 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 d9aca506..c5f7384f 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 @@ -21,6 +21,7 @@ import com.badlogic.gdx.utils.viewport.ScreenViewport; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; import love.distributedrebirth.gdxapp4d.vrgem4.VrGem4DeskAppServiceImpl; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @@ -37,8 +38,8 @@ public class ScreenDesktop4 extends AbstractScreenDesktop { private float colorFade = 0f; private boolean colorPositive = true; - public ScreenDesktop4(SystemGdxBootArgs bootArgs, VrGem4DeskAppServiceImpl deskAppService) { - super("Desktop4", bootArgs, deskAppService); + public ScreenDesktop4(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) { + super("Desktop4", bootArgs, terminal, deskAppService); shader = new UserColorShader(); shader.init(); font = new BitmapFont(); diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenHelp.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenHelp.java index a74f750c..077ea1dd 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenHelp.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenHelp.java @@ -3,7 +3,7 @@ package love.distributedrebirth.gdxapp4d.vrgem4.screen; import com.badlogic.gdx.Screen; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.gdxapp4d.vrgem4.GDXAppVrGem4; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenHelp extends AbstractScrollScreen { @@ -45,8 +45,8 @@ public class ScreenHelp extends AbstractScrollScreen { " " ); - public ScreenHelp() { - super("background/terrydavis-nose.png"); + public ScreenHelp(SystemGdxTerminal terminal) { + super(terminal, "background/terrydavis-nose.png"); } @Override @@ -55,7 +55,7 @@ public class ScreenHelp extends AbstractScrollScreen { } @Override - protected Class getNextScreen(GDXAppVrGem4 main) { + protected Class getNextScreen() { return ScreenDesktop1.class; } diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenIntroMission.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenIntroMission.java index d6465083..7579fbc0 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenIntroMission.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenIntroMission.java @@ -3,7 +3,7 @@ package love.distributedrebirth.gdxapp4d.vrgem4.screen; import com.badlogic.gdx.Screen; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.gdxapp4d.vrgem4.GDXAppVrGem4; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenIntroMission extends AbstractScrollScreen { @@ -55,8 +55,8 @@ public class ScreenIntroMission extends AbstractScrollScreen { - public ScreenIntroMission() { - super("background/terrydavis-nose.png"); + public ScreenIntroMission(SystemGdxTerminal terminal) { + super(terminal, "background/terrydavis-nose.png"); } @Override @@ -65,7 +65,7 @@ public class ScreenIntroMission extends AbstractScrollScreen { } @Override - protected Class getNextScreen(GDXAppVrGem4 main) { + protected Class getNextScreen() { return ScreenDesktop1.class; } diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/DeskTopScreenMenu.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/DeskTopScreenMenu.java index 103c5dc7..f49ba8ab 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/DeskTopScreenMenu.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/DeskTopScreenMenu.java @@ -9,8 +9,8 @@ import imgui.ImGui; import imgui.type.ImBoolean; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal; import love.distributedrebirth.gdxapp4d.vrgem4.FontAwesomeIcons; -import love.distributedrebirth.gdxapp4d.vrgem4.GDXAppVrGem4; import love.distributedrebirth.gdxapp4d.vrgem4.VrGem4DeskAppServiceImpl; import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenCredits; import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenDesktop1; @@ -32,14 +32,16 @@ import love.distributedrebirth.gdxapp4d.vrgem4.view.apps.Unicode4DApp; public class DeskTopScreenMenu { private SystemGdxBootArgs bootArgs; + private SystemGdxTerminal terminal; private VrGem4DeskAppServiceImpl deskAppService; private List apps; private ImBoolean fileMinimizeSelected = new ImBoolean(false); private ImBoolean fileCloseSelected = new ImBoolean(false); private ImBoolean tosSelfSelected = new ImBoolean(false); - public DeskTopScreenMenu(SystemGdxBootArgs bootArgs, VrGem4DeskAppServiceImpl deskAppService) { + public DeskTopScreenMenu(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) { this.bootArgs = bootArgs; + this.terminal = terminal; this.deskAppService = deskAppService; apps = new ArrayList<>(); apps.add(new DeskAppLauncher("Sys Glyph Set", () -> new SystemBaseGlyphApp())); @@ -201,16 +203,16 @@ public class DeskTopScreenMenu { infix4 = FontAwesomeIcons.Eye + " "; } if (ImGui.menuItem(infix1+"Desktop1")) { - GDXAppVrGem4.INSTANCE.terminal.selectScreen(ScreenDesktop1.class); + terminal.selectScreen(ScreenDesktop1.class); } if (ImGui.menuItem(infix2+"Desktop2")) { - GDXAppVrGem4.INSTANCE.terminal.selectScreen(ScreenDesktop2.class); + terminal.selectScreen(ScreenDesktop2.class); } if (ImGui.menuItem(infix3+"Desktop3")) { - GDXAppVrGem4.INSTANCE.terminal.selectScreen(ScreenDesktop3.class); + terminal.selectScreen(ScreenDesktop3.class); } if (ImGui.menuItem(infix4+"Desktop4")) { - GDXAppVrGem4.INSTANCE.terminal.selectScreen(ScreenDesktop4.class); + terminal.selectScreen(ScreenDesktop4.class); } ImGui.separator(); if (ImGui.beginMenu(FontAwesomeIcons.PlusSquare + " Start App")) { @@ -271,10 +273,10 @@ public class DeskTopScreenMenu { } } if (ImGui.menuItem(FontAwesomeIcons.CreditCard + " Credits")) { - GDXAppVrGem4.INSTANCE.terminal.selectScreen(ScreenCredits.class); + terminal.selectScreen(ScreenCredits.class); } if (ImGui.menuItem(FontAwesomeIcons.HandsHelping + " Help")) { - GDXAppVrGem4.INSTANCE.terminal.selectScreen(ScreenHelp.class); + terminal.selectScreen(ScreenHelp.class); } ImGui.separator(); if (ImGui.menuItem(FontAwesomeIcons.Trademark + " ImGui Demo")) { diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/apps/Unicode4DApp.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/apps/Unicode4DApp.java index 24a7062c..4ab3fd20 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/apps/Unicode4DApp.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/apps/Unicode4DApp.java @@ -7,7 +7,6 @@ import imgui.ImDrawList; import imgui.ImGui; import imgui.ImVec2; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.gdxapp4d.vrgem4.GDXAppVrGem4; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.AbstractDeskApp; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppContourSection; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppRenderer;