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

Merge branch 'marchingCubesTerrain' of ssh://git.austinwhoover.com:222/electrosphere/Renderer into marchingCubesTerrain
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
austin 2023-11-05 10:10:41 -05:00
commit 4506964edd
4 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/launch.json vendored
View File

@ -35,11 +35,11 @@
}, },
{ {
"type": "java", "type": "java",
"name": "Launch Main (Macro Simulate)", "name": "Launch Simulation Only",
"request": "launch", "request": "launch",
"mainClass": "electrosphere.engine.Main", "mainClass": "electrosphere.engine.Main",
"projectName": "Renderer", "projectName": "Renderer",
"args" : "--macro-simulate" "args" : "--simulate"
} }
] ]
} }

4
src/main/java/electrosphere/engine/Globals.java
View File

@ -61,7 +61,6 @@ import electrosphere.renderer.ui.font.RawFontMap;
import electrosphere.script.ScriptEngine; import electrosphere.script.ScriptEngine;
import electrosphere.server.ai.AIManager; import electrosphere.server.ai.AIManager;
import electrosphere.server.datacell.EntityDataCellMapper; import electrosphere.server.datacell.EntityDataCellMapper;
import electrosphere.server.datacell.GriddedDataCellManager;
import electrosphere.server.datacell.RealmManager; import electrosphere.server.datacell.RealmManager;
import electrosphere.server.db.DatabaseController; import electrosphere.server.db.DatabaseController;
import electrosphere.server.pathfinding.NavMeshManager; import electrosphere.server.pathfinding.NavMeshManager;
@ -246,6 +245,9 @@ public class Globals {
public static MacroSimulation macroSimulation; public static MacroSimulation macroSimulation;
public static MacroData macroData; public static MacroData macroData;
//flag to only run a simulation without full client
public static boolean RUN_SIMULATION_ONLY = false;
//micro simulation //micro simulation
public static MicroSimulation microSimulation; public static MicroSimulation microSimulation;

38
src/main/java/electrosphere/engine/Main.java
View File

@ -14,13 +14,10 @@ import electrosphere.controls.ControlHandler;
import electrosphere.engine.cli.CLIParser; import electrosphere.engine.cli.CLIParser;
import electrosphere.engine.loadingthreads.LoadingThread; import electrosphere.engine.loadingthreads.LoadingThread;
import electrosphere.game.config.UserSettings; import electrosphere.game.config.UserSettings;
import electrosphere.game.server.world.MacroData;
import electrosphere.logger.LoggerInterface; import electrosphere.logger.LoggerInterface;
import electrosphere.net.parser.net.message.TerrainMessage;
import electrosphere.net.parser.net.raw.NetworkParser;
import electrosphere.net.parser.util.ByteStreamUtils;
import electrosphere.renderer.Model;
import electrosphere.renderer.RenderingEngine; import electrosphere.renderer.RenderingEngine;
import electrosphere.util.worldviewer.TerrainViewer; import electrosphere.server.simulation.MacroSimulation;
@ -97,22 +94,21 @@ public class Main {
//world gen testing //world gen testing
//gen terrain //gen terrain
// Globals.serverTerrainManager = new ServerTerrainManager(2000,50,100,0.0f,0); if(Globals.RUN_SIMULATION_ONLY){
// Globals.serverTerrainManager.load(); //gen world
// Globals.serverWorldData = ServerWorldData.createGameWorld(Globals.serverTerrainManager); Globals.macroData = MacroData.generateWorld(0);
// //gen world Globals.macroData.describeWorld();
// Globals.macroData = MacroData.generateWorld(0); boolean run = true;
// Globals.macroData.describeWorld(); Globals.macroSimulation = new MacroSimulation();
// boolean run = true; while(run){
// Globals.macroSimulation = new MacroSimulation(); Globals.macroSimulation.simulate();
// while(run){ try {
// Globals.macroSimulation.simulate(); TimeUnit.MILLISECONDS.sleep(1000);
// try { } catch (InterruptedException ex) {
// TimeUnit.MILLISECONDS.sleep(1000); ex.printStackTrace();
// } catch (InterruptedException ex) { }
// ex.printStackTrace(); }
// } }
// }
// if(1==1){ // if(1==1){
// Globals.audioEngine = new AudioEngine(); // Globals.audioEngine = new AudioEngine();

4
src/main/java/electrosphere/engine/cli/CLIParser.java
View File

@ -17,8 +17,8 @@ public class CLIParser {
Globals.RUN_SERVER = true; Globals.RUN_SERVER = true;
Globals.HEADLESS = true; Globals.HEADLESS = true;
} break; } break;
case "--macro-simulate": { case "--simulate": {
//TODO: macro simulate Globals.RUN_SIMULATION_ONLY = true;
} break; } break;
} }
} }