diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index d0722629..c1d73245 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1305,6 +1305,10 @@ Properly differentiate local/world bone attach point calculation Floating origin implementation for collision engine Improve initial asset loading performance PoseModel creation for basic shape types +Procedural block item types + +(01/25/2025) +Update flush method in tests to account for faster loading diff --git a/src/test/java/electrosphere/test/testutils/EngineInit.java b/src/test/java/electrosphere/test/testutils/EngineInit.java index e961448b..2953ee42 100644 --- a/src/test/java/electrosphere/test/testutils/EngineInit.java +++ b/src/test/java/electrosphere/test/testutils/EngineInit.java @@ -16,6 +16,11 @@ public class EngineInit { //The maximum number of frames to wait before failing the startup routine public static final int MAX_FRAMES_TO_WAIT = 100; + /** + * Max time in milliseconds to wait while flushing + */ + public static final int MAX_TIME_TO_WAIT = 3000; + /** * Initializes the engine */ diff --git a/src/test/java/electrosphere/test/testutils/TestEngineUtils.java b/src/test/java/electrosphere/test/testutils/TestEngineUtils.java index 65391976..a051d9f1 100644 --- a/src/test/java/electrosphere/test/testutils/TestEngineUtils.java +++ b/src/test/java/electrosphere/test/testutils/TestEngineUtils.java @@ -95,6 +95,7 @@ public class TestEngineUtils { // //wait for client to be fully init'd int frames = 0; + long startTime = System.currentTimeMillis(); while(Globals.threadManager.isLoading()){ TestEngineUtils.simulateFrames(1); try { @@ -103,7 +104,7 @@ public class TestEngineUtils { e.printStackTrace(); } frames++; - if(frames > EngineInit.MAX_FRAMES_TO_WAIT){ + if(frames > EngineInit.MAX_FRAMES_TO_WAIT && System.currentTimeMillis() - startTime > EngineInit.MAX_TIME_TO_WAIT){ String errorMessage = "Failed to setup connected test scene!\n" + "Still running threads are:\n" ;