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

fix crash in minimap; constrain shroud to edge; fix some render dumbness

Browse Source
This commit is contained in:
Chris Forbes
2010-01-27 18:23:27 +13:00
parent d9a1b4c807
commit 00bc886b01
4 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRa.Game/Graphics/Minimap.cs
View File

@@ -34,6 +34,9 @@ namespace OpenRa.Graphics
sprite = new Sprite(sheet, rect, TextureChannel.Alpha); sprite = new Sprite(sheet, rect, TextureChannel.Alpha);
mapOnlySprite = new Sprite(mapOnlySheet, rect, TextureChannel.Alpha); mapOnlySprite = new Sprite(mapOnlySheet, rect, TextureChannel.Alpha);
playerColors = Util.MakeArray<Color>(8, b => Color.FromArgb(alpha, Chat.paletteColors[b]));
shroudColor = Color.FromArgb(alpha, Color.Black);
} }
public static Rectangle MakeMinimapBounds(Map m) public static Rectangle MakeMinimapBounds(Map m)
@@ -75,12 +78,6 @@ namespace OpenRa.Graphics
public void Update() public void Update()
{ {
if (terrainTypeColors == null)
{
playerColors = Util.MakeArray<Color>( 8, b => Color.FromArgb(alpha, Chat.paletteColors[b]) );
shroudColor = Color.FromArgb(alpha, Color.Black);
}
if (terrain == null) if (terrain == null)
terrain = RenderTerrainBitmap(world.Map, world.TileSet); terrain = RenderTerrainBitmap(world.Map, world.TileSet);

2
OpenRa.Game/Player.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRa
public Player( World world, int index, Session.Client client ) public Player( World world, int index, Session.Client client )
{ {
Shroud = new Shroud(this); Shroud = new Shroud(this, world.Map);
this.PlayerActor = world.CreateActor("Player", new int2(int.MaxValue, int.MaxValue), this); this.PlayerActor = world.CreateActor("Player", new int2(int.MaxValue, int.MaxValue), this);
this.Index = index; this.Index = index;
this.InternalName = "Multi{0}".F(index); this.InternalName = "Multi{0}".F(index);

18
OpenRa.Game/Shroud.cs
View File

@@ -5,6 +5,7 @@ using System.Text;
using IjwFramework.Types; using IjwFramework.Types;
using OpenRa.Graphics; using OpenRa.Graphics;
using OpenRa.Traits; using OpenRa.Traits;
using OpenRa.FileFormats;
namespace OpenRa namespace OpenRa
{ {
@@ -16,8 +17,9 @@ namespace OpenRa
bool dirty = true; bool dirty = true;
bool hasGPS = false; bool hasGPS = false;
Player owner; Player owner;
Map map;
public Shroud(Player owner) { this.owner = owner; } public Shroud(Player owner, Map map) { this.owner = owner; this.map = map; }
float gapOpaqueTicks = (int)(Rules.General.GapRegenInterval * 25 * 60); float gapOpaqueTicks = (int)(Rules.General.GapRegenInterval * 25 * 60);
int[,] gapField = new int[128, 128]; int[,] gapField = new int[128, 128];
@@ -145,15 +147,15 @@ namespace OpenRa
if (dirty) if (dirty)
{ {
dirty = false; dirty = false;
for (int j = 1; j < 127; j++) for (int j = map.YOffset; j < map.YOffset + map.Height; j++)
for (int i = 1; i < 127; i++) for (int i = map.XOffset; i < map.XOffset + map.Width; i++)
sprites[i, j] = ChooseShroud(i, j); sprites[i, j] = ChooseShroud(i, j);
} }
for (var j = 1; j < 127; j++) for (var j = map.YOffset; j < map.YOffset + map.Height; j++)
{ {
var starti = 1; var starti = map.XOffset;
for (var i = 1; i < 127; i++) for (var i = map.XOffset; i < map.XOffset + map.Width; i++)
{ {
if (sprites[i, j] == shadowBits[0x0f]) if (sprites[i, j] == shadowBits[0x0f])
continue; continue;
@@ -173,11 +175,11 @@ namespace OpenRa
starti = i+1; starti = i+1;
} }
if (starti < 127) if (starti < map.XOffset + map.Width)
r.DrawSprite(sprites[starti, j], r.DrawSprite(sprites[starti, j],
Game.CellSize * new float2(starti, j), Game.CellSize * new float2(starti, j),
PaletteType.Shroud, PaletteType.Shroud,
new float2(Game.CellSize * (127 - starti), Game.CellSize)); new float2(Game.CellSize * (map.XOffset + map.Width - starti), Game.CellSize));
} }
} }
} }

8
OpenRa.Game/WorldUtils.cs
View File

@@ -79,10 +79,10 @@ namespace OpenRa
{ {
var min = a - new int2(r, r); var min = a - new int2(r, r);
var max = a + new int2(r, r); var max = a + new int2(r, r);
if (min.X < 0) min.X = 0; if (min.X < world.Map.XOffset) min.X = world.Map.XOffset;
if (min.Y < 0) min.Y = 0; if (min.Y < world.Map.YOffset) min.Y = world.Map.YOffset;
if (max.X > 127) max.X = 127; if (max.X > world.Map.XOffset + world.Map.Width - 1) max.X = world.Map.XOffset + world.Map.Width - 1;
if (max.Y > 127) max.Y = 127; if (max.Y > world.Map.YOffset + world.Map.Height - 1) max.Y = world.Map.YOffset + world.Map.Height - 1;
for (var j = min.Y; j <= max.Y; j++) for (var j = min.Y; j <= max.Y; j++)
for (var i = min.X; i <= max.X; i++) for (var i = min.X; i <= max.X; i++)