From 8764b44807b63536d93a04bf9d92054ff4211a64 Mon Sep 17 00:00:00 2001 From: austin Date: Thu, 15 May 2025 14:27:08 -0400 Subject: [PATCH] move signal system into engineState --- docs/src/progress/renderertodo.md | 1 + .../client/ui/components/CraftingPanel.java | 6 +++--- .../ui/components/EquipmentInventoryPanel.java | 2 +- .../client/ui/components/ItemIconPanel.java | 4 ++-- .../client/ui/menu/WindowUtils.java | 16 ++++++++-------- .../client/ui/menu/YogaUtils.java | 4 ++-- .../ui/menu/debug/server/ImGuiTestGen.java | 2 +- .../ui/menu/dialog/DialogMenuGenerator.java | 2 +- .../client/ui/menu/ingame/CraftingWindow.java | 2 +- .../client/ui/menu/ingame/FabMenus.java | 2 +- .../ui/menu/ingame/InteractionTargetMenu.java | 4 ++-- .../ui/menu/ingame/InventoryMainWindow.java | 18 +++++++++--------- .../ui/menu/ingame/MenuGeneratorsInGame.java | 10 +++++----- .../menu/ingame/MenuGeneratorsLevelEditor.java | 18 +++++++++--------- .../ingame/MenuGeneratorsTerrainEditing.java | 4 ++-- .../ui/menu/ingame/ToolbarPreviewWindow.java | 2 +- .../mainmenu/MenuGeneratorsLevelEditor.java | 4 ++-- .../mainmenu/worldgen/MenuWorldSelect.java | 2 +- .../java/electrosphere/engine/EngineState.java | 7 +++++++ .../java/electrosphere/engine/Globals.java | 8 -------- .../ChunkGenerationTestLoading.java | 2 +- .../engine/loadingthreads/ClientLoading.java | 8 ++++---- .../loadingthreads/DebugSPWorldLoading.java | 2 +- .../loadingthreads/LevelEditorLoading.java | 2 +- .../engine/loadingthreads/LevelLoading.java | 2 +- .../engine/loadingthreads/MainMenuLoading.java | 4 ++-- .../engine/loadingthreads/ServerLoading.java | 2 +- .../engine/loadingthreads/ViewportLoading.java | 2 +- .../engine/service/ServiceManager.java | 2 +- .../net/client/protocol/CharacterProtocol.java | 2 +- .../renderer/RenderingEngine.java | 4 ++-- .../renderer/ui/elements/Label.java | 2 +- .../ui/elements/StandardContainerElement.java | 2 +- .../renderer/ui/elements/StringCarousel.java | 4 ++-- .../renderer/ui/elements/TextBox.java | 4 ++-- .../renderer/ui/elements/TextInput.java | 4 ++-- .../renderer/ui/elements/Tooltip.java | 8 ++++---- .../renderer/ui/elements/Window.java | 4 ++-- .../renderer/ui/elements/Word.java | 4 ++-- .../StateCleanupCheckerExtension.java | 1 - 40 files changed, 91 insertions(+), 92 deletions(-) diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 9a75f90b..aa8f2987 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1820,6 +1820,7 @@ Create EngineState global Move threadManager into engineState Move serviceManager into engineState Move timeKeeper into engineState +Move signalSystem into engineState diff --git a/src/main/java/electrosphere/client/ui/components/CraftingPanel.java b/src/main/java/electrosphere/client/ui/components/CraftingPanel.java index 69c97ca2..cca040ea 100644 --- a/src/main/java/electrosphere/client/ui/components/CraftingPanel.java +++ b/src/main/java/electrosphere/client/ui/components/CraftingPanel.java @@ -132,7 +132,7 @@ public class CraftingPanel { * @param currentRecipe The recipe that was selected */ private static void setDetails(Div topLevelEl, Div detailsPanel, RecipeData currentRecipe){ - Globals.signalSystem.post(SignalType.UI_MODIFICATION,() -> { + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION,() -> { //clear the panel detailsPanel.clearChildren(); @@ -161,9 +161,9 @@ public class CraftingPanel { //apply yoga if(Globals.elementService.getWindow(WindowStrings.CRAFTING) != null){ - Globals.signalSystem.post(SignalType.YOGA_APPLY, Globals.elementService.getWindow(WindowStrings.CRAFTING)); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, Globals.elementService.getWindow(WindowStrings.CRAFTING)); } else if(Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN) != null){ - Globals.signalSystem.post(SignalType.YOGA_APPLY, Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN)); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN)); } }); } diff --git a/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java index a4fd0a7d..42544cd0 100644 --- a/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java +++ b/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java @@ -166,7 +166,7 @@ public class EquipmentInventoryPanel { // System.out.println("Drag"); panel.setPositionX(event.getCurrentX() - panelWidth / 2); panel.setPositionY(event.getCurrentY() - panelHeight / 2); - Globals.signalSystem.post(SignalType.YOGA_APPLY, Globals.elementService.getWindow(WindowStrings.WINDOW_ITEM_DRAG_CONTAINER)); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, Globals.elementService.getWindow(WindowStrings.WINDOW_ITEM_DRAG_CONTAINER)); return false; }}); panel.setOnDragRelease(new DragEventCallback(){public boolean execute(DragEvent event){ diff --git a/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java b/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java index 17237978..0690467f 100644 --- a/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java +++ b/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java @@ -100,7 +100,7 @@ public class ItemIconPanel { // System.out.println("Drag"); panel.setPositionX(event.getCurrentX() - panelWidth / 2); panel.setPositionY(event.getCurrentY() - panelHeight / 2); - Globals.signalSystem.post(SignalType.YOGA_APPLY, Globals.elementService.getWindow(WindowStrings.WINDOW_ITEM_DRAG_CONTAINER)); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, Globals.elementService.getWindow(WindowStrings.WINDOW_ITEM_DRAG_CONTAINER)); return false; }}); panel.setOnDragRelease(new DragEventCallback(){public boolean execute(DragEvent event){ @@ -120,7 +120,7 @@ public class ItemIconPanel { Tooltip.destroy(itemTooltip); } Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(currentItem); - Globals.signalSystem.post(SignalType.UI_MODIFICATION,()->{ + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION,()->{ itemTooltip = Tooltip.create(Div.createCol(Label.createLabel(itemData.getId()))); itemTooltip.setPositionX(panel.getAbsoluteX() + panelWidth); itemTooltip.setPositionY(panel.getAbsoluteY()); diff --git a/src/main/java/electrosphere/client/ui/menu/WindowUtils.java b/src/main/java/electrosphere/client/ui/menu/WindowUtils.java index b7efec63..d0af2e97 100644 --- a/src/main/java/electrosphere/client/ui/menu/WindowUtils.java +++ b/src/main/java/electrosphere/client/ui/menu/WindowUtils.java @@ -33,7 +33,7 @@ public class WindowUtils { //todo: destroy elements as well mainMenu.clear(); mainMenu.addChild(newMenu); - Globals.signalSystem.post(SignalType.YOGA_APPLY, mainMenu); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, mainMenu); Globals.elementService.focusFirstElement(); } } @@ -56,7 +56,7 @@ public class WindowUtils { Globals.elementService.focusFirstElement(); } if(visible){ - Globals.signalSystem.post(SignalType.YOGA_APPLY,topLevelMenu); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,topLevelMenu); } } @@ -176,10 +176,10 @@ public class WindowUtils { * Tries to clear all tooltips */ public static void clearTooltips(){ - Globals.signalSystem.post(SignalType.UI_MODIFICATION,()->{ + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION,()->{ Window tooltipWindow = (Window)Globals.elementService.getWindow(WindowStrings.TOOLTIP_WINDOW); for(Element child : tooltipWindow.getChildren()){ - Globals.signalSystem.post(SignalType.YOGA_DESTROY, child); + Globals.engineState.signalSystem.post(SignalType.YOGA_DESTROY, child); } tooltipWindow.clearChildren(); }); @@ -228,7 +228,7 @@ public class WindowUtils { Window loadingWindow = Window.create(Globals.renderingEngine.getOpenGLState(), 0, 0, Globals.WINDOW_WIDTH, Globals.WINDOW_HEIGHT, false); Label loadingLabel = Label.createLabel("LOADING"); loadingWindow.addChild(loadingLabel); - Globals.signalSystem.post(SignalType.YOGA_APPLY,loadingWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,loadingWindow); Globals.elementService.registerWindow(WindowStrings.WINDOW_LOADING, loadingWindow); WindowUtils.recursiveSetVisible(loadingWindow, true); } @@ -248,7 +248,7 @@ public class WindowUtils { static void initItemDropWindow(){ Element itemDropWindow = MenuGeneratorsInventory.worldItemDropCaptureWindow(); Globals.elementService.registerWindow(WindowStrings.WINDDOW_ITEM_DROP, itemDropWindow); - Globals.signalSystem.post(SignalType.YOGA_APPLY, itemDropWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, itemDropWindow); } static void initItemDragContainerWindow(){ @@ -260,11 +260,11 @@ public class WindowUtils { * Updates the loading window */ public static void updateLoadingWindow(String message){ - Globals.signalSystem.post(SignalType.UI_MODIFICATION,() -> { + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION,() -> { Window loadingWindow = (Window)Globals.elementService.getWindow(WindowStrings.WINDOW_LOADING); loadingWindow.clear(); loadingWindow.addChild(Label.createLabel(message)); - Globals.signalSystem.post(SignalType.YOGA_APPLY,loadingWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,loadingWindow); }); } diff --git a/src/main/java/electrosphere/client/ui/menu/YogaUtils.java b/src/main/java/electrosphere/client/ui/menu/YogaUtils.java index 0e5e8fab..8596eda5 100644 --- a/src/main/java/electrosphere/client/ui/menu/YogaUtils.java +++ b/src/main/java/electrosphere/client/ui/menu/YogaUtils.java @@ -15,9 +15,9 @@ public class YogaUtils { * @param render The function that renders the component's content */ public static void refreshComponent(Element containingWindow, Runnable render){ - Globals.signalSystem.post(SignalType.UI_MODIFICATION,render); + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION,render); if(containingWindow != null){ - Globals.signalSystem.post(SignalType.YOGA_APPLY, containingWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, containingWindow); } } diff --git a/src/main/java/electrosphere/client/ui/menu/debug/server/ImGuiTestGen.java b/src/main/java/electrosphere/client/ui/menu/debug/server/ImGuiTestGen.java index c145d7bf..94abd92f 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/server/ImGuiTestGen.java +++ b/src/main/java/electrosphere/client/ui/menu/debug/server/ImGuiTestGen.java @@ -40,7 +40,7 @@ public class ImGuiTestGen { //regenerate the test area if(ImGui.button("Regenerate")){ //recompile script engine - Globals.signalSystem.post(SignalType.SCRIPT_RECOMPILE, () -> { + Globals.engineState.signalSystem.post(SignalType.SCRIPT_RECOMPILE, () -> { //run once script recompilation has completed diff --git a/src/main/java/electrosphere/client/ui/menu/dialog/DialogMenuGenerator.java b/src/main/java/electrosphere/client/ui/menu/dialog/DialogMenuGenerator.java index 6c05669b..7480108d 100644 --- a/src/main/java/electrosphere/client/ui/menu/dialog/DialogMenuGenerator.java +++ b/src/main/java/electrosphere/client/ui/menu/dialog/DialogMenuGenerator.java @@ -89,7 +89,7 @@ public class DialogMenuGenerator { //Final setup // - Globals.signalSystem.post(SignalType.YOGA_APPLY, rVal); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, rVal); return rVal; } diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/CraftingWindow.java b/src/main/java/electrosphere/client/ui/menu/ingame/CraftingWindow.java index f6499a24..71885bac 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/CraftingWindow.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/CraftingWindow.java @@ -76,7 +76,7 @@ public class CraftingWindow { //Final setup // - Globals.signalSystem.post(SignalType.YOGA_APPLY, rVal); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, rVal); diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/FabMenus.java b/src/main/java/electrosphere/client/ui/menu/ingame/FabMenus.java index 5a3c76d2..7e73f9b0 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/FabMenus.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/FabMenus.java @@ -60,7 +60,7 @@ public class FabMenus { Globals.cursorState.setSelectedFabPath("./assets/Data/fab/" + selectedFile.getName()); })); - Globals.signalSystem.post(SignalType.YOGA_APPLY,fabSelectionPanelWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,fabSelectionPanelWindow); return fabSelectionPanelWindow; } diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/InteractionTargetMenu.java b/src/main/java/electrosphere/client/ui/menu/ingame/InteractionTargetMenu.java index de251c72..e198131c 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/InteractionTargetMenu.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/InteractionTargetMenu.java @@ -34,7 +34,7 @@ public class InteractionTargetMenu { Label label = Label.createLabel(""); rVal.addChild(Panel.createPanel(label)); - Globals.signalSystem.post(SignalType.YOGA_APPLY,rVal); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,rVal); return rVal; } @@ -56,7 +56,7 @@ public class InteractionTargetMenu { interactionTooltipWindow.setVisible(true); if(!label.getText().contains(text)){ label.setText(text); - Globals.signalSystem.post(SignalType.YOGA_APPLY, interactionTooltipWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, interactionTooltipWindow); } } } diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java b/src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java index d3589ebd..3a269e09 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java @@ -160,7 +160,7 @@ public class InventoryMainWindow { //Final setup // - Globals.signalSystem.post(SignalType.YOGA_APPLY, rVal); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, rVal); @@ -179,16 +179,16 @@ public class InventoryMainWindow { ){ characterWindow.setParentAlignItem(YogaAlignment.Start); targetWindow.setParentAlignItem(YogaAlignment.End); - Globals.signalSystem.post(SignalType.YOGA_APPLY, characterWindow); - Globals.signalSystem.post(SignalType.YOGA_APPLY, targetWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, characterWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, targetWindow); } else { if(characterWindow != null){ characterWindow.setParentAlignItem(YogaAlignment.Center); - Globals.signalSystem.post(SignalType.YOGA_APPLY, characterWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, characterWindow); } if(targetWindow != null){ targetWindow.setParentAlignItem(YogaAlignment.Center); - Globals.signalSystem.post(SignalType.YOGA_APPLY, targetWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, targetWindow); } } } @@ -213,16 +213,16 @@ public class InventoryMainWindow { ){ characterWindow.setParentAlignItem(YogaAlignment.Start); targetWindow.setParentAlignItem(YogaAlignment.End); - Globals.signalSystem.post(SignalType.YOGA_APPLY, characterWindow); - Globals.signalSystem.post(SignalType.YOGA_APPLY, targetWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, characterWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, targetWindow); } else { if(characterWindow != null){ characterWindow.setParentAlignItem(YogaAlignment.Center); - Globals.signalSystem.post(SignalType.YOGA_APPLY, characterWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, characterWindow); } if(targetWindow != null){ targetWindow.setParentAlignItem(YogaAlignment.Center); - Globals.signalSystem.post(SignalType.YOGA_APPLY, targetWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, targetWindow); } } } diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java index 8718c48a..132c0625 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java @@ -96,7 +96,7 @@ public class MenuGeneratorsInGame { //Return to main menu { Button button = Button.createButton("Return To Main Menu", () -> { - Globals.signalSystem.post(SignalType.ENGINE_RETURN_TO_TITLE); + Globals.engineState.signalSystem.post(SignalType.ENGINE_RETURN_TO_TITLE); }); button.setMarginTop(BUTTON_MARGIN); button.setMarginLeft(BUTTON_MARGIN); @@ -108,7 +108,7 @@ public class MenuGeneratorsInGame { { Button button = Button.createButton("Save and Quit", () -> { SaveUtils.overwriteSave(Globals.serverState.currentSave.getName()); - Globals.signalSystem.post(SignalType.ENGINE_RETURN_TO_TITLE); + Globals.engineState.signalSystem.post(SignalType.ENGINE_RETURN_TO_TITLE); }); button.setMarginTop(BUTTON_MARGIN); button.setMarginLeft(BUTTON_MARGIN); @@ -144,7 +144,7 @@ public class MenuGeneratorsInGame { div.addChild(button); } - Globals.signalSystem.post(SignalType.YOGA_APPLY,rVal); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,rVal); return rVal; } @@ -315,7 +315,7 @@ public class MenuGeneratorsInGame { toggleNavmeshButton.setMarginLeft(BUTTON_MARGIN); scrollable.addChild(toggleNavmeshButton); - Globals.signalSystem.post(SignalType.YOGA_APPLY,rVal); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,rVal); return rVal; } @@ -372,7 +372,7 @@ public class MenuGeneratorsInGame { } } - Globals.signalSystem.post(SignalType.YOGA_APPLY,rVal); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,rVal); return rVal; } diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java index 96e96505..385e6038 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java @@ -82,7 +82,7 @@ public class MenuGeneratorsLevelEditor { fillInDefaultContent(scrollable); - Globals.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); return mainSidePanel; } @@ -147,7 +147,7 @@ public class MenuGeneratorsLevelEditor { fillInAtmosphericControlContent(scrollable); })); - Globals.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); } @@ -178,7 +178,7 @@ public class MenuGeneratorsLevelEditor { })); } - Globals.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); } /** @@ -212,7 +212,7 @@ public class MenuGeneratorsLevelEditor { })); } - Globals.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); } /** @@ -241,7 +241,7 @@ public class MenuGeneratorsLevelEditor { })); } - Globals.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); } /** @@ -270,7 +270,7 @@ public class MenuGeneratorsLevelEditor { })); } - Globals.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); } @@ -300,7 +300,7 @@ public class MenuGeneratorsLevelEditor { })); } - Globals.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); } @@ -350,7 +350,7 @@ public class MenuGeneratorsLevelEditor { } } - Globals.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); } /** @@ -464,7 +464,7 @@ public class MenuGeneratorsLevelEditor { scrollable.addChild(bDiv); - Globals.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,mainSidePanel); } diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java index b5746d7a..a2598b3b 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java @@ -55,7 +55,7 @@ public class MenuGeneratorsTerrainEditing { Globals.clientState.clientSelectedVoxelType = type; })); - Globals.signalSystem.post(SignalType.YOGA_APPLY,terrainEditingSidePanelWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,terrainEditingSidePanelWindow); return terrainEditingSidePanelWindow; } @@ -88,7 +88,7 @@ public class MenuGeneratorsTerrainEditing { Globals.clientState.selectedSpawntype = type; })); - Globals.signalSystem.post(SignalType.YOGA_APPLY,entitySelectionWindow); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,entitySelectionWindow); return entitySelectionWindow; } diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/ToolbarPreviewWindow.java b/src/main/java/electrosphere/client/ui/menu/ingame/ToolbarPreviewWindow.java index 07bf8bb2..b55ffb86 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/ToolbarPreviewWindow.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/ToolbarPreviewWindow.java @@ -44,7 +44,7 @@ public class ToolbarPreviewWindow { //attach scrollable after search input for organzation purposes rVal.addChild(ToolbarInventoryPanel.createToolbarInventoryPanel(Globals.clientState.playerEntity, false)); - Globals.signalSystem.post(SignalType.YOGA_APPLY,rVal); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,rVal); return rVal; } diff --git a/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java index 5185c276..d290aff6 100644 --- a/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java +++ b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java @@ -256,9 +256,9 @@ public class MenuGeneratorsLevelEditor { InputMacros.createSliderInput("Realm Size", (ValueChangeEvent event) -> { float value = event.getAsFloat() * MenuGeneratorsLevelEditor.MAX_SELECTABLE_SIZE; sceneFile.getRealmDescriptor().setGriddedRealmSize((int)value); - Globals.signalSystem.post(SignalType.UI_MODIFICATION,() -> { + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION,() -> { gridSizeLabel.setText("" + (int)value); - Globals.signalSystem.post(SignalType.YOGA_APPLY, Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN)); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN)); }); }, DEFAULT_GRID_SIZE / (float)GriddedDataCellManager.MAX_GRID_SIZE) ); diff --git a/src/main/java/electrosphere/client/ui/menu/mainmenu/worldgen/MenuWorldSelect.java b/src/main/java/electrosphere/client/ui/menu/mainmenu/worldgen/MenuWorldSelect.java index 77706e68..ccfb549d 100644 --- a/src/main/java/electrosphere/client/ui/menu/mainmenu/worldgen/MenuWorldSelect.java +++ b/src/main/java/electrosphere/client/ui/menu/mainmenu/worldgen/MenuWorldSelect.java @@ -245,7 +245,7 @@ public class MenuWorldSelect { StringCarousel typeCarousel = StringCarousel.create(biomes, (event) -> { int index = biomes.indexOf(event.getAsString()); params.biomeType = index; - Globals.signalSystem.post(SignalType.YOGA_APPLY,rVal); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,rVal); }); typeCarousel.setOption(params.biomeType); panel.addChild(typeCarousel); diff --git a/src/main/java/electrosphere/engine/EngineState.java b/src/main/java/electrosphere/engine/EngineState.java index 489c4ed1..37edadc2 100644 --- a/src/main/java/electrosphere/engine/EngineState.java +++ b/src/main/java/electrosphere/engine/EngineState.java @@ -1,6 +1,7 @@ package electrosphere.engine; import electrosphere.engine.service.ServiceManager; +import electrosphere.engine.signal.SignalSystem; import electrosphere.engine.threads.ThreadManager; import electrosphere.engine.time.Timekeeper; @@ -24,11 +25,17 @@ public class EngineState { */ public final ServiceManager serviceManager = ServiceManager.create(); + /** + * The signal system + */ + public SignalSystem signalSystem; + /** * Constructor */ public EngineState(){ this.threadManager.init(); + this.signalSystem = (SignalSystem)this.serviceManager.registerService(new SignalSystem()); } /** diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java index 4fecacb8..6ceed847 100644 --- a/src/main/java/electrosphere/engine/Globals.java +++ b/src/main/java/electrosphere/engine/Globals.java @@ -33,7 +33,6 @@ import electrosphere.engine.assetmanager.AssetManager; import electrosphere.engine.loadingthreads.InitialAssetLoading; import electrosphere.engine.os.fs.FileWatcherService; import electrosphere.engine.profiler.Profiler; -import electrosphere.engine.signal.SignalSystem; import electrosphere.engine.signal.sync.MainThreadSignalService; import electrosphere.logger.LoggerInterface; import electrosphere.net.config.NetConfig; @@ -71,11 +70,6 @@ public class Globals { // public static String javaPID; - // - //Signal system - // - public static SignalSystem signalSystem; - // //Top level user settings object // @@ -405,7 +399,6 @@ public class Globals { //add services here - Globals.signalSystem = (SignalSystem)Globals.engineState.serviceManager.registerService(new SignalSystem()); Globals.elementService = (ElementService)Globals.engineState.serviceManager.registerService(new ElementService()); Globals.particleService = (ParticleService)Globals.engineState.serviceManager.registerService(new ParticleService()); Globals.scriptEngine = (ScriptEngine)Globals.engineState.serviceManager.registerService(new ScriptEngine()); @@ -603,7 +596,6 @@ public class Globals { Globals.audioEngine = null; Globals.engineState = null; Globals.renderingEngine = null; - Globals.signalSystem = null; Globals.fileWatcherService = null; Globals.javaPID = null; Globals.RENDER_FLAG_RENDER_SHADOW_MAP = true; diff --git a/src/main/java/electrosphere/engine/loadingthreads/ChunkGenerationTestLoading.java b/src/main/java/electrosphere/engine/loadingthreads/ChunkGenerationTestLoading.java index 4ee03729..4a387ef8 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/ChunkGenerationTestLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/ChunkGenerationTestLoading.java @@ -34,7 +34,7 @@ public class ChunkGenerationTestLoading { Globals.serverState.aiManager.setActive(false); - Globals.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ Window loadingWindow = (Window)Globals.elementService.getWindow(WindowStrings.WINDOW_LOADING); //show loading WindowUtils.recursiveSetVisible(Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN), false); diff --git a/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java b/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java index f0e58aad..cbbf1079 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java @@ -107,7 +107,7 @@ public class ClientLoading { protected static void loadClientWorld(Object[] params){ - Globals.signalSystem.post(SignalType.UI_MODIFICATION, () -> { + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, () -> { WindowUtils.closeWindow(WindowStrings.WINDOW_MENU_MAIN); WindowUtils.recursiveSetVisible(WindowStrings.WINDOW_LOADING, true); WindowUtils.updateLoadingWindow("LOADING"); @@ -131,7 +131,7 @@ public class ClientLoading { //set simulations to ready if they exist LoadingUtils.setSimulationsToReady(); //make loading window disappear - Globals.signalSystem.post(SignalType.UI_MODIFICATION, () -> { + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, () -> { WindowUtils.recursiveSetVisible(WindowStrings.WINDOW_LOADING, false); Globals.RENDER_FLAG_RENDER_SHADOW_MAP = true; Globals.RENDER_FLAG_RENDER_SCREEN_FRAMEBUFFER_CONTENT = true; @@ -151,7 +151,7 @@ public class ClientLoading { * Loads the viewport */ protected static void loadViewport(Object[] params){ - Globals.signalSystem.post(SignalType.UI_MODIFICATION, () -> { + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, () -> { WindowUtils.closeWindow(WindowStrings.WINDOW_MENU_MAIN); WindowUtils.recursiveSetVisible(WindowStrings.WINDOW_LOADING, true); }); @@ -173,7 +173,7 @@ public class ClientLoading { //sets micro and macro sims to ready if they exist setSimulationsToReady(); //make loading window disappear - Globals.signalSystem.post(SignalType.UI_MODIFICATION, () -> { + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, () -> { WindowUtils.recursiveSetVisible(WindowStrings.WINDOW_LOADING, false); Globals.RENDER_FLAG_RENDER_SHADOW_MAP = true; Globals.RENDER_FLAG_RENDER_SCREEN_FRAMEBUFFER_CONTENT = true; diff --git a/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java b/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java index 621730ba..957518cc 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java @@ -19,7 +19,7 @@ public class DebugSPWorldLoading { protected static void loadDebugSPWorld(Object[] params){ - Globals.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ Window loadingWindow = (Window)Globals.elementService.getWindow(WindowStrings.WINDOW_LOADING); //show loading WindowUtils.recursiveSetVisible(Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN), false); diff --git a/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java b/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java index d4026c26..699a0c10 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java @@ -54,7 +54,7 @@ public class LevelEditorLoading { Globals.serverState.aiManager.setActive(false); - Globals.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ Window loadingWindow = (Window)Globals.elementService.getWindow(WindowStrings.WINDOW_LOADING); //show loading WindowUtils.recursiveSetVisible(Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN), false); diff --git a/src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java b/src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java index 1f2fc326..c1a97ee4 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java @@ -28,7 +28,7 @@ public class LevelLoading { } String saveName = (String)params[0]; - Globals.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ Window loadingWindow = (Window)Globals.elementService.getWindow(WindowStrings.WINDOW_LOADING); //show loading WindowUtils.recursiveSetVisible(Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN), false); diff --git a/src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java b/src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java index d358c04f..10a72206 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java @@ -42,7 +42,7 @@ public class MainMenuLoading { // //reveal in game main menu - Globals.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ WindowUtils.closeWindow(WindowStrings.WINDOW_MENU_INGAME_MAIN); }); MainMenuLoading.loadMainMenu(params); @@ -71,7 +71,7 @@ public class MainMenuLoading { * @param params Params (this thread type does not accept any) */ protected static void loadMainMenu(Object[] params){ - Globals.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ Window loadingWindow = (Window)Globals.elementService.getWindow(WindowStrings.WINDOW_LOADING); if(loadingWindow != null){ WindowUtils.recursiveSetVisible(loadingWindow,false); diff --git a/src/main/java/electrosphere/engine/loadingthreads/ServerLoading.java b/src/main/java/electrosphere/engine/loadingthreads/ServerLoading.java index 42aee8f5..5e9f700a 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/ServerLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/ServerLoading.java @@ -23,7 +23,7 @@ public class ServerLoading { String password = (String)params[2]; //setup ui for loading - Globals.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ Window loadingWindow = (Window)Globals.elementService.getWindow(WindowStrings.WINDOW_LOADING); //show loading WindowUtils.recursiveSetVisible(Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN), false); diff --git a/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java b/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java index b44c85e8..366abcef 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java @@ -28,7 +28,7 @@ public class ViewportLoading { protected static void loadViewport(Object[] params){ // //show loading - Globals.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, ()->{ Window loadingWindow = (Window)Globals.elementService.getWindow(WindowStrings.WINDOW_LOADING); WindowUtils.recursiveSetVisible(Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN), false); WindowUtils.replaceMainMenuContents(MenuGenerators.createEmptyMainMenu()); diff --git a/src/main/java/electrosphere/engine/service/ServiceManager.java b/src/main/java/electrosphere/engine/service/ServiceManager.java index 3adcd7a7..08aaec17 100644 --- a/src/main/java/electrosphere/engine/service/ServiceManager.java +++ b/src/main/java/electrosphere/engine/service/ServiceManager.java @@ -53,7 +53,7 @@ public class ServiceManager { } for(Service service : trackedServices){ if(service instanceof SignalService){ - Globals.signalSystem.registerService((SignalService)service); + Globals.engineState.signalSystem.registerService((SignalService)service); } } } diff --git a/src/main/java/electrosphere/net/client/protocol/CharacterProtocol.java b/src/main/java/electrosphere/net/client/protocol/CharacterProtocol.java index c9107275..50a724a2 100644 --- a/src/main/java/electrosphere/net/client/protocol/CharacterProtocol.java +++ b/src/main/java/electrosphere/net/client/protocol/CharacterProtocol.java @@ -35,7 +35,7 @@ public class CharacterProtocol implements ClientProtocolTemplate { + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION,() -> { WindowUtils.replaceMainMenuContents(MenuCharacterCreation.createCharacterSelectionWindow()); }); } break; diff --git a/src/main/java/electrosphere/renderer/RenderingEngine.java b/src/main/java/electrosphere/renderer/RenderingEngine.java index 4d4c37c2..4b353afe 100644 --- a/src/main/java/electrosphere/renderer/RenderingEngine.java +++ b/src/main/java/electrosphere/renderer/RenderingEngine.java @@ -470,8 +470,8 @@ public class RenderingEngine { /** * Alert everyone that the rendering engine is ready */ - if(Globals.signalSystem != null){ - Globals.signalSystem.post(SignalType.RENDERING_ENGINE_READY); + if(Globals.engineState.signalSystem != null){ + Globals.engineState.signalSystem.post(SignalType.RENDERING_ENGINE_READY); } } diff --git a/src/main/java/electrosphere/renderer/ui/elements/Label.java b/src/main/java/electrosphere/renderer/ui/elements/Label.java index 6381c656..cb4f0016 100644 --- a/src/main/java/electrosphere/renderer/ui/elements/Label.java +++ b/src/main/java/electrosphere/renderer/ui/elements/Label.java @@ -80,7 +80,7 @@ public class Label extends StandardContainerElement implements DrawableElement { private void generateLetters(){ //free children for(Element child : childList){ - Globals.signalSystem.post(SignalType.YOGA_DESTROY, child); + Globals.engineState.signalSystem.post(SignalType.YOGA_DESTROY, child); } this.clearChildren(); int accumulatingWidth = 0; diff --git a/src/main/java/electrosphere/renderer/ui/elements/StandardContainerElement.java b/src/main/java/electrosphere/renderer/ui/elements/StandardContainerElement.java index 85fcd014..a6c078a9 100644 --- a/src/main/java/electrosphere/renderer/ui/elements/StandardContainerElement.java +++ b/src/main/java/electrosphere/renderer/ui/elements/StandardContainerElement.java @@ -106,7 +106,7 @@ public class StandardContainerElement extends StandardElement implements Contain @Override public void destroy(){ for(Element child : childList){ - Globals.signalSystem.post(SignalType.YOGA_DESTROY, child); + Globals.engineState.signalSystem.post(SignalType.YOGA_DESTROY, child); } if(this.yogaNode != Element.NULL_YOGA_ELEMENT){ Yoga.YGNodeFree(this.yogaNode); diff --git a/src/main/java/electrosphere/renderer/ui/elements/StringCarousel.java b/src/main/java/electrosphere/renderer/ui/elements/StringCarousel.java index 4acf7527..07b2928c 100644 --- a/src/main/java/electrosphere/renderer/ui/elements/StringCarousel.java +++ b/src/main/java/electrosphere/renderer/ui/elements/StringCarousel.java @@ -123,7 +123,7 @@ public class StringCarousel extends StandardContainerElement implements Drawable void generateLetters(){ for(Element el : getChildren()){ - Globals.signalSystem.post(SignalType.YOGA_DESTROY, el); + Globals.engineState.signalSystem.post(SignalType.YOGA_DESTROY, el); } this.clearChildren(); int accumulatingWidth = 0; @@ -148,7 +148,7 @@ public class StringCarousel extends StandardContainerElement implements Drawable if(focused){ setColor(new Vector4f(1,0,0,1)); } - Globals.signalSystem.post(SignalType.YOGA_APPLY, this); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, this); } public void setColor(Vector4f color){ diff --git a/src/main/java/electrosphere/renderer/ui/elements/TextBox.java b/src/main/java/electrosphere/renderer/ui/elements/TextBox.java index 5be699b4..83a1eaf3 100644 --- a/src/main/java/electrosphere/renderer/ui/elements/TextBox.java +++ b/src/main/java/electrosphere/renderer/ui/elements/TextBox.java @@ -85,7 +85,7 @@ public class TextBox extends StandardDrawableContainerElement { public void setText(String text) { this.text = text; generateLetters(); - Globals.signalSystem.post(SignalType.YOGA_APPLY,this); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,this); } /** @@ -110,7 +110,7 @@ public class TextBox extends StandardDrawableContainerElement { void generateLetters(){ //free children for(Element child : childList){ - Globals.signalSystem.post(SignalType.YOGA_DESTROY, child); + Globals.engineState.signalSystem.post(SignalType.YOGA_DESTROY, child); } this.clearChildren(); String[] words = text.split(" "); diff --git a/src/main/java/electrosphere/renderer/ui/elements/TextInput.java b/src/main/java/electrosphere/renderer/ui/elements/TextInput.java index 2bd2a806..0db451c4 100644 --- a/src/main/java/electrosphere/renderer/ui/elements/TextInput.java +++ b/src/main/java/electrosphere/renderer/ui/elements/TextInput.java @@ -137,7 +137,7 @@ public class TextInput extends StandardContainerElement implements DrawableEleme */ private void generateLetters(){ for(Element el : getChildren()){ - Globals.signalSystem.post(SignalType.YOGA_DESTROY, el); + Globals.engineState.signalSystem.post(SignalType.YOGA_DESTROY, el); } this.clearChildren(); for(int i = 0; i < text.length(); i++){ @@ -300,7 +300,7 @@ public class TextInput extends StandardContainerElement implements DrawableEleme while(parent.getParent() != null){ parent = parent.getParent(); } - Globals.signalSystem.post(SignalType.YOGA_APPLY, parent); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY, parent); //fire value change event Globals.elementService.fireEventNoPosition(new ValueChangeEvent(text), this); return false; diff --git a/src/main/java/electrosphere/renderer/ui/elements/Tooltip.java b/src/main/java/electrosphere/renderer/ui/elements/Tooltip.java index ee162633..3f4cf2b5 100644 --- a/src/main/java/electrosphere/renderer/ui/elements/Tooltip.java +++ b/src/main/java/electrosphere/renderer/ui/elements/Tooltip.java @@ -56,7 +56,7 @@ public class Tooltip extends StandardDrawableContainerElement { if(windowElement instanceof Window){ Window windowView = (Window)windowElement; windowView.addChild(tooltip); - Globals.signalSystem.post(SignalType.YOGA_APPLY,windowView); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,windowView); } return tooltip; } @@ -78,7 +78,7 @@ public class Tooltip extends StandardDrawableContainerElement { if(windowElement instanceof Window){ Window windowView = (Window)windowElement; windowView.addChild(tooltip); - Globals.signalSystem.post(SignalType.YOGA_APPLY,windowView); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,windowView); } return tooltip; } @@ -148,10 +148,10 @@ public class Tooltip extends StandardDrawableContainerElement { if(target == null){ throw new Error("Tooltip is null"); } - Globals.signalSystem.post(SignalType.UI_MODIFICATION,()->{ + Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION,()->{ Window tooltipWindow = (Window)Globals.elementService.getWindow(WindowStrings.TOOLTIP_WINDOW); tooltipWindow.removeChild(target); - Globals.signalSystem.post(SignalType.YOGA_DESTROY, target); + Globals.engineState.signalSystem.post(SignalType.YOGA_DESTROY, target); }); } diff --git a/src/main/java/electrosphere/renderer/ui/elements/Window.java b/src/main/java/electrosphere/renderer/ui/elements/Window.java index 7a765b8b..301369b9 100644 --- a/src/main/java/electrosphere/renderer/ui/elements/Window.java +++ b/src/main/java/electrosphere/renderer/ui/elements/Window.java @@ -275,7 +275,7 @@ public class Window implements DrawableElement, ContainerElement, NavigableEleme public void destroy(){ this.yogaNode = Element.NULL_YOGA_ELEMENT; for(Element el : this.getChildren()){ - Globals.signalSystem.post(SignalType.YOGA_DESTROY, el); + Globals.engineState.signalSystem.post(SignalType.YOGA_DESTROY, el); } this.clearChildren(); if(this.yogaNode != Element.NULL_YOGA_ELEMENT){ @@ -288,7 +288,7 @@ public class Window implements DrawableElement, ContainerElement, NavigableEleme */ public void clear(){ for(Element el : this.getChildren()){ - Globals.signalSystem.post(SignalType.YOGA_DESTROY, el); + Globals.engineState.signalSystem.post(SignalType.YOGA_DESTROY, el); } this.clearChildren(); } diff --git a/src/main/java/electrosphere/renderer/ui/elements/Word.java b/src/main/java/electrosphere/renderer/ui/elements/Word.java index fd9b6800..5dc99ee3 100644 --- a/src/main/java/electrosphere/renderer/ui/elements/Word.java +++ b/src/main/java/electrosphere/renderer/ui/elements/Word.java @@ -79,7 +79,7 @@ public class Word extends StandardDrawableContainerElement { public void setText(String text) { this.text = text; generateLetters(); - Globals.signalSystem.post(SignalType.YOGA_APPLY,this); + Globals.engineState.signalSystem.post(SignalType.YOGA_APPLY,this); } /** @@ -88,7 +88,7 @@ public class Word extends StandardDrawableContainerElement { void generateLetters(){ //free children for(Element child : childList){ - Globals.signalSystem.post(SignalType.YOGA_DESTROY, child); + Globals.engineState.signalSystem.post(SignalType.YOGA_DESTROY, child); } this.clearChildren(); for(int i = 0; i < text.length(); i++){ diff --git a/src/test/java/electrosphere/test/template/extensions/StateCleanupCheckerExtension.java b/src/test/java/electrosphere/test/template/extensions/StateCleanupCheckerExtension.java index 0dfabc6c..90db8f7b 100644 --- a/src/test/java/electrosphere/test/template/extensions/StateCleanupCheckerExtension.java +++ b/src/test/java/electrosphere/test/template/extensions/StateCleanupCheckerExtension.java @@ -15,7 +15,6 @@ public class StateCleanupCheckerExtension implements AfterEachCallback { @Override public void afterEach(ExtensionContext context) throws Exception { Object[] objectsToCheck = new Object[]{ - Globals.signalSystem, Globals.renderingEngine, Globals.audioEngine, Globals.javaPID,