studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lots of testing work
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
austin 2024-09-05 19:56:45 -04:00
parent 7393c0b094
commit 5cce5e5ac1
28 changed files with 374 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/Textures/default_texture_map.json
View File

@ -37,6 +37,13 @@
"isDefault": true
}
],
"Models/basic/geometry/unitcylinder.glb": [
{
"meshName" : "Cylinder",
"diffuse" : "/Textures/transparent_grey.png",
"isDefault": true
}
],
"Models/basic/geometry/unitcapsule.glb": [
{
"meshName" : "Sphere",

29
src/main/java/electrosphere/engine/Globals.java
View File

@ -1,5 +1,7 @@
package electrosphere.engine;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import org.joml.Matrix4f;
@ -431,7 +433,15 @@ public class Globals {
* Inits globals
*/
public static void initGlobals(){
//initialize logging interfaces
LoggerInterface.initLoggers();
LoggerInterface.loggerStartup.INFO("Initialize global variables");
//gets java pid of engine
if(Globals.javaPID == null){
Globals.javaPID = ManagementFactory.getRuntimeMXBean().getName();
}
//load user settings
UserSettings.loadUserSettings();
//timekeeper
timekeeper = new Timekeeper();
threadManager = new ThreadManager();
@ -503,6 +513,7 @@ public class Globals {
//Register all signals
Globals.signalSystem.registerService(SignalType.YOGA_APPLY, Globals.elementService);
Globals.signalSystem.registerService(SignalType.YOGA_DESTROY, Globals.elementService);
Globals.signalSystem.registerService(SignalType.UI_MODIFICATION, Globals.elementService);
}
@ -634,6 +645,8 @@ public class Globals {
Globals.clientScene = new Scene();
Globals.clientSceneWrapper = new ClientSceneWrapper(Globals.clientScene, new CollisionEngine());
Globals.clientSynchronizationManager = new ClientSynchronizationManager();
Globals.server = null;
Globals.serverSynchronizationManager = new ServerSynchronizationManager();
if(Globals.realmManager != null){
Globals.realmManager.reset();
}
@ -649,12 +662,18 @@ public class Globals {
Globals.assetManager = null;
Globals.elementService = null;
Globals.realmManager = null;
//
//Destroy services
if(Globals.serviceManager != null){
Globals.serviceManager.destroy();
}
Globals.clientSceneWrapper = null;
Globals.clientScene = null;
Globals.audioEngine = null;
Globals.renderingEngine = null;
Globals.signalSystem = null;
Globals.serviceManager = null;
Globals.clientConnection = null;
Globals.clientSynchronizationManager = null;
Globals.server = null;
Globals.serverSynchronizationManager = null;
Globals.javaPID = null;
LoggerInterface.destroyLoggers();
}

31
src/main/java/electrosphere/engine/Main.java
View File

@ -3,7 +3,6 @@ package electrosphere.engine;
import static org.lwjgl.glfw.GLFW.glfwTerminate;
import static org.lwjgl.glfw.GLFW.glfwWindowShouldClose;
import java.lang.management.ManagementFactory;
import java.util.concurrent.TimeUnit;
import org.graalvm.polyglot.HostAccess.Export;
@ -19,7 +18,6 @@ import electrosphere.engine.loadingthreads.LoadingThread;
import electrosphere.engine.loadingthreads.LoadingThread.LoadingThreadType;
import electrosphere.engine.threads.LabeledThread.ThreadLabel;
import electrosphere.engine.time.Timekeeper;
import electrosphere.game.config.UserSettings;
import electrosphere.game.server.world.MacroData;
import electrosphere.logger.LoggerInterface;
import electrosphere.menu.debug.ImGuiWindowMacros;
@ -86,15 +84,6 @@ public class Main {
//parse command line arguments
CLIParser.parseCLIArgs(args);
//initialize logging interfaces
LoggerInterface.initLoggers();
//gets java pid of engine
Globals.javaPID = ManagementFactory.getRuntimeMXBean().getName();
//load user settings
UserSettings.loadUserSettings();
//init global variables
Globals.initGlobals();
@ -172,7 +161,9 @@ public class Main {
//Sets a hook that fires when the engine process stops
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
if(LoggerInterface.loggerEngine != null){
LoggerInterface.loggerEngine.INFO("Shutdown hook!");
}
}));
//uncomment to test loading a model into engine
@ -435,23 +426,24 @@ public class Main {
* Shuts down the engine
*/
public static void shutdown(){
LoggerInterface.loggerEngine.WARNING("ENGINE SHUTDOWN");
if(LoggerInterface.loggerEngine != null){
LoggerInterface.loggerEngine.INFO("ENGINE SHUTDOWN");
}
//
// S H U T D O W N
//
//Terminate the program.
if(Globals.RUN_CLIENT){
if(Globals.renderingEngine != null){
glfwTerminate();
Globals.renderingEngine.clearGlobalState();
Globals.renderingEngine.destroy();
}
//used to signal threads to stop
if(Globals.threadManager != null){
Globals.threadManager.close();
}
//reset globals for good measure (making sure no long-running threads can re-inject entities into scenes)
Globals.resetGlobals();
//shut down audio engine
if(!Globals.HEADLESS && Globals.RUN_CLIENT && Globals.RUN_AUDIO && Globals.audioEngine != null && Globals.audioEngine.initialized()){
if(Globals.audioEngine != null && Globals.audioEngine.initialized()){
Globals.audioEngine.shutdown();
}
//if netmonitor is running, close
@ -463,6 +455,13 @@ public class Main {
OdeHelper.closeODE();
initOde = false;
}
//
//Destroy services
if(Globals.serviceManager != null){
Globals.serviceManager.destroy();
}
//reset globals for good measure (making sure no long-running threads can re-inject entities into scenes)
Globals.resetGlobals();
}
static void sleep(int i) {

14
src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java
View File

@ -86,16 +86,15 @@ public class ClientLoading {
//make loading window disappear
Globals.signalSystem.post(SignalType.UI_MODIFICATION, () -> {
WindowUtils.recursiveSetVisible(WindowStrings.WINDOW_LOADING, false);
});
//recapture screen
Globals.controlHandler.setRecapture(true);
//set rendering flags to main game mode
Globals.RENDER_FLAG_RENDER_SHADOW_MAP = true;
Globals.RENDER_FLAG_RENDER_SCREEN_FRAMEBUFFER_CONTENT = true;
Globals.RENDER_FLAG_RENDER_SCREEN_FRAMEBUFFER = true;
Globals.RENDER_FLAG_RENDER_UI = true;
Globals.RENDER_FLAG_RENDER_BLACK_BACKGROUND = false;
Globals.RENDER_FLAG_RENDER_WHITE_BACKGROUND = false;
});
//recapture screen
Globals.controlHandler.setRecapture(true);
LoggerInterface.loggerEngine.INFO("[Client]Finished loading main game");
//set controls state
Globals.controlHandler.hintUpdateControlState(ControlHandler.ControlsState.MAIN_GAME);
@ -129,16 +128,15 @@ public class ClientLoading {
//make loading window disappear
Globals.signalSystem.post(SignalType.UI_MODIFICATION, () -> {
WindowUtils.recursiveSetVisible(WindowStrings.WINDOW_LOADING, false);
});
//recapture screen
Globals.controlHandler.setRecapture(true);
//set rendering flags to main game mode
Globals.RENDER_FLAG_RENDER_SHADOW_MAP = true;
Globals.RENDER_FLAG_RENDER_SCREEN_FRAMEBUFFER_CONTENT = true;
Globals.RENDER_FLAG_RENDER_SCREEN_FRAMEBUFFER = true;
Globals.RENDER_FLAG_RENDER_UI = true;
Globals.RENDER_FLAG_RENDER_BLACK_BACKGROUND = false;
Globals.RENDER_FLAG_RENDER_WHITE_BACKGROUND = false;
});
//recapture screen
Globals.controlHandler.setRecapture(true);
LoggerInterface.loggerEngine.INFO("[Client]Finished loading main game");
//set controls state
Globals.controlHandler.hintUpdateControlState(ControlHandler.ControlsState.MAIN_GAME);

3
src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java
View File

@ -4,6 +4,7 @@ import java.util.concurrent.TimeUnit;
import electrosphere.auth.AuthenticationManager;
import electrosphere.engine.Globals;
import electrosphere.engine.signal.Signal.SignalType;
import electrosphere.entity.scene.SceneGenerator;
import electrosphere.logger.LoggerInterface;
import electrosphere.menu.MenuGenerators;
@ -18,11 +19,13 @@ public class DebugSPWorldLoading {
protected static void loadDebugSPWorld(Object[] params){
Globals.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);
WindowUtils.replaceMainMenuContents(MenuGenerators.createEmptyMainMenu());
loadingWindow.setVisible(true);
});
String saveName = "random_sp_world";
if(!SaveUtils.getSaves().contains(saveName)){

3
src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java
View File

@ -4,6 +4,7 @@ import java.util.concurrent.TimeUnit;
import electrosphere.auth.AuthenticationManager;
import electrosphere.engine.Globals;
import electrosphere.engine.signal.Signal.SignalType;
import electrosphere.entity.scene.SceneFile;
import electrosphere.logger.LoggerInterface;
import electrosphere.menu.MenuGenerators;
@ -53,11 +54,13 @@ public class LevelEditorLoading {
Globals.aiManager.setActive(false);
Globals.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);
WindowUtils.replaceMainMenuContents(MenuGenerators.createEmptyMainMenu());
loadingWindow.setVisible(true);
});
if(!SaveUtils.getSaves().contains(saveName)){
//init save structure

3
src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java
View File

@ -4,6 +4,7 @@ import java.util.concurrent.TimeUnit;
import electrosphere.auth.AuthenticationManager;
import electrosphere.engine.Globals;
import electrosphere.engine.signal.Signal.SignalType;
import electrosphere.logger.LoggerInterface;
import electrosphere.menu.MenuGenerators;
import electrosphere.menu.WindowStrings;
@ -27,11 +28,13 @@ public class LevelLoading {
}
String saveName = (String)params[0];
Globals.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);
WindowUtils.replaceMainMenuContents(MenuGenerators.createEmptyMainMenu());
loadingWindow.setVisible(true);
});
//load save
SaveUtils.loadSave(saveName, false);

5
src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java
View File

@ -1,6 +1,7 @@
package electrosphere.engine.loadingthreads;
import electrosphere.engine.Globals;
import electrosphere.engine.signal.Signal.SignalType;
import electrosphere.engine.threads.LabeledThread.ThreadLabel;
import electrosphere.menu.WindowStrings;
import electrosphere.menu.WindowUtils;
@ -37,7 +38,9 @@ public class MainMenuLoading {
//
//reveal in game main menu
Globals.signalSystem.post(SignalType.UI_MODIFICATION, ()->{
WindowUtils.closeWindow(WindowStrings.WINDOW_MENU_INGAME_MAIN);
});
MainMenuLoading.loadMainMenu(params);
}
@ -65,6 +68,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, ()->{
Window loadingWindow = (Window)Globals.elementService.getWindow(WindowStrings.WINDOW_LOADING);
if(loadingWindow != null){
WindowUtils.recursiveSetVisible(loadingWindow,false);
@ -75,6 +79,7 @@ public class MainMenuLoading {
if(mainMenuWindow != null){
WindowUtils.recursiveSetVisible(mainMenuWindow, true);
}
});
}
}

3
src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java
View File

@ -6,6 +6,7 @@ import org.joml.Vector3d;
import electrosphere.auth.AuthenticationManager;
import electrosphere.engine.Globals;
import electrosphere.engine.signal.Signal.SignalType;
import electrosphere.logger.LoggerInterface;
import electrosphere.menu.MenuGenerators;
import electrosphere.menu.WindowStrings;
@ -26,10 +27,12 @@ public class ViewportLoading {
protected static void loadViewport(Object[] params){
//
//show loading
Globals.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());
loadingWindow.setVisible(true);
});
//
//init realm manager with viewport realm

12
src/main/java/electrosphere/engine/signal/SignalServiceImpl.java
View File

@ -88,6 +88,18 @@ public class SignalServiceImpl implements SignalService {
}
}
/**
* Gets the number of signals that are queued for handling
* @return The number of signals
*/
public int getSignalQueueCount(){
int rVal = 0;
this.threadLock.acquireUninterruptibly();
rVal = signals.size();
this.threadLock.release();
return rVal;
}
/**
* Handles a signal
* @param signal The signal

9
src/main/java/electrosphere/entity/Scene.java
View File

@ -18,13 +18,16 @@ import java.util.concurrent.CopyOnWriteArraySet;
public class Scene {
Map<Integer,Entity> entityIdMap = new ConcurrentHashMap<Integer,Entity>();
Map<String,Set<Entity>> tagEntityMap = new ConcurrentHashMap<String,Set<Entity>>();
Map<Integer,Entity> entityIdMap;
Map<String,Set<Entity>> tagEntityMap;
List<Entity> entityList = new CopyOnWriteArrayList<Entity>();
List<BehaviorTree> behaviorTreeList = new CopyOnWriteArrayList<BehaviorTree>();
List<BehaviorTree> behaviorTreeList;
public Scene(){
entityIdMap = new ConcurrentHashMap<Integer,Entity>();
tagEntityMap = new ConcurrentHashMap<String,Set<Entity>>();
behaviorTreeList = new CopyOnWriteArrayList<BehaviorTree>();
tagEntityMap.put(EntityTags.BONE_ATTACHED, new CopyOnWriteArraySet<Entity>());
tagEntityMap.put(EntityTags.COLLIDABLE, new CopyOnWriteArraySet<Entity>());
tagEntityMap.put(EntityTags.SPRINTABLE, new CopyOnWriteArraySet<Entity>());

2
src/main/java/electrosphere/game/config/UserSettings.java
View File

@ -207,6 +207,7 @@ public class UserSettings {
public static void loadUserSettings(){
if(Globals.userSettings == null){
LoggerInterface.loggerStartup.INFO("Load user settings");
Globals.userSettings = FileUtils.loadObjectFromAssetPath("/Config/settings.json", UserSettings.class);
if(Globals.userSettings == null){
@ -216,6 +217,7 @@ public class UserSettings {
Globals.WINDOW_HEIGHT = Globals.userSettings.displayHeight;
Globals.verticalFOV = Globals.userSettings.graphicsFOV;
}
}

18
src/main/java/electrosphere/logger/LoggerInterface.java
View File

@ -47,6 +47,24 @@ public class LoggerInterface {
loggerStartup.INFO("Initialized loggers");
}
/**
* Destroys all loggers
*/
public static void destroyLoggers(){
loggerNetworking = null;
loggerFileIO = null;
loggerGameLogic = null;
loggerRenderer = null;
loggerEngine = null;
loggerStartup = null;
loggerAuth = null;
loggerDB = null;
loggerAudio = null;
loggerUI = null;
loggerScripts = null;
loggerAI = null;
}
/**
* Gets the list of all loggers
* @return The list of all loggers

12
src/main/java/electrosphere/menu/WindowUtils.java
View File

@ -78,6 +78,18 @@ public class WindowUtils {
return false;
}
/**
* Checks if the window element is visible
* @param windowElement The window element
* @return true if is visible, false otherwise
*/
public static boolean windowIsVisible(Element windowElement){
if(windowElement instanceof DrawableElement){
return ((DrawableElement)windowElement).getVisible();
}
return false;
}
/**
* Checks whether the window registered to the provided string is open
* @param windowString The window string

2
src/main/java/electrosphere/net/client/ClientNetworking.java
View File

@ -211,7 +211,7 @@ public class ClientNetworking implements Runnable {
}
}
LoggerInterface.loggerNetworking.WARNING("Client networking thread ended");
LoggerInterface.loggerNetworking.INFO("Client networking thread ended");
}

2
src/main/java/electrosphere/net/server/Server.java
View File

@ -98,7 +98,7 @@ public class Server implements Runnable {
}
}
this.isOpen = false;
LoggerInterface.loggerNetworking.WARNING("Server socket thread ended");
LoggerInterface.loggerNetworking.INFO("Server socket thread ended");
}
/**

2
src/main/java/electrosphere/net/server/ServerConnectionHandler.java
View File

@ -244,7 +244,7 @@ public class ServerConnectionHandler implements Runnable {
}
}
LoggerInterface.loggerNetworking.WARNING("Server connection thread ended");
LoggerInterface.loggerNetworking.INFO("Server connection thread ended");
}
/**

7
src/main/java/electrosphere/renderer/RenderingEngine.java
View File

@ -667,6 +667,13 @@ public class RenderingEngine {
return rVal;
}
/**
* Destroys the rendering engine
*/
public void destroy(){
}
/**
* Checks for any errors currently caught by OpenGL.
* Refer: https://docs.gl/gl4/glGetError

16
src/main/java/electrosphere/renderer/ui/elements/Window.java
View File

@ -361,6 +361,20 @@ public class Window implements DrawableElement, ContainerElement, NavigableEleme
@Override
public void applyYoga(int parentX, int parentY) {
if(this.yogaNode != Element.NULL_YOGA_ELEMENT && parentWindowYogaNode != Element.NULL_YOGA_ELEMENT){
if(
Globals.WINDOW_WIDTH <= 0 ||
Globals.WINDOW_HEIGHT <= 0 ||
width <= 0 ||
height <= 0
){
String message = "Window has invalid dimensions!\n" +
"Globals.WINDOW_WIDTH: " + Globals.WINDOW_WIDTH + "\n" +
"Globals.WINDOW_HEIGHT: " + Globals.WINDOW_HEIGHT + "\n" +
"width: " + width + "\n" +
"height: " + height + "\n"
;
throw new IllegalStateException(message);
}
Yoga.YGNodeStyleSetWidth(parentWindowYogaNode, Globals.WINDOW_WIDTH);
Yoga.YGNodeStyleSetHeight(parentWindowYogaNode, Globals.WINDOW_HEIGHT);
//calculate yoga layout
@ -370,7 +384,7 @@ public class Window implements DrawableElement, ContainerElement, NavigableEleme
float topRaw = Yoga.YGNodeLayoutGetTop(yogaNode);
float widthRaw = Yoga.YGNodeLayoutGetWidth(yogaNode);
float heightRaw = Yoga.YGNodeLayoutGetHeight(yogaNode);
// //apply the values to this component
//apply the values to this component
this.positionX = (int)leftRaw;
this.positionY = (int)topRaw;
this.width = (int)widthRaw;

6
src/test/java/electrosphere/engine/GlobalsTests.java
View File

@ -2,8 +2,6 @@ package electrosphere.engine;
import static org.junit.jupiter.api.Assertions.*;
import electrosphere.game.config.UserSettings;
import electrosphere.logger.LoggerInterface;
import electrosphere.test.annotations.IntegrationTest;
/**
@ -13,8 +11,6 @@ public class GlobalsTests {
@IntegrationTest
public void resetGlobals_Variables_null(){
LoggerInterface.initLoggers();
UserSettings.loadUserSettings();
Globals.initGlobals();
Globals.resetGlobals();
assertNull(Globals.assetManager);
@ -30,8 +26,6 @@ public class GlobalsTests {
@IntegrationTest
public void unloadScene_Variables_notNull(){
LoggerInterface.initLoggers();
UserSettings.loadUserSettings();
Globals.initGlobals();
Globals.unloadScene();
assertNotNull(Globals.assetManager);

5
src/test/java/electrosphere/engine/loadingthreads/ViewportLoadingTests.java
View File

@ -9,6 +9,7 @@ import electrosphere.engine.Globals;
import electrosphere.engine.Main;
import electrosphere.menu.WindowStrings;
import electrosphere.menu.WindowUtils;
import electrosphere.renderer.ui.elementtypes.Element;
import electrosphere.test.testutils.EngineInit;
/**
@ -44,7 +45,9 @@ public class ViewportLoadingTests {
EngineInit.setupConnectedTestViewport();
//should see viewport here
assertEquals(false,WindowUtils.windowIsVisible(WindowStrings.WINDOW_MENU_MAIN));
for(Element window : Globals.elementService.getWindowList()){
assertEquals(false,WindowUtils.windowIsVisible(window));
}
}
@IntegrationTest

1
src/test/java/electrosphere/entity/state/movement/fall/ServerFallTreeTests.java
View File

@ -53,6 +53,7 @@ public class ServerFallTreeTests extends EntityTestTemplate {
//make sure we're in in the air
TestEngineUtils.simulateFrames(3);
assertEventually(() -> {
return !serverFallTree.isFalling();
});

119
src/test/java/electrosphere/menu/WindowUtilsTests.java Normal file
View File

@ -0,0 +1,119 @@
package electrosphere.menu;
import static org.junit.jupiter.api.Assertions.*;
import electrosphere.engine.Globals;
import electrosphere.logger.LoggerInterface;
import electrosphere.renderer.ui.ElementService;
import electrosphere.renderer.ui.elements.Div;
import electrosphere.test.annotations.UnitTest;
/**
* Tests for the window utils
*/
public class WindowUtilsTests {
@UnitTest
public void closeWindow_ValidWindow_NotVisible(){
String someWindowString = "test";
LoggerInterface.initLoggers();
Globals.elementService = new ElementService();
Globals.elementService.init();
Globals.elementService.registerWindow(someWindowString, Div.createDiv());
WindowUtils.closeWindow(someWindowString);
assertEquals(false,WindowUtils.windowIsVisible(someWindowString));
}
@UnitTest
public void closeWindow_ValidWindow_NotRegistered(){
String someWindowString = "test";
LoggerInterface.initLoggers();
Globals.elementService = new ElementService();
Globals.elementService.init();
Globals.elementService.registerWindow(someWindowString, Div.createDiv());
WindowUtils.closeWindow(someWindowString);
assertNull(Globals.elementService.getWindow(someWindowString));
}
@UnitTest
public void closeWindow_ValidWindowAfterGlobalsReinit_NoThrow(){
assertDoesNotThrow(()->{
//setup
String someWindowString = "test";
Globals.initGlobals();
Globals.elementService.registerWindow(someWindowString, Div.createDiv());
//close
WindowUtils.closeWindow(someWindowString);
//reinit globals
Globals.resetGlobals();
Globals.initGlobals();
});
}
@UnitTest
public void closeWindow_ValidWindowAfterGlobalsReinit_NotRegistered(){
//setup
String someWindowString = "test";
Globals.initGlobals();
Globals.elementService.registerWindow(someWindowString, Div.createDiv());
//close
WindowUtils.closeWindow(someWindowString);
//reinit globals
Globals.resetGlobals();
Globals.initGlobals();
assertNull(Globals.elementService.getWindow(someWindowString));
}
@UnitTest
public void closeWindow_ValidWindowAfterGlobalsReinit_ElementServiceZeroChildren(){
//setup
String someWindowString = "test";
Globals.initGlobals();
Globals.elementService.registerWindow(someWindowString, Div.createDiv());
//close
WindowUtils.closeWindow(someWindowString);
// reinit globals
Globals.resetGlobals();
Globals.initGlobals();
assertEquals(0,Globals.elementService.getWindowList().size());
}
// @UnitTest
// public void setVisible_ValidWindowToFalseAfterGlobalsReinit_False(){
// //setup
// String someWindowString = "test";
// Globals.initGlobals();
// Globals.elementService.registerWindow(someWindowString, Div.createDiv());
// //visibility toggle
// WindowUtils.recursiveSetVisible(someWindowString,true);
// WindowUtils.recursiveSetVisible(someWindowString,false);
// //reinit globals
// Globals.resetGlobals();
// Globals.initGlobals();
// //register again
// Globals.initGlobals();
// Globals.elementService.registerWindow(someWindowString, Div.createDiv());
// //visibility toggle
// WindowUtils.recursiveSetVisible(someWindowString,true);
// WindowUtils.recursiveSetVisible(someWindowString,false);
// assertNull(!WindowUtils.windowIsVisible(someWindowString));
// }
}

2
src/test/java/electrosphere/test/template/EntityTestTemplate.java
View File

@ -4,6 +4,7 @@ import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.extension.ExtendWith;
import electrosphere.test.template.extensions.EntityExtension;
import electrosphere.test.template.extensions.StateCleanupCheckerExtension;
/**
* Template for writing tests that do stuff with entities in a proper scene
@ -11,6 +12,7 @@ import electrosphere.test.template.extensions.EntityExtension;
@Tag("integration")
@Tag("graphical")
@Tag("entity")
@ExtendWith(StateCleanupCheckerExtension.class)
@ExtendWith(EntityExtension.class)
public class EntityTestTemplate {

3
src/test/java/electrosphere/test/template/RenderingTestTemplate.java
View File

@ -6,6 +6,8 @@ import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.extension.ExtendWith;
import electrosphere.test.template.extensions.RenderingExtension;
import electrosphere.test.template.extensions.StateCleanupCheckerExtension;
import static electrosphere.test.testutils.Assertions.*;
import electrosphere.test.testutils.TestRenderingUtils;
@ -14,6 +16,7 @@ import electrosphere.test.testutils.TestRenderingUtils;
*/
@Tag("integration")
@Tag("graphical")
@ExtendWith(StateCleanupCheckerExtension.class)
@ExtendWith(RenderingExtension.class)
public class RenderingTestTemplate {

39
src/test/java/electrosphere/test/template/extensions/StateCleanupCheckerExtension.java Normal file
View File

@ -0,0 +1,39 @@
package electrosphere.test.template.extensions;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import electrosphere.engine.Globals;
import electrosphere.logger.LoggerInterface;
import electrosphere.renderer.RenderingEngine;
/**
* Checks to make sure state has been properly reset. Must be the FIRST declared extension to work properly
*/
public class StateCleanupCheckerExtension implements AfterEachCallback {
@Override
public void afterEach(ExtensionContext context) throws Exception {
Object[] objectsToCheck = new Object[]{
Globals.realmManager,
Globals.clientSceneWrapper,
Globals.clientScene,
Globals.signalSystem,
Globals.renderingEngine,
Globals.audioEngine,
Globals.javaPID,
Globals.clientConnection,
Globals.clientSynchronizationManager,
Globals.server,
Globals.serverSynchronizationManager,
LoggerInterface.loggerEngine,
RenderingEngine.screenFramebuffer,
};
for(Object object : objectsToCheck){
if(object != null){
throw new Exception("Failed to cleanup state after test! " + object.toString());
}
}
}
}

12
src/test/java/electrosphere/test/testutils/EngineInit.java
View File

@ -2,12 +2,16 @@ package electrosphere.test.testutils;
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.Assertions;
import electrosphere.engine.Globals;
import electrosphere.engine.Main;
import electrosphere.engine.loadingthreads.LoadingThread;
import electrosphere.engine.loadingthreads.LoadingThread.LoadingThreadType;
import electrosphere.engine.profiler.Profiler;
import electrosphere.net.NetUtils;
import electrosphere.renderer.ui.elementtypes.DrawableElement;
import electrosphere.renderer.ui.elementtypes.Element;
public class EngineInit {
@ -67,7 +71,7 @@ public class EngineInit {
for(LoadingThread thread : Globals.threadManager.getLoadingThreads()){
errorMessage = errorMessage + thread.getType() + "\n";
}
throw new IllegalStateException(errorMessage);
Assertions.fail("Failed to startup");
}
}
}
@ -99,9 +103,11 @@ public class EngineInit {
for(LoadingThread thread : Globals.threadManager.getLoadingThreads()){
errorMessage = errorMessage + thread.getType() + "\n";
}
throw new IllegalStateException(errorMessage);
}
Assertions.fail("Failed to startup");
}
}
TestEngineUtils.flush();
}
}

11
src/test/java/electrosphere/test/testutils/TestEngineUtils.java
View File

@ -83,4 +83,15 @@ public class TestEngineUtils {
waitForCondition(test,100);
}
/**
* Flushes any signals that haven't been processed yet
*/
public static void flush(){
while(
Globals.elementService.getSignalQueueCount() > 0
){
Globals.elementService.handleAllSignals();
}
}
}