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

Moved unicode to boot message

Browse source
This commit is contained in:
Willem Cazander 2022-03-20 00:19:26 +01:00
parent 2a94f7a001
commit d700e54f16
2 changed files with 109 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenDesktop4;
import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenHelp; import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenHelp;
import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenIntroMission; import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenIntroMission;
import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService; import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService;
import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4Unicode4DService;
import love.distributedrebirth.numberxd.base2t.Base2PartsFactory; import love.distributedrebirth.numberxd.base2t.Base2PartsFactory;
import love.distributedrebirth.numberxd.base2t.Base2Terminator; import love.distributedrebirth.numberxd.base2t.Base2Terminator;
import love.distributedrebirth.numberxd.base2t.Base2WarpCore; import love.distributedrebirth.numberxd.base2t.Base2WarpCore;
@ -71,121 +72,21 @@ public class GDXAppVrGem4Activator implements BundleActivator {
ServiceReference<SystemWarpShip> systemWarpShipRef = context.getServiceReference(SystemWarpShip.class); ServiceReference<SystemWarpShip> systemWarpShipRef = context.getServiceReference(SystemWarpShip.class);
SystemWarpShip systemWarpShip = context.getService(systemWarpShipRef); SystemWarpShip systemWarpShip = context.getService(systemWarpShipRef);
logger.info(this, "Booting");
GDXAppVrGem4BootScreen bootScreen = new GDXAppVrGem4BootScreen(gdxFont.getFont());
Gdx.app.postRunnable(new Runnable() {
@Override
public void run() {
bootScreen.create();
terminal.registrateScreen(bootScreen);
terminal.selectScreen(GDXAppVrGem4BootScreen.class);
}
});
try {
Thread.sleep(100);
} catch (InterruptedException ignored) {
}
bootScreen.bootLine("==========================");
bootScreen.bootLine(" @Ω仙⁴ ˧꜏⋇꜊꜔ ⁴ﷲΩ@ ");
bootScreen.bootLine(" ©Δ∞ 仙上主天 ");
bootScreen.bootLine("בְּרֵאשִׁית :o: יְסוֺד :o: יִשְׂרָאֵל");
bootScreen.bootLine("==========================");
bootScreen.bootLine("Boot: vrGEM⁴ - TOS⁴ - MSX⁴");
// ref to init
for (DefaultEnumBaseᴶᴹˣ<?,?> coffin:coffinInstances()) {
BãßBȍőnCoffinOpenʸᴰ.lockCoffin(coffin, v -> bootScreen.bootLine(v));
}
bootScreen.bootLine("BãßBȍőnCoffinʸᴰ init done.");
List<File> fonts = systemWarpShip.searchMagic(context, "application/x-font-ttf-plane0");
bootScreen.bootLine("ImGui Setup");
ImBoolean imLoaded = new ImBoolean(false);
Gdx.app.postRunnable(new Runnable() {
@Override
public void run() {
imguiSetup.init(fonts, v -> {
logger.info(imguiSetup, v);
bootScreen.bootLine(v);
});
imLoaded.set(true);
}
});
while (!imLoaded.get()) {
try {
Thread.sleep(100);
} catch (InterruptedException ignored) {
}
}
bootScreen.bootLine("ImGui Loaded");
ServiceReference<SystemGdxBootArgs> bootArgsRef = context.getServiceReference(SystemGdxBootArgs.class); ServiceReference<SystemGdxBootArgs> bootArgsRef = context.getServiceReference(SystemGdxBootArgs.class);
SystemGdxBootArgs bootArgs = context.getService(bootArgsRef); SystemGdxBootArgs bootArgs = context.getService(bootArgsRef);
/* logger.info(this, "Booting");
bootScreen.bootLine("warpcore: Check request"); GDXAppVrGem4BootScreen bootScreen = createBootScreen(terminal, gdxFont);
try {
if (args.contains("warpcore-load")) {
bootScreen.bootLine("warpcore-load: requested");
WaterBucket bucket = WaterBucketDriver.newInstance().createReader().readFile("./warpcore.xml");
TOSWarpCore.INSTANCE.BãßArmWarpCore(bucket);
}
if (args.contains("warpcore-save")) {
bootScreen.bootLine("warpcore-save: requested");
WaterBucket bucket = TOSWarpCore.INSTANCE.BãßCurrentWarpCore();
WaterBucketDriver.newInstance().createWriter().writeFile(bucket, "./warpcore.xml");
}
} catch (Exception e) {
throw new RuntimeException(e);
}
*/
if (!bootArgs.isWarpCoreNoLock()) {
bootScreen.bootLine("warpcore-lock: BãßLockWarpCipher");
Base2WarpCore.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() {
@Override
public void run() {
Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode());
}
});
}
*/
bootScreen.bootLine("vrGEM⁴: init");
//GDXAppVrGem4.INSTANCE.init(terminal);
printBootLogo(bootScreen);
lockCoffins(bootScreen);
startImGui(bootScreen, context, systemWarpShip);
startWarpCore(bootScreen, bootArgs);
VrGem4DeskAppServiceImpl deskAppService = new VrGem4DeskAppServiceImpl(); VrGem4DeskAppServiceImpl deskAppService = new VrGem4DeskAppServiceImpl();
context.registerService(VrGem4DeskAppService.class.getName(), deskAppService, new Hashtable<String, String>()); context.registerService(VrGem4DeskAppService.class.getName(), deskAppService, new Hashtable<String, String>());
bootScreen.bootLine("terminal: added screens"); startTerminalScreens(bootScreen, bootArgs, terminal, deskAppService);
Gdx.app.postRunnable(new Runnable() {
@Override
public void run() {
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 {
Thread.sleep(100);
} catch (InterruptedException ignored) {
}
List<SystemWarpSea> registratedSeas = new ArrayList<>(); List<SystemWarpSea> registratedSeas = new ArrayList<>();
int result = 0; int result = 0;
@ -224,6 +125,97 @@ public class GDXAppVrGem4Activator implements BundleActivator {
} }
}); });
VrGem4Unicode4DServiceImpl unicodeService = new VrGem4Unicode4DServiceImpl();
unicodeService.init(context, systemWarpShip, (v) -> bootScreen.bootLine(v));
context.registerService(VrGem4Unicode4DService.class.getName(), unicodeService, new Hashtable<String, String>());
startBundles(bootScreen);
}
private GDXAppVrGem4BootScreen createBootScreen(SystemGdxTerminal terminal, SystemGdxFont gdxFont) {
GDXAppVrGem4BootScreen bootScreen = new GDXAppVrGem4BootScreen(gdxFont.getFont());
Gdx.app.postRunnable(new Runnable() {
@Override
public void run() {
bootScreen.create();
terminal.registrateScreen(bootScreen);
terminal.selectScreen(GDXAppVrGem4BootScreen.class);
}
});
try {
Thread.sleep(100);
} catch (InterruptedException ignored) {
}
return bootScreen;
}
private void printBootLogo(GDXAppVrGem4BootScreen bootScreen) {
bootScreen.bootLine("==========================");
bootScreen.bootLine(" @Ω仙⁴ ˧꜏⋇꜊꜔ ⁴ﷲΩ@ ");
bootScreen.bootLine(" ©Δ∞ 仙上主天 ");
bootScreen.bootLine("בְּרֵאשִׁית :o: יְסוֺד :o: יִשְׂרָאֵל");
bootScreen.bootLine("==========================");
bootScreen.bootLine("Boot: MSX⁴ - TOS⁴ - vrGEM⁴");
}
private void lockCoffins(GDXAppVrGem4BootScreen bootScreen) {
// ref to init
for (DefaultEnumBaseᴶᴹˣ<?,?> coffin:coffinInstances()) {
BãßBȍőnCoffinOpenʸᴰ.lockCoffin(coffin, v -> bootScreen.bootLine(v));
}
bootScreen.bootLine("BãßBȍőnCoffinʸᴰ init done.");
}
private void startImGui(GDXAppVrGem4BootScreen bootScreen, BundleContext context, SystemWarpShip systemWarpShip) {
List<File> fonts = systemWarpShip.searchMagic(context, "application/x-font-ttf-plane0");
bootScreen.bootLine("ImGui Setup");
ImBoolean imLoaded = new ImBoolean(false);
Gdx.app.postRunnable(new Runnable() {
@Override
public void run() {
imguiSetup.init(fonts, v -> bootScreen.bootLine(v));
imLoaded.set(true);
}
});
while (!imLoaded.get()) {
try {
Thread.sleep(100);
} catch (InterruptedException ignored) {
}
}
bootScreen.bootLine("ImGui Loaded");
}
private void startWarpCore(GDXAppVrGem4BootScreen bootScreen, SystemGdxBootArgs bootArgs) {
if (!bootArgs.isWarpCoreNoLock()) {
bootScreen.bootLine("warpcore-lock: BãßLockWarpCipher");
Base2WarpCore.INSTANCE.BãßLockWarpCipher(v -> {});
} else {
bootScreen.bootLine("warpcore-nolock: requested");
}
}
private void startTerminalScreens(GDXAppVrGem4BootScreen bootScreen, SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) {
bootScreen.bootLine("vrGEM⁴: add terminal screens");
Gdx.app.postRunnable(new Runnable() {
@Override
public void run() {
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 {
Thread.sleep(100);
} catch (InterruptedException ignored) {
}
}
private void startBundles(GDXAppVrGem4BootScreen bootScreen) {
try { try {
Thread.sleep(VIEW_SLEEP_TIME); Thread.sleep(VIEW_SLEEP_TIME);
} catch (InterruptedException ignored) { } catch (InterruptedException ignored) {

37
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/VrGem4Unicode4DServiceImpl.java
View file

@ -4,14 +4,10 @@ import java.io.File;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Consumer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
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.SystemGdxLog;
import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpShip; import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpShip;
import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4Unicode4DService; import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4Unicode4DService;
import love.distributedrebirth.unicode4d.CodePointᶻᴰ; import love.distributedrebirth.unicode4d.CodePointᶻᴰ;
@ -21,44 +17,35 @@ import love.distributedrebirth.unicode4d.atlas.FontAtlasStore;
import love.distributedrebirth.unicode4d.atlas.FontAtlasStoreGlyph; import love.distributedrebirth.unicode4d.atlas.FontAtlasStoreGlyph;
import love.distributedrebirth.unicode4d.draw.DrawCharacter; import love.distributedrebirth.unicode4d.draw.DrawCharacter;
@Component
public class VrGem4Unicode4DServiceImpl implements VrGem4Unicode4DService { public class VrGem4Unicode4DServiceImpl implements VrGem4Unicode4DService {
private final FontAtlas masterFontAtlas; private final FontAtlas masterFontAtlas;
private final Map<Integer, FontAtlasStoreGlyph> unicodeMap; private final Map<Integer, FontAtlasStoreGlyph> unicodeMap;
private final Map<Integer, DrawCharacter> unicodeCharMap; private final Map<Integer, DrawCharacter> unicodeCharMap;
@Reference
private SystemGdxLog log;
@Reference
private SystemWarpShip warpShip;
public VrGem4Unicode4DServiceImpl() { public VrGem4Unicode4DServiceImpl() {
masterFontAtlas = new FontAtlas(); masterFontAtlas = new FontAtlas();
unicodeMap = new HashMap<>(); unicodeMap = new HashMap<>();
unicodeCharMap = new HashMap<>(); unicodeCharMap = new HashMap<>();
} }
@Activate public void init(final BundleContext context, SystemWarpShip warpShip, Consumer<String> log) {
void open(final BundleContext context) {
log.debug(this, SystemGdxLog.ACTIVATE);
List<File> glyps = warpShip.searchMagic(context, "application/x-font-ttf4d"); List<File> glyps = warpShip.searchMagic(context, "application/x-font-ttf4d");
try { try {
for (File glypSet:glyps) { for (File glypSet:glyps) {
log.debug(this, "Loading glypSet: {}", glypSet); log.accept("Loading glypSet: "+glypSet);
FontAtlas atlas = FontAtlasDriver.newInstance().createReader().readFile(glypSet); FontAtlas atlas = FontAtlasDriver.newInstance().createReader().readFile(glypSet);
masterFontAtlas.setStores(atlas.getStores()); masterFontAtlas.setStores(atlas.getStores());
} }
} catch (Exception e) { } catch (Exception e) {
log.error(this, e.getMessage(), e); e.printStackTrace();
log.accept("ERROR: "+e.getMessage());
} }
log.info(this, "Master font atlas size: {}", masterFontAtlas.getStores().size()); log.accept("Master font atlas size: "+masterFontAtlas.getStores().size());
int dup = 0; int dup = 0;
for (FontAtlasStore fontStore:masterFontAtlas.getStores()) { for (FontAtlasStore fontStore:masterFontAtlas.getStores()) {
log.info(this,"Map unicode: {} size: {}", fontStore.getName(), fontStore.getGlyphs().size()); log.accept("Map unicode: "+fontStore.getName()+" size: "+fontStore.getGlyphs().size());
for (FontAtlasStoreGlyph glyph: fontStore.getGlyphs()) { for (FontAtlasStoreGlyph glyph: fontStore.getGlyphs()) {
int unicode = CodePointᶻᴰ.INSTANCE.searchUnicode(glyph.getTongs()); int unicode = CodePointᶻᴰ.INSTANCE.searchUnicode(glyph.getTongs());
if (unicodeMap.containsKey(unicode)) { if (unicodeMap.containsKey(unicode)) {
@ -70,17 +57,13 @@ public class VrGem4Unicode4DServiceImpl implements VrGem4Unicode4DService {
try { try {
unicodeCharMap.put(unicode, new DrawCharacter(glyph)); unicodeCharMap.put(unicode, new DrawCharacter(glyph));
} catch (Exception e) { } catch (Exception e) {
log.error(this, e.getMessage(), e); e.printStackTrace();
log.accept("ERROR: "+e.getMessage());
} }
} }
} }
} }
log.info(this, "unicode map size: {} dups: {}", unicodeMap.size(), dup); log.accept("unicode map size: "+unicodeMap.size()+" dups: "+dup);
}
@Deactivate
void close() {
log.debug(this, SystemGdxLog.DEACTIVATE);
} }
@Override @Override