epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zOMG im an idiot

Browse Source
This commit is contained in:
Chris Forbes
2010-03-22 20:58:31 +13:00
parent 15ba89e957
commit 82eea5ad2c
4 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -126,8 +126,7 @@ namespace OpenRA.Graphics
bounds.Offset((int)Game.viewport.Location.X, (int)Game.viewport.Location.Y); bounds.Offset((int)Game.viewport.Location.X, (int)Game.viewport.Location.Y);
var foos = world.Actors; var foos = world.FindUnits(
var bars = world.FindUnits(
new float2(bounds.Left, bounds.Top), new float2(bounds.Left, bounds.Top),
new float2(bounds.Right, bounds.Bottom)); new float2(bounds.Right, bounds.Bottom));
@@ -154,19 +153,6 @@ namespace OpenRA.Graphics
renderer.Device.DisableScissor(); renderer.Device.DisableScissor();
foreach (var bar in bars)
{
var baz = bar.GetBounds(true);
var a = new float2(baz.Left, baz.Top);
var b = new float2(baz.Right - a.X, 0);
var c = new float2(0, baz.Bottom - a.Y);
lineRenderer.DrawLine(a, a + b, Color.Green, Color.Green);
lineRenderer.DrawLine(a + b, a + b + c, Color.Green, Color.Green);
lineRenderer.DrawLine(a + b + c, a + c, Color.Green, Color.Green);
lineRenderer.DrawLine(a, a + c, Color.Green, Color.Green);
}
{ {
var a = new float2(bounds.Left, bounds.Top); var a = new float2(bounds.Left, bounds.Top);
var b = new float2(bounds.Right - a.X, 0); var b = new float2(bounds.Right - a.X, 0);
@@ -176,7 +162,8 @@ namespace OpenRA.Graphics
lineRenderer.DrawLine(a + b + c, a + c, Color.Red, Color.Red); lineRenderer.DrawLine(a + b + c, a + c, Color.Red, Color.Red);
lineRenderer.DrawLine(a, a + c, Color.Red, Color.Red); lineRenderer.DrawLine(a, a + c, Color.Red, Color.Red);
bounds = GetBoundsRect(); bounds = world.LocalPlayer.Shroud.bounds.Value;
a = new float2(bounds.Left, bounds.Top); a = new float2(bounds.Left, bounds.Top);
b = new float2(bounds.Right - a.X, 0); b = new float2(bounds.Right - a.X, 0);
c = new float2(0, bounds.Bottom - a.Y); c = new float2(0, bounds.Bottom - a.Y);
@@ -187,7 +174,7 @@ namespace OpenRA.Graphics
} }
{ {
for (var j = 0; j < Game.world.Map.MapSize; for (var j = 0; j < Game.world.Map.MapSize;
j += Game.world.WorldActor.Info.Traits.Get<SpatialBinsInfo>().BinSize) j += Game.world.WorldActor.Info.Traits.Get<SpatialBinsInfo>().BinSize)
{ {
lineRenderer.DrawLine(new float2(0, j * 24), new float2(Game.world.Map.MapSize * 24, j * 24), Color.Black, Color.Black); lineRenderer.DrawLine(new float2(0, j * 24), new float2(Game.world.Map.MapSize * 24, j * 24), Color.Black, Color.Black);

2
OpenRA.Game/Traits/World/SpatialBins.cs
View File

@@ -66,7 +66,7 @@ namespace OpenRA.Traits
{ {
var r = RectangleF.FromLTRB(a.X, a.Y, b.X, b.Y); var r = RectangleF.FromLTRB(a.X, a.Y, b.X, b.Y);
return ActorsInBins(a.X / scale, a.Y / scale, b.X / scale, b.Y / scale) return ActorsInBins(a.X / scale, b.X / scale, a.Y / scale, b.Y / scale)
.Distinct() .Distinct()
.Where(u => u.GetBounds(true).IntersectsWith(r)); .Where(u => u.GetBounds(true).IntersectsWith(r));
} }

3
mods/cnc/system.yaml
View File

@@ -222,4 +222,5 @@ World:
UnitLost: unitlost.aud UnitLost: unitlost.aud
NavalUnitLost: unitlost.aud NavalUnitLost: unitlost.aud
PrimaryBuildingSelected: pribldg1.aud PrimaryBuildingSelected: pribldg1.aud
SpatialBins: SpatialBins:
BinSize: 4

1
mods/ra/rules.yaml
View File

@@ -273,6 +273,7 @@ World:
SpawnDefaultUnits: SpawnDefaultUnits:
EvaAlerts: EvaAlerts:
SpatialBins: SpatialBins:
BinSize: 4
MGG: MGG:
GeneratesGap: GeneratesGap: