ExMods/GCMC
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

Reducing lag by using simphisstep

Browse source
This commit is contained in:
Norbi Peti 2020-05-26 15:50:14 +02:00
parent 37d31e9ae3
commit ec07a429c3
1 changed files with 50 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
GCMC/CubePlacerEngine.cs
View file

@ -1,8 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Threading.Tasks;
using GamecraftModdingAPI; using GamecraftModdingAPI;
using GamecraftModdingAPI.Blocks; using GamecraftModdingAPI.Blocks;
using HarmonyLib;
using Newtonsoft.Json; using Newtonsoft.Json;
using RobocraftX.Common.Input; using RobocraftX.Common.Input;
using RobocraftX.Common.Utilities; using RobocraftX.Common.Utilities;
@ -23,24 +25,39 @@ namespace GCMC
public EntitiesDB entitiesDB { get; set; } public EntitiesDB entitiesDB { get; set; }
private Dictionary<string, BlockType> mapping = new Dictionary<string, BlockType>(10);
private Blocks[] blocksArray;
private int C;
private bool state;
private string filename;
private void ImportWorld(string name) private void ImportWorld(string name)
{ {
try try
{ {
filename = name;
Log.Output("Reading block mappings..."); Log.Output("Reading block mappings...");
var parser = new IniParser.FileIniDataParser(); var parser = new IniParser.FileIniDataParser();
var ini = parser.ReadFile("BlockTypes.ini"); var ini = parser.ReadFile("BlockTypes.ini");
var mapping = new Dictionary<string, BlockType>(10); mapping.Clear();
C = 0;
blocksArray = null;
state = false;
foreach (var section in ini.Sections) foreach (var section in ini.Sections)
{ {
var mcblocks = section.SectionName.Split(','); var mcblocks = section.SectionName.Split(',');
BlockIDs type;
if (section.Keys["type"] == null) if (section.Keys["type"] == null)
{ {
if (section.Keys["ignore"] != "true") if (section.Keys["ignore"] != "true")
{
Log.Warn("Block type not specified for " + section.SectionName); Log.Warn("Block type not specified for " + section.SectionName);
continue; continue;
}
type = BlockIDs.Invalid;
} }
if (!Enum.TryParse(section.Keys["type"], out BlockIDs type)) else if (!Enum.TryParse(section.Keys["type"], out type))
{ {
Log.Warn("Block type specified in ini not found: " + section.Keys["type"]); Log.Warn("Block type specified in ini not found: " + section.Keys["type"]);
continue; continue;
@ -75,25 +92,13 @@ namespace GCMC
}); });
} }
} }
Log.Output("Starting..."); Log.Output("Starting...");
var blocksArray = JsonSerializer.Create() Task.Run(() =>
.Deserialize<Blocks[]>(new JsonTextReader(File.OpenText(name)));
int C = 0;
foreach (var blocks in blocksArray)
{ {
if (!mapping.TryGetValue(blocks.Material, out var type)) blocksArray = JsonSerializer.Create()
{ .Deserialize<Blocks[]>(new JsonTextReader(File.OpenText(filename)));
Console.WriteLine("Unknown block: " + blocks.Material); });
continue;
}
Block.PlaceNew(type.Type, (blocks.Start + blocks.End) / 10 * 3, color: type.Color.Color,
darkness: type.Color.Darkness, scale: (blocks.End - blocks.Start + 1) * 3,
rotation: float3.zero);
C++;
}
Log.Output(C + " blocks placed.");
} }
catch (Exception e) catch (Exception e)
{ {
@ -102,8 +107,32 @@ namespace GCMC
} }
} }
public JobHandle SimulatePhysicsStep(in float deltaTime, in PhysicsUtility utility, in PlayerInput[] playerInputs) public JobHandle SimulatePhysicsStep(in float deltaTime, in PhysicsUtility utility,
in PlayerInput[] playerInputs)
{ {
state = !state;
if (blocksArray == null || C >= blocksArray.Length
|| state) return default;
int i;
for (i = C; i < C + 10000 && i < blocksArray.Length; i++)
{
var blocks = blocksArray[i];
if (!mapping.TryGetValue(blocks.Material, out var type))
{
Console.WriteLine("Unknown block: " + blocks.Material);
continue;
}
if (type.Type == BlockIDs.Invalid) continue;
Block.PlaceNew(type.Type, (blocks.Start + blocks.End) / 10 * 3, color: type.Color.Color,
darkness: type.Color.Darkness, scale: (blocks.End - blocks.Start + 1) * 3,
rotation: float3.zero);
}
AccessTools.Method(typeof(Block), "Sync").Invoke(null, new object[0]);
C = i;
Log.Output(C + " blocks placed.");
return new JobHandle(); return new JobHandle();
} }