Added UnitXrossConverter
This commit is contained in:
parent
84738628af
commit
d97076d436
159 changed files with 9197 additions and 96 deletions
|
|
@ -32,13 +32,11 @@
|
|||
${tos4.packages}
|
||||
</Import-Package>
|
||||
<Export-Package>
|
||||
org.slf4j.impl,
|
||||
love.distributedrebirth.gdxapp4d.vrgem4.service,
|
||||
love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp
|
||||
</Export-Package>
|
||||
<Private-Package>love.distributedrebirth.gdxapp4d.vrgem4.*</Private-Package>
|
||||
<!--
|
||||
<Embed-Dependency>*;artifactId=gdx;inline=true,*;artifactId=gdx-nativefilechooser;inline=true</Embed-Dependency>
|
||||
-->
|
||||
<Bundle-Activator>love.distributedrebirth.gdxapp4d.vrgem4.GDXAppVrGem4Activator</Bundle-Activator>
|
||||
<Bundle-Vendor>distributedrebirth.love</Bundle-Vendor>
|
||||
</instructions>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ import love.distributedrebirth.numberxd.base2t.Base2PartsFactory;
|
|||
import love.distributedrebirth.numberxd.base2t.Base2Terminator;
|
||||
import love.distributedrebirth.numberxd.base2t.Base2WarpCore;
|
||||
import love.distributedrebirth.numberxd.unicode.BaseGlyphSet;
|
||||
import love.distributedrebirth.warpme.ship.WaterShipOcean;
|
||||
import love.distributedrebirth.warpme.ship.WaterShipWarp;
|
||||
|
||||
@BãßBȍőnAuthorInfoʸᴰ(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
|
||||
public class GDXAppVrGem4Activator implements BundleActivator {
|
||||
|
|
@ -93,7 +93,7 @@ public class GDXAppVrGem4Activator implements BundleActivator {
|
|||
List<SystemWarpSea> registratedSeas = new ArrayList<>();
|
||||
int result = 0;
|
||||
try {
|
||||
for (WaterShipOcean ocean:systemWarpShip.getWarpShip().theShip().getShipOceans()) {
|
||||
for (WaterShipWarp ocean:systemWarpShip.getWarpShip().theShip().getWarpSeas()) {
|
||||
result = systemWarpShip.loadWaterOcean(context, registratedSeas, ocean.getSea(), v -> bootScreen.bootLine(v));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
|
|
@ -197,7 +197,7 @@ public class GDXAppVrGem4Activator implements BundleActivator {
|
|||
}
|
||||
}
|
||||
|
||||
private void startTerminalScreens(GDXAppVrGem4BootScreen bootScreen, SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) {
|
||||
private void startTerminalScreens(GDXAppVrGem4BootScreen bootScreen, SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppService deskAppService) {
|
||||
bootScreen.bootLine("vrGEM⁴: add terminal screens");
|
||||
Gdx.app.postRunnable(new Runnable() {
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package love.distributedrebirth.gdxapp4d.vrgem4;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
|
@ -15,22 +16,31 @@ public class VrGem4DeskAppServiceImpl implements VrGem4DeskAppService {
|
|||
|
||||
private Map<DeskAppMenuSection, List<DeskAppLauncher>> menu = new HashMap<>();
|
||||
|
||||
public List<DeskAppLauncher> getMenuSection(DeskAppMenuSection section) {
|
||||
List<DeskAppLauncher> result = menu.get(section);
|
||||
if (result == null) {
|
||||
result = new ArrayList<>();
|
||||
menu.put(section, result);
|
||||
private List<DeskAppLauncher> buildMenuSection(DeskAppMenuSection section) {
|
||||
List<DeskAppLauncher> launchers = menu.get(section);
|
||||
if (launchers == null) {
|
||||
launchers = new ArrayList<>();
|
||||
menu.put(section, launchers);
|
||||
}
|
||||
return launchers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DeskAppLauncher> getMenuSection(DeskAppMenuSection section) {
|
||||
List<DeskAppLauncher> result = new ArrayList<>(buildMenuSection(section));
|
||||
Collections.sort(result, (v1, v2) -> {
|
||||
return v1.getName().compareTo(v2.getName()); // TODO: change data structure
|
||||
});
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void installDeskApp(DeskAppLauncher launcher) {
|
||||
getMenuSection(launcher.getMenuSection()).add(launcher);
|
||||
buildMenuSection(launcher.getMenuSection()).add(launcher);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeDeskApp(DeskAppLauncher launcher) {
|
||||
getMenuSection(launcher.getMenuSection()).remove(launcher);
|
||||
buildMenuSection(launcher.getMenuSection()).remove(launcher);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ;
|
|||
import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs;
|
||||
import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.ImGuiSetup;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.VrGem4DeskAppServiceImpl;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskApp;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppContourSection;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppRenderer;
|
||||
|
|
@ -49,7 +49,7 @@ public abstract class AbstractScreenDesktop extends ScreenAdapter implements Des
|
|||
private ModelBatch modelBatch;
|
||||
private Array<ModelInstance> modelInstances = new Array<ModelInstance>();
|
||||
|
||||
public AbstractScreenDesktop(String name, SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) {
|
||||
public AbstractScreenDesktop(String name, SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppService deskAppService) {
|
||||
this.create();
|
||||
screenMenu = new DeskTopScreenMenu(bootArgs, terminal, deskAppService);
|
||||
deskAppScreen = new DeskAppController(name);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import com.badlogic.gdx.utils.Array;
|
|||
import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ;
|
||||
import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs;
|
||||
import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.VrGem4DeskAppServiceImpl;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService;
|
||||
|
||||
@BãßBȍőnAuthorInfoʸᴰ(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
|
||||
public class ScreenDesktop1 extends AbstractScreenDesktop {
|
||||
|
|
@ -37,7 +37,7 @@ public class ScreenDesktop1 extends AbstractScreenDesktop {
|
|||
private Model pyramid3_2;
|
||||
private Model pyramid3_3;
|
||||
|
||||
public ScreenDesktop1(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) {
|
||||
public ScreenDesktop1(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppService deskAppService) {
|
||||
super("Desktop1", bootArgs, terminal, deskAppService);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ import com.badlogic.gdx.utils.Array;
|
|||
import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ;
|
||||
import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs;
|
||||
import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.VrGem4DeskAppServiceImpl;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService;
|
||||
|
||||
@BãßBȍőnAuthorInfoʸᴰ(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
|
||||
public class ScreenDesktop2 extends AbstractScreenDesktop {
|
||||
|
|
@ -24,7 +24,7 @@ public class ScreenDesktop2 extends AbstractScreenDesktop {
|
|||
private Model background;
|
||||
private Model grid;
|
||||
|
||||
public ScreenDesktop2(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) {
|
||||
public ScreenDesktop2(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppService deskAppService) {
|
||||
super("Desktop2", bootArgs, terminal, deskAppService);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ import com.badlogic.gdx.utils.Array;
|
|||
import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ;
|
||||
import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs;
|
||||
import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.VrGem4DeskAppServiceImpl;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService;
|
||||
|
||||
@BãßBȍőnAuthorInfoʸᴰ(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
|
||||
public class ScreenDesktop3 extends AbstractScreenDesktop {
|
||||
|
|
@ -24,7 +24,7 @@ public class ScreenDesktop3 extends AbstractScreenDesktop {
|
|||
private Model background;
|
||||
private Model grid;
|
||||
|
||||
public ScreenDesktop3(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) {
|
||||
public ScreenDesktop3(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppService deskAppService) {
|
||||
super("Desktop3", bootArgs, terminal, deskAppService);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ import com.badlogic.gdx.utils.viewport.ScreenViewport;
|
|||
import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ;
|
||||
import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs;
|
||||
import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.VrGem4DeskAppServiceImpl;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService;
|
||||
|
||||
@BãßBȍőnAuthorInfoʸᴰ(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
|
||||
public class ScreenDesktop4 extends AbstractScreenDesktop {
|
||||
|
|
@ -45,7 +45,7 @@ public class ScreenDesktop4 extends AbstractScreenDesktop {
|
|||
private Texture backgroundImage;
|
||||
private Model background;
|
||||
|
||||
public ScreenDesktop4(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) {
|
||||
public ScreenDesktop4(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppService deskAppService) {
|
||||
super("Desktop4", bootArgs, terminal, deskAppService);
|
||||
shader = new UserColorShader();
|
||||
shader.init();
|
||||
|
|
|
|||
|
|
@ -1,11 +1,16 @@
|
|||
package love.distributedrebirth.gdxapp4d.vrgem4.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppLauncher;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppMenuSection;
|
||||
|
||||
@BãßBȍőnAuthorInfoʸᴰ(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
|
||||
public interface VrGem4DeskAppService {
|
||||
|
||||
List<DeskAppLauncher> getMenuSection(DeskAppMenuSection section);
|
||||
|
||||
void installDeskApp(DeskAppLauncher launcher);
|
||||
|
||||
void removeDeskApp(DeskAppLauncher launcher);
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ;
|
|||
import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxBootArgs;
|
||||
import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxTerminal;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.FontAwesomeIcons;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.VrGem4DeskAppServiceImpl;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenCredits;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenDesktop1;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenDesktop2;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenDesktop3;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenDesktop4;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenHelp;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskApp;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppContourSection;
|
||||
import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppLauncher;
|
||||
|
|
@ -28,12 +28,12 @@ public class DeskTopScreenMenu {
|
|||
|
||||
private SystemGdxBootArgs bootArgs;
|
||||
private SystemGdxTerminal terminal;
|
||||
private VrGem4DeskAppServiceImpl deskAppService;
|
||||
private VrGem4DeskAppService deskAppService;
|
||||
private ImBoolean fileMinimizeSelected = new ImBoolean(false);
|
||||
private ImBoolean fileCloseSelected = new ImBoolean(false);
|
||||
private ImBoolean tosSelfSelected = new ImBoolean(false);
|
||||
|
||||
public DeskTopScreenMenu(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppServiceImpl deskAppService) {
|
||||
public DeskTopScreenMenu(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppService deskAppService) {
|
||||
this.bootArgs = bootArgs;
|
||||
this.terminal = terminal;
|
||||
this.deskAppService = deskAppService;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
package org.slf4j.impl;
|
||||
|
||||
public class MyClass {
|
||||
|
||||
public static void fakeDepToBootSLF4J(String out) {
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue