studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hook user settings into engine more

Browse Source
This commit is contained in:
austin 2021-08-07 17:43:43 -04:00
parent 6bbcc4af50
commit 0ef9d8c309
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/Config/settings.json
View File

@ -6,7 +6,7 @@
"graphicsFOV" : 90.0, "graphicsFOV" : 90.0,
"graphicsPerformanceEnableVSync" : false, "graphicsPerformanceEnableVSync" : true,
"graphicsPerformanceDrawShadows" : true, "graphicsPerformanceDrawShadows" : true,
"graphicsDebugDrawCollisionSpheres" : false, "graphicsDebugDrawCollisionSpheres" : false,

6
src/main/java/electrosphere/engine/LoadingThread.java
View File

@ -284,11 +284,11 @@ public class LoadingThread extends Thread {
float randomDampener = 0.0f; //0.25f; float randomDampener = 0.0f; //0.25f;
Globals.serverTerrainManager = new ServerTerrainManager(2000,50,100,randomDampener,0); Globals.serverTerrainManager = new ServerTerrainManager(2000,50,100,randomDampener,0);
if(Globals.RUN_SERVER){ if(Globals.RUN_SERVER){
if(Globals.LOAD_TERRAIN){ if(Globals.userSettings.gameplayGenerateWorld()){
Globals.serverTerrainManager.load();
} else {
Globals.serverTerrainManager.generate(); Globals.serverTerrainManager.generate();
Globals.serverTerrainManager.save(); Globals.serverTerrainManager.save();
} else {
Globals.serverTerrainManager.load();
} }
} }

2
src/main/java/electrosphere/main/Globals.java
View File

@ -187,7 +187,7 @@ public class Globals {
public static EntityManager entityManager; public static EntityManager entityManager;
//terrain manager //terrain manager
public static boolean LOAD_TERRAIN = true; // public static boolean LOAD_TERRAIN = true;
public static ServerTerrainManager serverTerrainManager; public static ServerTerrainManager serverTerrainManager;
public static Vector3f spawnPoint = new Vector3f(1000,0,1000); public static Vector3f spawnPoint = new Vector3f(1000,0,1000);

12
src/main/java/electrosphere/renderer/RenderingEngine.java
View File

@ -82,8 +82,8 @@ public class RenderingEngine {
static ShaderProgram lightDepthShaderProgram; static ShaderProgram lightDepthShaderProgram;
static Framebuffer lightDepthBuffer; static Framebuffer lightDepthBuffer;
public static boolean renderHitboxes = false; // public static boolean renderHitboxes = false;
public static boolean renderPhysics = false; // public static boolean renderPhysics = false;
static float currentViewPlanarAngle; static float currentViewPlanarAngle;
@ -122,7 +122,9 @@ public class RenderingEngine {
//this disables vsync to make game run faster //this disables vsync to make game run faster
//https://stackoverflow.com/questions/55598376/glfwswapbuffers-is-slow //https://stackoverflow.com/questions/55598376/glfwswapbuffers-is-slow
GLFW.glfwSwapInterval(0); if(!Globals.userSettings.graphicsPerformanceEnableVSync()){
GLFW.glfwSwapInterval(0);
}
// //Hide the cursor and capture it // //Hide the cursor and capture it
// glfwSetInputMode(Globals.window, GLFW_CURSOR, GLFW_CURSOR_DISABLED); // 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()){ for(Entity currentHitbox : Globals.hitboxManager.getAllHitboxes()){
if((boolean)currentHitbox.getData(EntityDataStrings.DATA_STRING_DRAW)){ if((boolean)currentHitbox.getData(EntityDataStrings.DATA_STRING_DRAW)){
Model hitboxModel; Model hitboxModel;
@ -416,7 +418,7 @@ public class RenderingEngine {
} }
} }
if(renderPhysics){ if(Globals.userSettings.graphicsDebugDrawPhysicsObjects()){
Model physicsGraphicsModel; Model physicsGraphicsModel;
for(Entity physicsEntity : Globals.collisionEngine.getDynamicPhysicsEntities()){ for(Entity physicsEntity : Globals.collisionEngine.getDynamicPhysicsEntities()){
if((boolean)physicsEntity.getData(EntityDataStrings.DATA_STRING_DRAW)){ if((boolean)physicsEntity.getData(EntityDataStrings.DATA_STRING_DRAW)){