Removed duplicate code
This commit is contained in:
parent
ea9fcee2d1
commit
a41b6e7867
|
@ -11,6 +11,7 @@ import imgui.type.ImInt;
|
||||||
import love.distributedrebirth.demo4d.Demo4DMain;
|
import love.distributedrebirth.demo4d.Demo4DMain;
|
||||||
import love.distributedrebirth.demo4d.ImGuiRendererMain;
|
import love.distributedrebirth.demo4d.ImGuiRendererMain;
|
||||||
import love.distributedrebirth.numberxd.base2t.BasePartFactory;
|
import love.distributedrebirth.numberxd.base2t.BasePartFactory;
|
||||||
|
import love.distributedrebirth.numberxd.base2t.glyph.BaseGlyphSet;
|
||||||
import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1ʸᴰ;
|
import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1ʸᴰ;
|
||||||
import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt2ʸᴰ;
|
import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt2ʸᴰ;
|
||||||
import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt3ʸᴰ;
|
import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt3ʸᴰ;
|
||||||
|
@ -83,17 +84,17 @@ public class BasePartRenderer extends ImGuiRendererMain {
|
||||||
ImGui.tableNextColumn();
|
ImGui.tableNextColumn();
|
||||||
ImGui.text(part.BȍőnIdentifierTone());
|
ImGui.text(part.BȍőnIdentifierTone());
|
||||||
ImGui.tableNextColumn();
|
ImGui.tableNextColumn();
|
||||||
ImGui.text(part.BȍőnGlyphSetNumber16LatinBasic());
|
ImGui.text(part.BȍőnGlyphSetNumber16(BaseGlyphSet.LATIN_BASIC));
|
||||||
ImGui.tableNextColumn();
|
ImGui.tableNextColumn();
|
||||||
ImGui.text(part.BȍőnGlyphSetNumber16Greek());
|
ImGui.text(part.BȍőnGlyphSetNumber16(BaseGlyphSet.GREEK));
|
||||||
ImGui.tableNextColumn();
|
ImGui.tableNextColumn();
|
||||||
ImGui.text(part.BȍőnGlyphSetNumber16Korean());
|
ImGui.text(part.BȍőnGlyphSetNumber16(BaseGlyphSet.KOREAN));
|
||||||
ImGui.tableNextColumn();
|
ImGui.tableNextColumn();
|
||||||
ImGui.text(part.BȍőnGlyphSetNumber36LatinBasic());
|
ImGui.text(part.BȍőnGlyphSetNumber36(BaseGlyphSet.LATIN_BASIC));
|
||||||
ImGui.tableNextColumn();
|
ImGui.tableNextColumn();
|
||||||
ImGui.text(part.BȍőnGlyphSetNumber36Greek());
|
ImGui.text(part.BȍőnGlyphSetNumber36(BaseGlyphSet.GREEK));
|
||||||
ImGui.tableNextColumn();
|
ImGui.tableNextColumn();
|
||||||
ImGui.text(part.BȍőnGlyphSetNumber36Hebrew());
|
ImGui.text(part.BȍőnGlyphSetNumber36(BaseGlyphSet.HEBREW));
|
||||||
ImGui.tableNextColumn();
|
ImGui.tableNextColumn();
|
||||||
ImGui.text(part.BȍőnChinaKey());
|
ImGui.text(part.BȍőnChinaKey());
|
||||||
ImGui.tableNextColumn();
|
ImGui.tableNextColumn();
|
||||||
|
|
|
@ -23,52 +23,25 @@ public interface BãßBȍőnPartʸᴰ<T extends BãßBȍőnPartʸᴰ<T>> extends
|
||||||
return GET_BBC().GET_STR(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE);
|
return GET_BBC().GET_STR(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
default String BȍőnGlyphSetNumber16Greek() {
|
|
||||||
return BȍőnGlyphSetNumber16(BaseGlyphSet.GREEK);
|
|
||||||
}
|
|
||||||
|
|
||||||
default String BȍőnGlyphSetNumber16LatinBasic() {
|
|
||||||
return BȍőnGlyphSetNumber16(BaseGlyphSet.LATIN_BASIC);
|
|
||||||
}
|
|
||||||
|
|
||||||
default String BȍőnGlyphSetNumber16Korean() {
|
|
||||||
return BȍőnGlyphSetNumber16(BaseGlyphSet.KOREAN);
|
|
||||||
}
|
|
||||||
|
|
||||||
default String BȍőnGlyphSetNumber16(BaseGlyphSet glyphSet) {
|
default String BȍőnGlyphSetNumber16(BaseGlyphSet glyphSet) {
|
||||||
|
StringBuilder buf = new StringBuilder();
|
||||||
T[] values = BãßInstances();
|
T[] values = BãßInstances();
|
||||||
if (values.length <= 16) {
|
if (values.length <= 16) {
|
||||||
return glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul());
|
buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul()));
|
||||||
} else if (values.length <= 256) {
|
} else if (values.length <= 256) {
|
||||||
StringBuilder buf = new StringBuilder();
|
|
||||||
buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() >> 4));
|
buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() >> 4));
|
||||||
buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() & 0x0F));
|
buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() & 0x0F));
|
||||||
return buf.toString();
|
|
||||||
} else if (values.length <= 0xFFF+1) {
|
} else if (values.length <= 0xFFF+1) {
|
||||||
StringBuilder buf = new StringBuilder();
|
|
||||||
buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor((BȍőnRangTelNul() >> 8) & 0x0F));
|
buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor((BȍőnRangTelNul() >> 8) & 0x0F));
|
||||||
buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor((BȍőnRangTelNul() >> 4) & 0x0F));
|
buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor((BȍőnRangTelNul() >> 4) & 0x0F));
|
||||||
buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() & 0x0F));
|
buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() & 0x0F));
|
||||||
return buf.toString();
|
|
||||||
} else {
|
} else {
|
||||||
throw new IllegalStateException("Can't handle more than 0xFFF values.");
|
throw new IllegalStateException("Can't handle more than 0xFFF values.");
|
||||||
}
|
}
|
||||||
|
if (BaseGlyphSet.HEBREW.equals(glyphSet)) {
|
||||||
|
return buf.reverse().toString();
|
||||||
}
|
}
|
||||||
|
return buf.toString();
|
||||||
default String BȍőnGlyphSetNumber36Greek() {
|
|
||||||
return BȍőnGlyphSetNumber36(BaseGlyphSet.GREEK);
|
|
||||||
}
|
|
||||||
|
|
||||||
default String BȍőnGlyphSetNumber36LatinBasic() {
|
|
||||||
return BȍőnGlyphSetNumber36(BaseGlyphSet.LATIN_BASIC);
|
|
||||||
}
|
|
||||||
|
|
||||||
default String BȍőnGlyphSetNumber36Hebrew() {
|
|
||||||
return BȍőnGlyphSetNumber36(BaseGlyphSet.HEBREW);
|
|
||||||
}
|
|
||||||
|
|
||||||
default String BȍőnGlyphSetNumber36Arabic() {
|
|
||||||
return BȍőnGlyphSetNumber36(BaseGlyphSet.ARABIC);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
default String BȍőnGlyphSetNumber36(BaseGlyphSet glyphSet) {
|
default String BȍőnGlyphSetNumber36(BaseGlyphSet glyphSet) {
|
||||||
|
|
Loading…
Reference in a new issue