pull up lwjgl ver, fix profiler bug
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
This commit is contained in:
parent
a617456fc5
commit
1ed791e6fe
@ -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
|
||||
|
||||
|
||||
|
||||
|
||||
2
pom.xml
2
pom.xml
@ -9,7 +9,7 @@
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<lwjgl.version>3.3.3</lwjgl.version>
|
||||
<lwjgl.version>3.3.6</lwjgl.version>
|
||||
<joml.version>1.9.19</joml.version>
|
||||
<recast.version>1.5.7</recast.version>
|
||||
<imgui.version>1.86.11</imgui.version>
|
||||
|
||||
@ -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 {
|
||||
|
||||
|
||||
@ -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() {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user