From 0ef9d8c3092d4cb266081e450d3803821a55c35e Mon Sep 17 00:00:00 2001
From: austin <austin@austinwhoover.com>
Date: Sat, 7 Aug 2021 17:43:43 -0400
Subject: [PATCH] Hook user settings into engine more

---
 assets/Config/settings.json                          |  2 +-
 .../java/electrosphere/engine/LoadingThread.java     |  6 +++---
 src/main/java/electrosphere/main/Globals.java        |  2 +-
 .../java/electrosphere/renderer/RenderingEngine.java | 12 +++++++-----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/assets/Config/settings.json b/assets/Config/settings.json
index 380f674f..e3b6869e 100644
--- a/assets/Config/settings.json
+++ b/assets/Config/settings.json
@@ -6,7 +6,7 @@
 
     "graphicsFOV" : 90.0,
 
-    "graphicsPerformanceEnableVSync" : false,
+    "graphicsPerformanceEnableVSync" : true,
     "graphicsPerformanceDrawShadows" : true,
 
     "graphicsDebugDrawCollisionSpheres" : false,
diff --git a/src/main/java/electrosphere/engine/LoadingThread.java b/src/main/java/electrosphere/engine/LoadingThread.java
index 0ca031d5..68dea5bf 100644
--- a/src/main/java/electrosphere/engine/LoadingThread.java
+++ b/src/main/java/electrosphere/engine/LoadingThread.java
@@ -284,11 +284,11 @@ public class LoadingThread extends Thread {
         float randomDampener = 0.0f; //0.25f;
         Globals.serverTerrainManager = new ServerTerrainManager(2000,50,100,randomDampener,0);
         if(Globals.RUN_SERVER){
-            if(Globals.LOAD_TERRAIN){
-                Globals.serverTerrainManager.load();
-            } else {
+            if(Globals.userSettings.gameplayGenerateWorld()){
                 Globals.serverTerrainManager.generate();
                 Globals.serverTerrainManager.save();
+            } else {
+                Globals.serverTerrainManager.load();
             }
         }
         
diff --git a/src/main/java/electrosphere/main/Globals.java b/src/main/java/electrosphere/main/Globals.java
index ca89c0f5..902c24ca 100644
--- a/src/main/java/electrosphere/main/Globals.java
+++ b/src/main/java/electrosphere/main/Globals.java
@@ -187,7 +187,7 @@ public class Globals {
     public static EntityManager entityManager;
     
     //terrain manager
-    public static boolean LOAD_TERRAIN = true;
+//    public static boolean LOAD_TERRAIN = true;
     public static ServerTerrainManager serverTerrainManager;
     public static Vector3f spawnPoint = new Vector3f(1000,0,1000);
     
diff --git a/src/main/java/electrosphere/renderer/RenderingEngine.java b/src/main/java/electrosphere/renderer/RenderingEngine.java
index 7810a2cf..c2629dc7 100644
--- a/src/main/java/electrosphere/renderer/RenderingEngine.java
+++ b/src/main/java/electrosphere/renderer/RenderingEngine.java
@@ -82,8 +82,8 @@ public class RenderingEngine {
     static ShaderProgram lightDepthShaderProgram;
     static Framebuffer lightDepthBuffer;
     
-    public static boolean renderHitboxes = false;
-    public static boolean renderPhysics = false;
+//    public static boolean renderHitboxes = false;
+//    public static boolean renderPhysics = false;
     
     static float currentViewPlanarAngle;
     
@@ -122,7 +122,9 @@ public class RenderingEngine {
 
         //this disables vsync to make game run faster
         //https://stackoverflow.com/questions/55598376/glfwswapbuffers-is-slow
-        GLFW.glfwSwapInterval(0);
+        if(!Globals.userSettings.graphicsPerformanceEnableVSync()){
+            GLFW.glfwSwapInterval(0);
+        }
         
 //        //Hide the cursor and capture it
 //        glfwSetInputMode(Globals.window, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
@@ -374,7 +376,7 @@ public class RenderingEngine {
             }
         }
         
-        if(renderHitboxes){
+        if(Globals.userSettings.graphicsDebugDrawCollisionSpheres()){
             for(Entity currentHitbox : Globals.hitboxManager.getAllHitboxes()){
                 if((boolean)currentHitbox.getData(EntityDataStrings.DATA_STRING_DRAW)){
                     Model hitboxModel;
@@ -416,7 +418,7 @@ public class RenderingEngine {
             }
         }
         
-        if(renderPhysics){
+        if(Globals.userSettings.graphicsDebugDrawPhysicsObjects()){
             Model physicsGraphicsModel;
             for(Entity physicsEntity : Globals.collisionEngine.getDynamicPhysicsEntities()){
                 if((boolean)physicsEntity.getData(EntityDataStrings.DATA_STRING_DRAW)){