diff --git a/buildNumber.properties b/buildNumber.properties index 2d9f71f6..92a75fca 100644 --- a/buildNumber.properties +++ b/buildNumber.properties @@ -1,3 +1,3 @@ #maven.buildNumber.plugin properties file -#Thu Aug 22 19:29:58 EDT 2024 -buildNumber=288 +#Sat Aug 24 10:15:18 EDT 2024 +buildNumber=293 diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md index 511d3a8f..8a309376 100644 --- a/docs/src/progress/currenttarget.md +++ b/docs/src/progress/currenttarget.md @@ -18,8 +18,6 @@ Ticketed randomizer node for BTs to more heavily weight attacking and waiting + bug fixes - Fix anime outlines drawing over solid geometry - Fix anime outlines not drawing for first person pipeline Fix falling tree not always deactivating on server Fix AI tracking deleted entity Fix server ground movement tree playing animation over falling animation diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 3c8a5bd1..e2c690d0 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -625,6 +625,9 @@ Fix rendering testing on jenkins Fix entity scene test spinup by preventing networking sockets from closing Thread manager/tracker + properly closing threads on engine close +(08/24/2024) +Disable anime outlines effect + # TODO diff --git a/src/main/java/electrosphere/engine/Main.java b/src/main/java/electrosphere/engine/Main.java index a5151b73..e9abbadb 100644 --- a/src/main/java/electrosphere/engine/Main.java +++ b/src/main/java/electrosphere/engine/Main.java @@ -80,7 +80,7 @@ public class Main { Globals.initGlobals(); //init scripting engine - Globals.scriptEngine.init(); + Globals.threadManager.start(new LoadingThread(LoadingThreadType.SCRIPT_ENGINE)); //controls if(Globals.RUN_CLIENT){ diff --git a/src/main/java/electrosphere/engine/loadingthreads/EngineInitLoading.java b/src/main/java/electrosphere/engine/loadingthreads/EngineInitLoading.java new file mode 100644 index 00000000..8cb25256 --- /dev/null +++ b/src/main/java/electrosphere/engine/loadingthreads/EngineInitLoading.java @@ -0,0 +1,17 @@ +package electrosphere.engine.loadingthreads; + +import electrosphere.engine.Globals; + +/** + * Loading routines to init different parts of the engine + */ +public class EngineInitLoading { + + /** + * Loads the core assets of the scripting engine from disk and initializes the engine + */ + protected static void loadScriptingEngine(Object[] params){ + Globals.scriptEngine.init(); + } + +} diff --git a/src/main/java/electrosphere/engine/loadingthreads/LoadingThread.java b/src/main/java/electrosphere/engine/loadingthreads/LoadingThread.java index b31a7602..8e9ec6a7 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/LoadingThread.java +++ b/src/main/java/electrosphere/engine/loadingthreads/LoadingThread.java @@ -50,6 +50,11 @@ public class LoadingThread extends Thread { */ DEMO_MENU, + /** + * Loads the script engine code from disk + */ + SCRIPT_ENGINE, + } /** @@ -113,6 +118,11 @@ public class LoadingThread extends Thread { case DEMO_MENU: { DemoLoading.loadDemoMenu(this.params); } break; + + //Inits the script engine + case SCRIPT_ENGINE: { + EngineInitLoading.loadScriptingEngine(this.params); + } break; } isDone = true; diff --git a/src/main/java/electrosphere/renderer/pipelines/CompositePipeline.java b/src/main/java/electrosphere/renderer/pipelines/CompositePipeline.java index a934e4fa..163577c4 100644 --- a/src/main/java/electrosphere/renderer/pipelines/CompositePipeline.java +++ b/src/main/java/electrosphere/renderer/pipelines/CompositePipeline.java @@ -28,20 +28,20 @@ public class CompositePipeline implements RenderPipeline { // //Draw anime outline // - openGLState.setActiveShader(renderPipelineState, RenderingEngine.compositeAnimeOutline); + // openGLState.setActiveShader(renderPipelineState, RenderingEngine.compositeAnimeOutline); - openGLState.glActiveTexture(GL40.GL_TEXTURE0); - openGLState.glBindTexture(GL40.GL_TEXTURE_2D, 0); - openGLState.glActiveTexture(GL40.GL_TEXTURE1); - openGLState.glBindTexture(GL40.GL_TEXTURE_2D, 0); - openGLState.glActiveTexture(GL40.GL_TEXTURE2); - openGLState.glBindTexture(GL40.GL_TEXTURE_2D, 0); - openGLState.glActiveTexture(GL40.GL_TEXTURE3); - openGLState.glBindTexture(GL40.GL_TEXTURE_2D, 0); - openGLState.glActiveTexture(GL40.GL_TEXTURE0); - openGLState.glBindTexture(GL40.GL_TEXTURE_2D, RenderingEngine.normalsOutlineTexture.getTexturePointer()); + // openGLState.glActiveTexture(GL40.GL_TEXTURE0); + // openGLState.glBindTexture(GL40.GL_TEXTURE_2D, 0); + // openGLState.glActiveTexture(GL40.GL_TEXTURE1); + // openGLState.glBindTexture(GL40.GL_TEXTURE_2D, 0); + // openGLState.glActiveTexture(GL40.GL_TEXTURE2); + // openGLState.glBindTexture(GL40.GL_TEXTURE_2D, 0); + // openGLState.glActiveTexture(GL40.GL_TEXTURE3); + // openGLState.glBindTexture(GL40.GL_TEXTURE_2D, 0); + // openGLState.glActiveTexture(GL40.GL_TEXTURE0); + // openGLState.glBindTexture(GL40.GL_TEXTURE_2D, RenderingEngine.normalsOutlineTexture.getTexturePointer()); - GL40.glDrawArrays(GL40.GL_TRIANGLES, 0, 6); + // GL40.glDrawArrays(GL40.GL_TRIANGLES, 0, 6); // //Composite transparency on top of solids