diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 11158fb2..b1020bb3 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1959,6 +1959,7 @@ LOD component that destroys far-away physics visually LOD far away models support Profiler work Thread manager dispatching futures service +Bump LWJGL version 3.3.3 -> 3.3.6 diff --git a/pom.xml b/pom.xml index f4239c07..a7a97617 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ UTF-8 17 17 - 3.3.3 + 3.3.6 1.9.19 1.5.7 1.86.11 diff --git a/src/main/java/electrosphere/engine/Main.java b/src/main/java/electrosphere/engine/Main.java index 4e60455c..14a7fb06 100644 --- a/src/main/java/electrosphere/engine/Main.java +++ b/src/main/java/electrosphere/engine/Main.java @@ -119,10 +119,6 @@ public class Main { //init global variables Globals.initGlobals(); - // - //init profiler - Globals.profiler.start(); - //init scripting engine if(EngineState.EngineFlags.RUN_SCRIPTS){ Globals.engineState.threadManager.start(new LoadingThread(LoadingThreadType.SCRIPT_ENGINE)); @@ -214,6 +210,7 @@ public class Main { //enable profiler control if(Main.enableProfiler){ Globals.profiler.start(); + Main.enableProfiler = false; } try { diff --git a/src/main/java/electrosphere/renderer/ui/elements/Window.java b/src/main/java/electrosphere/renderer/ui/elements/Window.java index 7da0f348..8ffaa11f 100644 --- a/src/main/java/electrosphere/renderer/ui/elements/Window.java +++ b/src/main/java/electrosphere/renderer/ui/elements/Window.java @@ -6,8 +6,6 @@ import java.util.List; import org.joml.Vector3f; import org.joml.Vector4f; import org.lwjgl.opengl.GL40; -import org.lwjgl.util.yoga.YGLayout; -import org.lwjgl.util.yoga.YGNode; import org.lwjgl.util.yoga.Yoga; import electrosphere.engine.Globals; @@ -115,7 +113,6 @@ public class Window implements DrawableElement, ContainerElement, NavigableEleme public Window(OpenGLState openGLState, int positionX, int positionY, int width, int height, boolean showDecorations){ //yoga node for the actually visible part this.yogaNode = Yoga.YGNodeNew(); - this.layout = YGNode.create(this.yogaNode).layout(); //yoga node for placement this.parentWindowYogaNode = Yoga.YGNodeNew(); Yoga.YGNodeInsertChild(this.parentWindowYogaNode, this.yogaNode, 0); @@ -136,7 +133,6 @@ public class Window implements DrawableElement, ContainerElement, NavigableEleme private Window(OpenGLState openGLState){ //yoga node for the actually visible part this.yogaNode = Yoga.YGNodeNew(); - this.layout = YGNode.create(this.yogaNode).layout(); //yoga node for placement this.parentWindowYogaNode = Yoga.YGNodeNew(); Yoga.YGNodeInsertChild(this.parentWindowYogaNode, this.yogaNode, 0); @@ -438,8 +434,6 @@ public class Window implements DrawableElement, ContainerElement, NavigableEleme //the yoga node id long yogaNode = -1; - //the layout object - YGLayout layout; @Override public long getYogaNode() {