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

Added SystemGdxFont

Browse source
This commit is contained in:
Willem Cazander 2022-03-03 00:50:26 +01:00
parent c6bee21cee
commit b619004477
20 changed files with 146 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gdxapp4d-vrgem4/pom.xml
View file

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

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

@ -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ᴶᴹˣ<GDXAppVrGem4,GDX
INSTANCE;
public SystemWarpTerminal terminal;
public SystemGdxTerminal terminal;
public MusicManager music;
//public FontAtlas basePlane;
private final BãßBȍőnCoffinOpenʸᴰ<GDXAppVrGem4Keyʸᴰ> BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance();
@ -30,13 +30,9 @@ public enum GDXAppVrGem4 implements DefaultEnumInstanceᴶᴹˣ<GDXAppVrGem4,GDX
BȍőnJmxInit(GDXAppVrGem4Keyʸᴰ.JMX);
}
public void init(List<String> 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;
}

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

@ -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<SystemWarpTerminal> termRef = context.getServiceReference(SystemWarpTerminal.class);
SystemWarpTerminal terminal = context.getService(termRef);
ServiceReference<SystemGdxTerminal> termRef = context.getServiceReference(SystemGdxTerminal.class);
SystemGdxTerminal terminal = context.getService(termRef);
GDXAppVrGem4BootScreen bootScreen = new GDXAppVrGem4BootScreen();
ServiceReference<SystemGdxFont> 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<SystemWarpBootArgs> bootArgsRef = context.getServiceReference(SystemWarpBootArgs.class);
SystemWarpBootArgs bootArgs = context.getService(bootArgsRef);
List<String> args = bootArgs.getBootArgs();
ServiceReference<SystemGdxBootArgs> 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() {

6
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4BootScreen.java
View file

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

4
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/TestComponent.java
View file

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

8
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/desktop/DeskTopScreenMenu.java
View file

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

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

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

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

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

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

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

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

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

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

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