diff --git a/gdxapp4d-app-glyphdemo/pom.xml b/gdxapp4d-app-glyphdemo/pom.xml new file mode 100644 index 00000000..006d981a --- /dev/null +++ b/gdxapp4d-app-glyphdemo/pom.xml @@ -0,0 +1,119 @@ + + 4.0.0 + + love.distributedrebirth.gdxapp4d + gdxapp4d + 0.0.1-SNAPSHOT + + gdxapp4d-app-glyphdemo + bundle + + + love.distributedrebirth.gdxapp4d + gdxapp4d-vrgem4 + ${project.version} + provided + + + + + + org.apache.felix + maven-bundle-plugin + true + + true + true + + <_donotcopy>(.git) + <_dsannotations>* + <_metatypeannotations>* + + org.osgi.framework, + org.osgi.service.packageadmin, + org.osgi.service.url, + org.osgi.service.startlevel, + org.osgi.util.tracker, + love.distributedrebirth.gdxapp4d.tos4.service, + love.distributedrebirth.gdxapp4d.vrgem4.service, + love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp, + com.badlogic.gdx, + com.badlogic.gdx.assets, + com.badlogic.gdx.assets.loaders, + com.badlogic.gdx.assets.loaders.resolvers, + com.badlogic.gdx.audio, + 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, + com.badlogic.gdx.graphics.g3d.environment, + com.badlogic.gdx.graphics.g3d.loader, + com.badlogic.gdx.graphics.g3d.model, + com.badlogic.gdx.graphics.g3d.model.data, + com.badlogic.gdx.graphics.g3d.particles, + com.badlogic.gdx.graphics.g3d.particles.bactches, + com.badlogic.gdx.graphics.g3d.particles.emitters, + com.badlogic.gdx.graphics.g3d.particles.influencers, + com.badlogic.gdx.graphics.g3d.particles.renderers, + com.badlogic.gdx.graphics.g3d.particles.values, + com.badlogic.gdx.graphics.g3d.shaders, + com.badlogic.gdx.graphics.g3d.utils, + com.badlogic.gdx.graphics.g3d.utils.shapebuilders, + com.badlogic.gdx.graphics.glutils, + com.badlogic.gdx.graphics.profiling, + com.badlogic.gdx.input, + com.badlogic.gdx.maps, + com.badlogic.gdx.maps.objects, + com.badlogic.gdx.maps.tiled, + com.badlogic.gdx.maps.tiled.objects, + com.badlogic.gdx.maps.tiled.renderers, + com.badlogic.gdx.maps.tiled.tiles, + com.badlogic.gdx.math, + com.badlogic.gdx.math.collision, + com.badlogic.gdx.net, + com.badlogic.gdx.scenes.scene2d, + com.badlogic.gdx.scenes.scene2d.actions, + com.badlogic.gdx.scenes.scene2d.ui, + com.badlogic.gdx.scenes.scene2d.utils, + com.badlogic.gdx.utils, + com.badlogic.gdx.utils.async, + com.badlogic.gdx.utils.compression, + com.badlogic.gdx.utils.compression.lz, + com.badlogic.gdx.utils.compression.lzma, + com.badlogic.gdx.utils.compression.rangecoder, + com.badlogic.gdx.utils.reflect, + com.badlogic.gdx.utils.viewport, + imgui, + imgui.flag, + imgui.glfw, + imgui.gl3, + imgui.type, + net.spookygames.gdx.nativefilechooser, + love.distributedrebirth.bassboonyd, + love.distributedrebirth.bassboonyd.jmx, + love.distributedrebirth.numberxd, + love.distributedrebirth.numberxd.base2t, + love.distributedrebirth.numberxd.base2t.part, + love.distributedrebirth.numberxd.base2t.part.warp, + love.distributedrebirth.numberxd.base2t.type, + love.distributedrebirth.numberxd.base2t.typexl, + love.distributedrebirth.numberxd.glyph, + love.distributedrebirth.numberxd.x4o, + love.distributedrebirth.warpme, + love.distributedrebirth.warpme.core, + love.distributedrebirth.warpme.hash, + love.distributedrebirth.warpme.sea, + love.distributedrebirth.warpme.ship, + love.distributedrebirth.unicode4d, + love.distributedrebirth.unicode4d.atlas + + distributedrebirth.love + + + + + + \ No newline at end of file diff --git a/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/GlyphDemoComponent.java b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/GlyphDemoComponent.java new file mode 100644 index 00000000..0d0d5d94 --- /dev/null +++ b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/GlyphDemoComponent.java @@ -0,0 +1,54 @@ +package love.distributedrebirth.gdxapp4d.app.glyphdemo; + +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.app.glyphdemo.apps.DemoUnicodePlaneDeskApp; +import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoGlyphSetDeskApp; +import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoNumberPartDeskApp; +import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxLog; +import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService; +import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4LocaleService; +import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppLauncher; +import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppMenuSection; + +@Component +public class GlyphDemoComponent { + + @Reference + private SystemGdxLog log; + + @Reference + private VrGem4DeskAppService deskAppService; + + @Reference + private VrGem4LocaleService localeService; + + private final DeskAppLauncher unicodeLauncher; + private final DeskAppLauncher baseGlyphLauncher; + private final DeskAppLauncher basePartLauncher; + + public GlyphDemoComponent() { + unicodeLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Demo Unicode Plane", () -> new DemoUnicodePlaneDeskApp(localeService)); + baseGlyphLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Demo Glyph Set", () -> new DemoGlyphSetDeskApp(localeService)); + basePartLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Demo Number Parts", () -> new DemoNumberPartDeskApp(localeService)); + } + + @Activate + void open() { + log.debug(this, SystemGdxLog.ACTIVATE); + deskAppService.installDeskApp(unicodeLauncher); + deskAppService.installDeskApp(baseGlyphLauncher); + deskAppService.installDeskApp(basePartLauncher); + } + + @Deactivate + void close() { + log.debug(this, SystemGdxLog.DEACTIVATE); + deskAppService.removeDeskApp(unicodeLauncher); + deskAppService.removeDeskApp(baseGlyphLauncher); + deskAppService.removeDeskApp(basePartLauncher); + } +} diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/apps/SystemBaseGlyphApp.java b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoGlyphSetDeskApp.java similarity index 84% rename from gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/apps/SystemBaseGlyphApp.java rename to gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoGlyphSetDeskApp.java index 5711ec39..801a18fb 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/apps/SystemBaseGlyphApp.java +++ b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoGlyphSetDeskApp.java @@ -1,25 +1,30 @@ -package love.distributedrebirth.gdxapp4d.vrgem4.view.apps; +package love.distributedrebirth.gdxapp4d.app.glyphdemo.apps; -import java.util.Locale; import java.util.ResourceBundle; import imgui.ImGui; import imgui.flag.ImGuiTableFlags; import imgui.type.ImBoolean; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4LocaleService; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.AbstractDeskApp; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppContourSection; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppRenderer; import love.distributedrebirth.numberxd.glyph.BaseGlyphSet; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class SystemBaseGlyphApp extends AbstractDeskApp { +public class DemoGlyphSetDeskApp extends AbstractDeskApp { + private final VrGem4LocaleService localeService; private final ImBoolean showBase27 = new ImBoolean(false); + public DemoGlyphSetDeskApp(VrGem4LocaleService localeService) { + this.localeService = localeService; + } + private String getTxt(String key) { - ResourceBundle bundle = ResourceBundle.getBundle("love.distributedrebirth.gdxapp.Main", new Locale("en")); - return bundle.getString("SystemBaseGlyphApp."+key); + ResourceBundle bundle = ResourceBundle.getBundle("love.distributedrebirth.gdxapp4d.app.glyphdemo.Main", localeService.getTextLocale()); + return bundle.getString(DemoGlyphSetDeskApp.class.getSimpleName()+"."+key); } public void create() { diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/apps/SystemBasePartApp.java b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoNumberPartDeskApp.java similarity index 92% rename from gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/apps/SystemBasePartApp.java rename to gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoNumberPartDeskApp.java index 4db96e81..55f77990 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/apps/SystemBasePartApp.java +++ b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoNumberPartDeskApp.java @@ -1,8 +1,7 @@ -package love.distributedrebirth.gdxapp4d.vrgem4.view.apps; +package love.distributedrebirth.gdxapp4d.app.glyphdemo.apps; import java.util.ArrayList; import java.util.List; -import java.util.Locale; import java.util.ResourceBundle; import imgui.ImGui; @@ -10,6 +9,7 @@ import imgui.flag.ImGuiTableFlags; import imgui.type.ImBoolean; import imgui.type.ImInt; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4LocaleService; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.AbstractDeskApp; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppContourSection; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppRenderer; @@ -22,16 +22,21 @@ import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartʸᴰ; import love.distributedrebirth.numberxd.glyph.BaseGlyphSet; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class SystemBasePartApp extends AbstractDeskApp implements DeskAppRenderer { +public class DemoNumberPartDeskApp extends AbstractDeskApp implements DeskAppRenderer { + private final VrGem4LocaleService localeService; private ImInt selectedBasePart = new ImInt(); private final ImBoolean showBase10 = new ImBoolean(false); private final ImBoolean showBase16 = new ImBoolean(false); private final ImBoolean showBase27 = new ImBoolean(false); + public DemoNumberPartDeskApp(VrGem4LocaleService localeService) { + this.localeService = localeService; + } + private String getTxt(String key) { - ResourceBundle bundle = ResourceBundle.getBundle("love.distributedrebirth.gdxapp.Main", new Locale("en")); - return bundle.getString("SystemBasePartApp."+key); + ResourceBundle bundle = ResourceBundle.getBundle("love.distributedrebirth.gdxapp4d.app.glyphdemo.Main", localeService.getTextLocale()); + return bundle.getString(DemoNumberPartDeskApp.class.getSimpleName()+"."+key); } public void create() { diff --git a/gdxapp4d-vrsys5/src/main/java/love/distributedrebirth/gdxapp4d/vrsys5/apps/BaseUnicodePlaneDeskApp.java b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoUnicodePlaneDeskApp.java similarity index 84% rename from gdxapp4d-vrsys5/src/main/java/love/distributedrebirth/gdxapp4d/vrsys5/apps/BaseUnicodePlaneDeskApp.java rename to gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoUnicodePlaneDeskApp.java index a801dc91..33ec5d30 100644 --- a/gdxapp4d-vrsys5/src/main/java/love/distributedrebirth/gdxapp4d/vrsys5/apps/BaseUnicodePlaneDeskApp.java +++ b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoUnicodePlaneDeskApp.java @@ -1,6 +1,5 @@ -package love.distributedrebirth.gdxapp4d.vrsys5.apps; +package love.distributedrebirth.gdxapp4d.app.glyphdemo.apps; -import java.util.Locale; import java.util.ResourceBundle; import imgui.ImGui; @@ -13,18 +12,17 @@ import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppRenderer; import love.distributedrebirth.unicode4d.UnicodePlaneᶻᴰ; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class BaseUnicodePlaneDeskApp extends AbstractDeskApp implements DeskAppRenderer { +public class DemoUnicodePlaneDeskApp extends AbstractDeskApp implements DeskAppRenderer { private final VrGem4LocaleService localeService; - public BaseUnicodePlaneDeskApp(VrGem4LocaleService localeService) { + public DemoUnicodePlaneDeskApp(VrGem4LocaleService localeService) { this.localeService = localeService; } private String getTxt(String key) { - Locale loc = localeService.getTextLocale(); - ResourceBundle bundle = ResourceBundle.getBundle("love.distributedrebirth.gdxapp4d.vrsys5.Main", loc); - return bundle.getString("SystemBaseUnicodePlaneApp."+key); + ResourceBundle bundle = ResourceBundle.getBundle("love.distributedrebirth.gdxapp4d.app.glyphdemo.Main", localeService.getTextLocale()); + return bundle.getString(DemoUnicodePlaneDeskApp.class.getSimpleName()+"."+key); } public void create() { diff --git a/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Main.properties b/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Main.properties new file mode 100644 index 00000000..a432e91a --- /dev/null +++ b/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Main.properties @@ -0,0 +1,18 @@ +DemoGlyphSetDeskApp.title=Demo Glyph Set +DemoGlyphSetDeskApp.showBase27=Show base27 +DemoGlyphSetDeskApp.colScript=Script +DemoGlyphSetDeskApp.col10Num=10Numbers +DemoGlyphSetDeskApp.col16Num=16Numbers +DemoGlyphSetDeskApp.col27Num=27Numbers + +DemoNumberPartDeskApp.title=Demo Number Parts +DemoNumberPartDeskApp.selectBase=Base +DemoNumberPartDeskApp.selectName=Name: +DemoNumberPartDeskApp.selectPurpose=Purpose: +DemoNumberPartDeskApp.showBase10=Show base10 +DemoNumberPartDeskApp.showBase16=Show base16 +DemoNumberPartDeskApp.showBase27=Show base27 + +DemoUnicodePlaneDeskApp.title=Demo Unicode Plane +DemoUnicodePlaneDeskApp.colPlane=Unicode Plane +DemoUnicodePlaneDeskApp.colText=Example diff --git a/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Main_hiero.properties b/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Main_hiero.properties new file mode 100644 index 00000000..819181af --- /dev/null +++ b/gdxapp4d-app-glyphdemo/src/main/resources/love/distributedrebirth/gdxapp4d/app/glyphdemo/Main_hiero.properties @@ -0,0 +1,18 @@ +DemoGlyphSetDeskApp.title=Demo Glyph Set +DemoGlyphSetDeskApp.showBase27=\uE219 \uE362 \uE0C0 \uE13F \uE2F4 \uE387 \uE400 +DemoGlyphSetDeskApp.colScript=\uE2F4 \uE3A1 \uE08B \uE1CB \uE2AA \uE20F +DemoGlyphSetDeskApp.col10Num=\uE386 \uE216 \uE171 \uE153 \uE0C0 \uE08C \uE2F4 +DemoGlyphSetDeskApp.col16Num=\uE386 \uE3FF \uE216 \uE171 \uE153 \uE0C0 \uE08C \uE2F4 +DemoGlyphSetDeskApp.col27Num=\uE387 \uE400 \uE216 \uE171 \uE153 \uE0C0 \uE08C \uE2F4 + +DemoNumberPartDeskApp.title=Demo Number Parts +DemoNumberPartDeskApp.selectBase=\uE0C0 \uE13F \uE2F4 +DemoNumberPartDeskApp.selectName=\uE216 \uE13F \uE153 \uE3EC +DemoNumberPartDeskApp.selectPurpose=\uE203 \uE171 \uE08C \uE203 \uE2F4 \uE3EC +DemoNumberPartDeskApp.showBase10=\uE219 \uE362 \uE0C0 \uE13F \uE2F4 \uE386 +DemoNumberPartDeskApp.showBase16=\uE219 \uE362 \uE0C0 \uE13F \uE2F4 \uE386 \uE3FF +DemoNumberPartDeskApp.showBase27=\uE219 \uE362 \uE0C0 \uE13F \uE2F4 \uE387 \uE400 + +DemoUnicodePlaneDeskApp.title=Demo Unicode Plane +DemoUnicodePlaneDeskApp.colPlane=Unicode Plane +DemoUnicodePlaneDeskApp.colText=Example \ No newline at end of file diff --git a/gdxapp4d-boot-desktop/local-override.xml b/gdxapp4d-boot-desktop/local-override.xml index f2e83731..3a42a416 100644 --- a/gdxapp4d-boot-desktop/local-override.xml +++ b/gdxapp4d-boot-desktop/local-override.xml @@ -12,6 +12,7 @@ ../gdxapp4d-app-hewallet/target/classes ../gdxapp4d-app-tosamp/target/classes ../gdxapp4d-app-notepad/target/classes + ../gdxapp4d-app-glyphdemo/target/classes ../gdxapp4d-chain-vrlib/src/main/chain ../gdxapp4d-vrgem4/target/classes diff --git a/gdxapp4d-chain-default-apps/src/main/chain/warp-hash.xml b/gdxapp4d-chain-default-apps/src/main/chain/warp-hash.xml index 0839ffb6..47fe579c 100644 --- a/gdxapp4d-chain-default-apps/src/main/chain/warp-hash.xml +++ b/gdxapp4d-chain-default-apps/src/main/chain/warp-hash.xml @@ -8,4 +8,5 @@ + diff --git a/gdxapp4d-chain-default-apps/src/main/chain/warp-sea.xml b/gdxapp4d-chain-default-apps/src/main/chain/warp-sea.xml index 3f2b97b9..b137fc49 100644 --- a/gdxapp4d-chain-default-apps/src/main/chain/warp-sea.xml +++ b/gdxapp4d-chain-default-apps/src/main/chain/warp-sea.xml @@ -8,5 +8,6 @@ + diff --git a/gdxapp4d-chain-dep-osgi-scr/src/main/chain/warp-sea.xml b/gdxapp4d-chain-dep-osgi-scr/src/main/chain/warp-sea.xml index d8354dce..c95a7540 100644 --- a/gdxapp4d-chain-dep-osgi-scr/src/main/chain/warp-sea.xml +++ b/gdxapp4d-chain-dep-osgi-scr/src/main/chain/warp-sea.xml @@ -3,7 +3,7 @@ xmlns:link="http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-link" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://wrap-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root-1.0.xsd"> - + diff --git a/gdxapp4d-chain-font-unicode4d/src/main/chain/warp-sea.xml b/gdxapp4d-chain-font-unicode4d/src/main/chain/warp-sea.xml index 7953a790..1a564594 100644 --- a/gdxapp4d-chain-font-unicode4d/src/main/chain/warp-sea.xml +++ b/gdxapp4d-chain-font-unicode4d/src/main/chain/warp-sea.xml @@ -3,7 +3,7 @@ xmlns:link="http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-link" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://wrap-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root-1.0.xsd"> - + diff --git a/gdxapp4d-chain-vrlib/src/main/chain/warp-sea.xml b/gdxapp4d-chain-vrlib/src/main/chain/warp-sea.xml index 512e2b50..ce840d11 100644 --- a/gdxapp4d-chain-vrlib/src/main/chain/warp-sea.xml +++ b/gdxapp4d-chain-vrlib/src/main/chain/warp-sea.xml @@ -3,7 +3,7 @@ xmlns:link="http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-link" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://wrap-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root-1.0.xsd"> - + diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/VrGem4LocaleServiceImpl.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/VrGem4LocaleServiceImpl.java index efd503fd..c40910eb 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/VrGem4LocaleServiceImpl.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/VrGem4LocaleServiceImpl.java @@ -56,18 +56,18 @@ public class VrGem4LocaleServiceImpl implements VrGem4LocaleService { void close() { log.debug(this, SystemGdxLog.DEACTIVATE); } - + @Override public void setTextLocaleI18n(String isoCode) { // TODO Auto-generated method stub } - + @Override public String getTextLocaleI18n() { return properties.getProperty(LocaleKey.TEXT_LOCALE.name(), "en"); } - + @Override public Locale getTextLocale() { return new Locale(getTextLocaleI18n()); 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 75d2f686..66afbd7d 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 @@ -1,6 +1,5 @@ package love.distributedrebirth.gdxapp4d.vrgem4.view; -import java.util.ArrayList; import java.util.List; import com.badlogic.gdx.Gdx; @@ -23,8 +22,6 @@ import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppContourSec import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppLauncher; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppMenuSection; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppRenderer; -import love.distributedrebirth.gdxapp4d.vrgem4.view.apps.SystemBaseGlyphApp; -import love.distributedrebirth.gdxapp4d.vrgem4.view.apps.SystemBasePartApp; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class DeskTopScreenMenu { @@ -32,7 +29,6 @@ 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); @@ -41,9 +37,6 @@ public class DeskTopScreenMenu { this.bootArgs = bootArgs; this.terminal = terminal; this.deskAppService = deskAppService; - apps = new ArrayList<>(); - apps.add(new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Sys Glyph Set", () -> new SystemBaseGlyphApp())); - apps.add(new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Sys Number Parts", () -> new SystemBasePartApp())); } public void renderMenu(DeskTopScreen appScreen) { @@ -211,14 +204,6 @@ public class DeskTopScreenMenu { } ImGui.separator(); if (ImGui.beginMenu(FontAwesomeIcons.PlusSquare + " Start App")) { - for (DeskAppLauncher launcher: apps) { - if (ImGui.menuItem(launcher.getName())) { - DeskApp controller = launcher.getLauncher().get(); - controller.create(); - appScreen.getDeskAppController().addDeskApp(controller); - } - } - ImGui.separator(); for (DeskAppMenuSection section: DeskAppMenuSection.values()) { if (section.isSystem()) { continue; diff --git a/gdxapp4d-vrsys5/src/main/java/love/distributedrebirth/gdxapp4d/vrsys5/VrSys5Component.java b/gdxapp4d-vrsys5/src/main/java/love/distributedrebirth/gdxapp4d/vrsys5/VrSys5Component.java index 4b1167da..f460c0d2 100644 --- a/gdxapp4d-vrsys5/src/main/java/love/distributedrebirth/gdxapp4d/vrsys5/VrSys5Component.java +++ b/gdxapp4d-vrsys5/src/main/java/love/distributedrebirth/gdxapp4d/vrsys5/VrSys5Component.java @@ -10,7 +10,6 @@ import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService; import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4LocaleService; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppLauncher; import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppMenuSection; -import love.distributedrebirth.gdxapp4d.vrsys5.apps.BaseUnicodePlaneDeskApp; import love.distributedrebirth.gdxapp4d.vrsys5.apps.BasicConsoleDeskApp; import love.distributedrebirth.gdxapp4d.vrsys5.apps.ImGuiDeskApp; @@ -27,12 +26,10 @@ public class VrSys5Component { private VrGem4LocaleService localeService; private final DeskAppLauncher basicLauncher; - private final DeskAppLauncher unicodeLauncher; private final DeskAppLauncher imguiLauncher; public VrSys5Component() { basicLauncher = new DeskAppLauncher(DeskAppMenuSection.SYSTEM, "Basic Console", () -> new BasicConsoleDeskApp()); - unicodeLauncher = new DeskAppLauncher(DeskAppMenuSection.SYSTEM, "Base Unicode Plane", () -> new BaseUnicodePlaneDeskApp(localeService)); imguiLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "ImGui Demo", () -> new ImGuiDeskApp()); } @@ -40,7 +37,6 @@ public class VrSys5Component { void open() { log.debug(this, SystemGdxLog.ACTIVATE); deskAppService.installDeskApp(basicLauncher); - deskAppService.installDeskApp(unicodeLauncher); deskAppService.installDeskApp(imguiLauncher); } @@ -48,7 +44,6 @@ public class VrSys5Component { void close() { log.debug(this, SystemGdxLog.DEACTIVATE); deskAppService.removeDeskApp(basicLauncher); - deskAppService.removeDeskApp(unicodeLauncher); deskAppService.removeDeskApp(imguiLauncher); } } diff --git a/gdxapp4d-vrsys5/src/main/resources/love/distributedrebirth/gdxapp4d/vrsys5/Main.properties b/gdxapp4d-vrsys5/src/main/resources/love/distributedrebirth/gdxapp4d/vrsys5/Main.properties deleted file mode 100644 index cb403ac5..00000000 --- a/gdxapp4d-vrsys5/src/main/resources/love/distributedrebirth/gdxapp4d/vrsys5/Main.properties +++ /dev/null @@ -1,18 +0,0 @@ -SystemBaseGlyphApp.title=Sys Glyph Set -SystemBaseGlyphApp.showBase27=Show base27 -SystemBaseGlyphApp.colScript=Script -SystemBaseGlyphApp.col10Num=10Numbers -SystemBaseGlyphApp.col16Num=16Numbers -SystemBaseGlyphApp.col27Num=27Numbers - -SystemBasePartApp.title=Sys Number Parts -SystemBasePartApp.selectBase=Base -SystemBasePartApp.selectName=Name: -SystemBasePartApp.selectPurpose=Purpose: -SystemBasePartApp.showBase10=Show base10 -SystemBasePartApp.showBase16=Show base16 -SystemBasePartApp.showBase27=Show base27 - -SystemBaseUnicodePlaneApp.title=Sys Unicode Plane -SystemBaseUnicodePlaneApp.colPlane=Unicode Plane -SystemBaseUnicodePlaneApp.colText=Example \ No newline at end of file diff --git a/gdxapp4d-vrsys5/src/main/resources/love/distributedrebirth/gdxapp4d/vrsys5/Main_hiero.properties b/gdxapp4d-vrsys5/src/main/resources/love/distributedrebirth/gdxapp4d/vrsys5/Main_hiero.properties deleted file mode 100644 index bb75054c..00000000 --- a/gdxapp4d-vrsys5/src/main/resources/love/distributedrebirth/gdxapp4d/vrsys5/Main_hiero.properties +++ /dev/null @@ -1,14 +0,0 @@ -SystemBaseGlyphApp.title=\uE0C0 \uE13F \uE2F4 \uE3BC \uE0ED \uE1CC \uE191 \uE2F4 \uE20F -SystemBaseGlyphApp.showBase27=\uE219 \uE362 \uE0C0 \uE13F \uE2F4 \uE387 \uE400 -SystemBaseGlyphApp.colScript=\uE2F4 \uE3A1 \uE08B \uE1CB \uE2AA \uE20F -SystemBaseGlyphApp.col10Num=\uE386 \uE216 \uE171 \uE153 \uE0C0 \uE08C \uE2F4 -SystemBaseGlyphApp.col16Num=\uE386 \uE3FF \uE216 \uE171 \uE153 \uE0C0 \uE08C \uE2F4 -SystemBaseGlyphApp.col27Num=\uE387 \uE400 \uE216 \uE171 \uE153 \uE0C0 \uE08C \uE2F4 - -SystemBasePartApp.title=\uE0C0 \uE13F \uE2F4 \uE203 \uE13F \uE08C \uE20F \uE2F4 -SystemBasePartApp.selectBase=\uE0C0 \uE13F \uE2F4 -SystemBasePartApp.selectName=\uE216 \uE13F \uE153 \uE3EC -SystemBasePartApp.selectPurpose=\uE203 \uE171 \uE08C \uE203 \uE2F4 \uE3EC -SystemBasePartApp.showBase10=\uE219 \uE362 \uE0C0 \uE13F \uE2F4 \uE386 -SystemBasePartApp.showBase16=\uE219 \uE362 \uE0C0 \uE13F \uE2F4 \uE386 \uE3FF -SystemBasePartApp.showBase27=\uE219 \uE362 \uE0C0 \uE13F \uE2F4 \uE387 \uE400 diff --git a/pom.xml b/pom.xml index 13f81ed8..ed53d069 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,7 @@ gdxapp4d-vrsys5 gdxapp4d-chain-default-apps gdxapp4d-chain-vrlib + gdxapp4d-app-glyphdemo UTF-8