arch-jedi/gdxapp4d
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed GDXappVrGem4 instance

Browse source
This commit is contained in:
Willem Cazander 2022-03-08 00:26:26 +01:00
parent b9f6cedace
commit 2f4353cf3d
13 changed files with 51 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4.java
View file

@ -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ᴶᴹˣ<GDXAppVrGem4,GDXAppVrGem4Keyʸᴰ> {
INSTANCE;
public SystemGdxTerminal terminal;
//public MusicManager music;
//public FontAtlas basePlane;
private final BãßBȍőnCoffinOpenʸᴰ<GDXAppVrGem4Keyʸᴰ> BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance();
public BãßBȍőnCoffinʸᴰ<GDXAppVrGem4Keyʸᴰ> 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;
}
}

17
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java
View file

@ -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 extends DefaultEnumBaseᴶᴹˣ<?,?>> T[] coffinInstances() {
return (T[]) new DefaultEnumBaseᴶᴹˣ[] {
GDXAppVrGem4.INSTANCE,
BaseGlyphSet.values()[0],
Base2Terminator.INSTANCE,
Base2PartsFactory.INSTANCE,

5
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/AbstractScreenDesktop.java
View file

@ -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<ModelInstance> modelInstances = new Array<ModelInstance>();
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() {

10
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/AbstractScrollScreen.java
View file

@ -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<? extends Screen> getNextScreen(GDXAppVrGem4 main);
abstract protected Class<? extends Screen> 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());
}
}
}

8
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenCredits.java
View file

@ -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<? extends Screen> getNextScreen(GDXAppVrGem4 main) {
protected Class<? extends Screen> getNextScreen() {
return ScreenDesktop1.class;
}

5
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop1.java
View file

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

5
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop2.java
View file

@ -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<ModelInstance> modelInstances) {

5
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop3.java
View file

@ -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<ModelInstance> modelInstances) {

5
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop4.java
View file

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

8
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenHelp.java
View file

@ -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<? extends Screen> getNextScreen(GDXAppVrGem4 main) {
protected Class<? extends Screen> getNextScreen() {
return ScreenDesktop1.class;
}

8
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenIntroMission.java
View file

@ -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<? extends Screen> getNextScreen(GDXAppVrGem4 main) {
protected Class<? extends Screen> getNextScreen() {
return ScreenDesktop1.class;
}

18
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/DeskTopScreenMenu.java
View file

@ -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<DeskAppLauncher> 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")) {

1
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/apps/Unicode4DApp.java
View file

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