Skip to content

Commit

Permalink
Merge pull request #53 from StarCoreSE/yard-logging
Browse files Browse the repository at this point in the history 
didn't work lol fuck it
  • Loading branch information
@InvalidArgument3
InvalidArgument3 authored Nov 16, 2024
2 parents c123daf + 2c33278 commit 5fad0f2
Showing 1 changed file with 47 additions and 79 deletions.
126 changes: 47 additions & 79 deletions ShipyardsRevival/Data/Scripts/ShipyardMod/ShipyardCore.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,115 +109,90 @@ private void HandleMessageEntered(string messageText, ref bool sendToOthers)
Communication.SendMessageToServer(Communication.MessageTypeEnum.ClientChat, message);
}

private Dictionary<long, BoxItem> _cachedBoxes = new Dictionary<long, BoxItem>();

private void CalculateBoxesContaining()
{
var newBoxes = new Dictionary<long, BoxItem>();

foreach (ShipyardItem item in ProcessLocalYards.LocalYards)
{
foreach (IMyCubeGrid grid in item.ContainsGrids)
{
if (item.YardType != ShipyardType.Disabled || grid.Closed ||
!ShipyardSettings.Instance.GetYardSettings(item.EntityId).GuideEnabled)
if (item.YardType != ShipyardType.Disabled || grid.Closed || !ShipyardSettings.Instance.GetYardSettings(item.EntityId).GuideEnabled)
{
BoxDict.Remove(grid.EntityId);
continue;
}

BoxItem cachedBox;
if (_cachedBoxes.TryGetValue(grid.EntityId, out cachedBox))
{
// Only recalculate if grid has moved
if (cachedBox.LastPos == grid.GetPosition())
{
newBoxes[grid.EntityId] = cachedBox;
continue;
}
}
//if (BoxDict.ContainsKey(grid.EntityId) && Vector3D.DistanceSquared(BoxDict[grid.EntityId].LastPos, grid.GetPosition()) < 0.01)
// continue;

uint color;

if (grid.Physics != null)
color = Color.Green.PackedValue;
else
{
var proj = grid.Projector();
if (proj == null || proj.RemainingBlocks == 0)

if (proj == null) //ghost grid like Digi's helmet
continue;

if (proj.RemainingBlocks == 0) //projection is complete
continue;

color = Color.Cyan.PackedValue;
}

newBoxes[grid.EntityId] = new BoxItem
{
Lines = MathUtility.CalculateObbLines(MathUtility.CreateOrientedBoundingBox(grid)),
GridId = grid.EntityId,
PackedColor = color,
LastPos = grid.GetPosition()
};
BoxDict[grid.EntityId] = new BoxItem
{
Lines = MathUtility.CalculateObbLines(MathUtility.CreateOrientedBoundingBox(grid)),
GridId = grid.EntityId,
//PackedColor = grid.Physics == null ? Color.Cyan.PackedValue : Color.Green.PackedValue,
PackedColor = color,
LastPos = grid.GetPosition()
};
}
}

_cachedBoxes = newBoxes;
BoxDict.Clear();
foreach (var box in newBoxes)
{
BoxDict[box.Key] = box.Value;
}
}

private Dictionary<long, BoxItem> _cachedIntersectingBoxes = new Dictionary<long, BoxItem>();

private void CalculateBoxesIntersecting()
{
var newBoxes = new Dictionary<long, BoxItem>();

foreach (var item in ProcessLocalYards.LocalYards)
{
foreach (IMyCubeGrid grid in item.IntersectsGrids)
{
if (item.YardType != ShipyardType.Disabled || grid.Closed ||
!ShipyardSettings.Instance.GetYardSettings(item.EntityId).GuideEnabled)
if (item.YardType != ShipyardType.Disabled || grid.Closed || !ShipyardSettings.Instance.GetYardSettings(item.EntityId).GuideEnabled)
{
BoxDict.Remove(grid.EntityId);
continue;
}

BoxItem cachedBox;
if (_cachedIntersectingBoxes.TryGetValue(grid.EntityId, out cachedBox))
{
// Only recalculate if grid has moved
if (cachedBox.LastPos == grid.GetPosition())
{
newBoxes[grid.EntityId] = cachedBox;
continue;
}
}
//if (BoxDict.ContainsKey(grid.EntityId) && Vector3D.DistanceSquared(BoxDict[grid.EntityId].LastPos, grid.GetPosition()) < 0.01)
// continue;

uint color;

if (grid.Physics != null)
color = Color.Yellow.PackedValue;
else
{
var proj = grid.Projector();
if (proj == null || proj.RemainingBlocks == 0)

if (proj == null) //ghost grid like Digi's helmet
continue;

if (proj.RemainingBlocks == 0) //projection is complete
continue;

color = Color.CornflowerBlue.PackedValue;
}

newBoxes[grid.EntityId] = new BoxItem
{
Lines = MathUtility.CalculateObbLines(MathUtility.CreateOrientedBoundingBox(grid)),
GridId = grid.EntityId,
PackedColor = color,
LastPos = grid.GetPosition()
};
BoxDict[grid.EntityId] = new BoxItem
{
Lines = MathUtility.CalculateObbLines(MathUtility.CreateOrientedBoundingBox(grid)),
GridId = grid.EntityId,
//PackedColor = grid.Physics == null ? Color.CornflowerBlue.PackedValue : Color.Yellow.PackedValue,
PackedColor = color,
LastPos = grid.GetPosition()
};
}
}

_cachedIntersectingBoxes = newBoxes;
foreach (var box in newBoxes)
{
BoxDict[box.Key] = box.Value;
}
}

private void CalculateLines()
Expand Down Expand Up @@ -253,29 +228,22 @@ private void RemoveMessageHandler()
Communication.UnregisterHandlers();
}

private int _boxUpdateCounter = 0;
private const int BOX_UPDATE_INTERVAL = 30; // Update every 30 frames

public override void Draw()
{
if (MyAPIGateway.Session?.Player == null || !_initialized)
return;

try
{
_boxUpdateCounter++;
if (_boxUpdateCounter >= BOX_UPDATE_INTERVAL)
{
_boxUpdateCounter = 0;

var t1 = MyAPIGateway.Parallel.Start(CalculateBoxesContaining);
var t2 = MyAPIGateway.Parallel.Start(CalculateBoxesIntersecting);
var t3 = MyAPIGateway.Parallel.Start(CalculateLines);
t1.Wait();
t2.Wait();
t3.Wait();
}

//these tasks are too simple to use Parallel.ForEach or similar in the body, but
//can all safely be run simultaneously, so do that.
var t1 = MyAPIGateway.Parallel.Start(CalculateBoxesContaining);
var t2 = MyAPIGateway.Parallel.Start(CalculateBoxesIntersecting);
var t3 = MyAPIGateway.Parallel.Start(CalculateLines);
//wait for all three to finish
t1.Wait();
t2.Wait();
t3.Wait();
DrawLines();
FadeLines();
DrawScanning();
Expand Down

0 comments on commit 5fad0f2

Please sign in to comment.