Synced to current nx01 snapshot and removed EL tomcat dep

This commit is contained in:
Willem Cazander 2026-04-20 17:26:34 +02:00
parent 3428ad1bf1
commit 57c087866c
23 changed files with 85 additions and 106 deletions

View file

@ -34,7 +34,7 @@ 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.DemoUnicodeBlockDeskApp;
import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoUnitConverterDeskApp;
import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoGlyphSetDeskApp;
import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoNumberMatrixDeskApp;
@ -75,7 +75,7 @@ public class GlyphDemoComponent {
private final DeskAppLauncher unitConverterLauncher;
public GlyphDemoComponent() {
unicodeLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Unicode Plane", () -> new DemoUnicodePlaneDeskApp(createBundle(), unicode4DService));
unicodeLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Unicode Blocks", () -> new DemoUnicodeBlockDeskApp(createBundle(), unicode4DService));
baseGlyphLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Glyph Set", () -> new DemoGlyphSetDeskApp(createBundle()));
basePartLauncher = new DeskAppLauncher(DeskAppMenuSection.EDUCATION, "Number Parts", () -> new DemoNumberPartDeskApp(createBundle()));
numberMatrixLauncher = new DeskAppLauncher(DeskAppMenuSection.EDUCATION, "Number Matrix", () -> new DemoNumberMatrixDeskApp(createBundle()));

View file

@ -43,8 +43,8 @@ import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪ
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ.ᐦ.TerminatorGun;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ.ᐦ.Terminator𓄯;
import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAuthor注;
import ᒢᣘᐧᐧ.ᑊᑉᣔᣔᔆ.ᐪᣔᒻᑊᑉ.嘴ᗮᙿᗮ;
import ᒢᣘᐧᐧ.ᒼᐤᒻᒻᓫᒼᐪᑊᐤᣕᔆᒾ.Ladder;
import ᒢᣘᐧᣟ.ᑊᑉᒻᣔᔆᔆ.ᒼᣔᑊᑉᓫ.ᐪᣔᒻᑊᑉ.嘴ᗮᙿᗮ;
@DuytsDocAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
public class DemoNumberPartDeskApp extends AbstractDeskApp implements DeskAppRenderer {
@ -148,40 +148,40 @@ public class DemoNumberPartDeskApp extends AbstractDeskApp implements DeskAppRen
ImGui.tableNextColumn();
ImGui.text(part.abacusRȧñkName());
ImGui.tableNextColumn();
ImGui.text(Long.toString(part.zerdinal()));
ImGui.text(Long.toString(part.odeur()));
ImGui.tableNextColumn();
ImGui.text(part.abacusRȧñkRingTone());
if (showBase10.get()) {
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber10((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber10((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.KOREAN.BȍőnPrintNumber10((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.KOREAN.BȍőnPrintNumber10((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.BENGALI.BȍőnPrintNumber10((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.BENGALI.BȍőnPrintNumber10((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.ARABIC.BȍőnPrintNumber10((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.ARABIC.BȍőnPrintNumber10((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
}
if (showBase16.get()) {
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber16((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber16((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.HIERO.BȍőnPrintNumber16((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.HIERO.BȍőnPrintNumber16((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.RUNIC.BȍőnPrintNumber16((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.RUNIC.BȍőnPrintNumber16((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.LATIN_BASIC.BȍőnPrintNumber16((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.LATIN_BASIC.BȍőnPrintNumber16((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
}
if (showBase27.get()) {
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber27((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.TONE_SCRIPT.BȍőnPrintNumber27((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.KOREAN.BȍőnPrintNumber27((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.KOREAN.BȍőnPrintNumber27((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.LATIN_BASIC.BȍőnPrintNumber27((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.LATIN_BASIC.BȍőnPrintNumber27((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.GREEK.BȍőnPrintNumber27((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.GREEK.BȍőnPrintNumber27((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.tableNextColumn();
ImGui.text(BaseGlyphSet.MALAYALAM.BȍőnPrintNumber27((int)(long)part.zerdinal(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
ImGui.text(BaseGlyphSet.MALAYALAM.BȍőnPrintNumber27((int)(long)part.odeur(), (int)(long)part.thisᴺᵘᵐᵇᵉʳᴿᵃⁿᵍᵉ() - 1));
}
// ImGui.tableNextColumn();
// String chinaKey = part.abacusRȧñkChinaKey();

View file

@ -37,23 +37,23 @@ 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.unicode4d.draw.ImCharacter;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodePlane;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodeBlock;
import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAuthor注;
@DuytsDocAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
public class DemoUnicodePlaneDeskApp extends AbstractDeskApp implements DeskAppRenderer {
public class DemoUnicodeBlockDeskApp extends AbstractDeskApp implements DeskAppRenderer {
private final VrGem4Unicode4DService unicode4DService;
private final ResourceBundle bundle;
private final ImBoolean render4DPlane0 = new ImBoolean(false);
public DemoUnicodePlaneDeskApp(ResourceBundle bundle, VrGem4Unicode4DService unicode4DService) {
public DemoUnicodeBlockDeskApp(ResourceBundle bundle, VrGem4Unicode4DService unicode4DService) {
this.unicode4DService = unicode4DService;
this.bundle = bundle;
}
private String getTxt(String key) {
return bundle.getString(DemoUnicodePlaneDeskApp.class.getSimpleName()+"."+key);
return bundle.getString(DemoUnicodeBlockDeskApp.class.getSimpleName()+"."+key);
}
public void create() {
@ -69,27 +69,27 @@ public class DemoUnicodePlaneDeskApp extends AbstractDeskApp implements DeskAppR
ImGui.tableSetupColumn(getTxt("colPlane"));
ImGui.tableSetupColumn(getTxt("colText"));
ImGui.tableHeadersRow();
for (UnicodePlane plane:UnicodePlane.values()) {
if (!plane.isPlaneValid()) {
for (UnicodeBlock block : UnicodeBlock.values()) {
if (!block.isPlaneValid()) {
continue;
}
StringBuilder buf = new StringBuilder();
int offset = 33;
for (int i=plane.getStart()+offset;i<plane.getStart()+33+offset;i++) {
for (int i = block.getStart()+offset; i < block.getStart()+33+offset;i++) {
buf.appendCodePoint(i);
if (plane.isPlane0() && render4DPlane0.get() == false) {
if (block.isPlane0() && render4DPlane0.get() == false) {
buf.append(" ");
}
}
ImGui.tableNextRow();
ImGui.tableNextColumn();
ImGui.text(plane.name());
ImGui.text(block.name());
ImGui.tableNextColumn();
if (plane.isPlane0() && render4DPlane0.get() == false) {
if (block.isPlane0() && render4DPlane0.get() == false) {
ImGui.text(buf.toString());
} else {
ImCharacter.render("row"+plane.name(), buf.toString(), '?', v -> unicode4DService.getCharacterForUnicode(v));
ImCharacter.render("row"+block.name(), buf.toString(), '?', v -> unicode4DService.getCharacterForUnicode(v));
}
}
ImGui.endTable();

View file

@ -13,7 +13,7 @@ DemoNumberPartDeskApp.showBase10=Show base10
DemoNumberPartDeskApp.showBase16=Show base16
DemoNumberPartDeskApp.showBase27=Show base27
DemoUnicodePlaneDeskApp.title=Demo Unicode Plane
DemoUnicodePlaneDeskApp.colPlane=Unicode Plane
DemoUnicodePlaneDeskApp.colText=Example
DemoUnicodePlaneDeskApp.render4DPlane0=Show all in unicode4D
DemoUnicodeBlockDeskApp.title=Demo Unicode Blocks
DemoUnicodeBlockDeskApp.colPlane=Unicode Blocks
DemoUnicodeBlockDeskApp.colText=Example
DemoUnicodeBlockDeskApp.render4DPlane0=Show all in unicode4D

View file

@ -13,7 +13,7 @@ DemoNumberPartDeskApp.showBase10=\u663E\u793A \u57FA\u657010
DemoNumberPartDeskApp.showBase16=\u663E\u793A \u57FA\u657016
DemoNumberPartDeskApp.showBase27=\u663E\u793A \u57FA\u657027
DemoUnicodePlaneDeskApp.title=\u6F14\u793A \u7EDF\u4E00\u7801 \u98DE\u673A
DemoUnicodePlaneDeskApp.colPlane=\u7EDF\u4E00\u7801\u5E73\u9762
DemoUnicodePlaneDeskApp.colText=\u4F8B\u5B50
DemoUnicodePlaneDeskApp.render4DPlane0=\u5168\u90E8\u663E\u793A \u7EDF\u4E00\u78014D
DemoUnicodeBlockDeskApp.title=\u6F14\u793A \u7EDF\u4E00\u7801 \u98DE\u673A
DemoUnicodeBlockDeskApp.colPlane=\u7EDF\u4E00\u7801\u5E73\u9762
DemoUnicodeBlockDeskApp.colText=\u4F8B\u5B50
DemoUnicodeBlockDeskApp.render4DPlane0=\u5168\u90E8\u663E\u793A \u7EDF\u4E00\u78014D

View file

@ -13,7 +13,7 @@ DemoNumberPartDeskApp.showBase10=\uE219\u2005\uE362\u2005\uE0C0\u2005\uE13F\u200
DemoNumberPartDeskApp.showBase16=\uE219\u2005\uE362\u2005\uE0C0\u2005\uE13F\u2005\uE2F4\u2005\uE386\u2005\uE3FF
DemoNumberPartDeskApp.showBase27=\uE219\u2005\uE362\u2005\uE0C0\u2005\uE13F\u2005\uE2F4\u2005\uE387\u2005\uE400
DemoUnicodePlaneDeskApp.title=Unicode Plane
DemoUnicodePlaneDeskApp.colPlane=Unicode Plane
DemoUnicodePlaneDeskApp.colText=Example
DemoUnicodePlaneDeskApp.render4DPlane0=Show all in unicode4D
DemoUnicodeBlockDeskApp.title=Unicode Plane
DemoUnicodeBlockDeskApp.colPlane=Unicode Plane
DemoUnicodeBlockDeskApp.colText=Example
DemoUnicodeBlockDeskApp.render4DPlane0=Show all in unicode4D

View file

@ -13,7 +13,7 @@ DemoNumberPartDeskApp.showBase10=Toon basis10
DemoNumberPartDeskApp.showBase16=Toon basis16
DemoNumberPartDeskApp.showBase27=Toon basis27
DemoUnicodePlaneDeskApp.title=Unicode Vlak
DemoUnicodePlaneDeskApp.colPlane=Unicode Vlak
DemoUnicodePlaneDeskApp.colText=Voorbeeld
DemoUnicodePlaneDeskApp.render4DPlane0=Toon alles in unicode4D
DemoUnicodeBlockDeskApp.title=Unicode Vlak
DemoUnicodeBlockDeskApp.colPlane=Unicode Vlak
DemoUnicodeBlockDeskApp.colText=Voorbeeld
DemoUnicodeBlockDeskApp.render4DPlane0=Toon alles in unicode4D

View file

@ -13,7 +13,7 @@ DemoNumberPartDeskApp.showBase10=\u16CB\u16BA\u16DF\u16B9 \u16D2\u16A8\u16CB\u16
DemoNumberPartDeskApp.showBase16=\u16CB\u16BA\u16DF\u16B9 \u16D2\u16A8\u16CB\u16D616
DemoNumberPartDeskApp.showBase27=\u16CB\u16BA\u16DF\u16B9 \u16D2\u16A8\u16CB\u16D627
DemoUnicodePlaneDeskApp.title=\u16DE\u16D6\u16D7\u16DF \u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D6 \u16C8\u16DA\u16A8\u16BE\u16D6
DemoUnicodePlaneDeskApp.colPlane=\u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D6 \u16C8\u16DA\u16A8\u16BE\u16D6
DemoUnicodePlaneDeskApp.colText=\u16D6\u16EA\u16A8\u16D7\u16C8\u16DA\u16D6
DemoUnicodePlaneDeskApp.render4DPlane0=\u16CB\u16BA\u16DF\u16B9 \u16A8\u16DA\u16DA \u16C1\u16BE \u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D64\u16DE
DemoUnicodeBlockDeskApp.title=\u16DE\u16D6\u16D7\u16DF \u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D6 \u16C8\u16DA\u16A8\u16BE\u16D6
DemoUnicodeBlockDeskApp.colPlane=\u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D6 \u16C8\u16DA\u16A8\u16BE\u16D6
DemoUnicodeBlockDeskApp.colText=\u16D6\u16EA\u16A8\u16D7\u16C8\u16DA\u16D6
DemoUnicodeBlockDeskApp.render4DPlane0=\u16CB\u16BA\u16DF\u16B9 \u16A8\u16DA\u16DA \u16C1\u16BE \u16A2\u16BE\u16C1\u16B2\u16DF\u16DE\u16D64\u16DE