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

Merge pull request #2844 from Mailaender/game-asset-download-crash-hotfix

Browse Source 
Hotfix: Don't Crash on First-Start when Game Assets are missing
This commit is contained in:
Matthias Mailänder
2013-03-26 14:27:20 -07:00
parent a3c0b1b9f6 851512a84e
commit ead0da4161
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Game/Graphics/CursorProvider.cs
View File

@@ -14,12 +14,13 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Xml; using System.Xml;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.Traits;
namespace OpenRA.Graphics namespace OpenRA.Graphics
{ {
public static class CursorProvider public static class CursorProvider
{ {
public static Dictionary<string, Palette> Palettes { get; private set; } public static HardwarePalette Palette;
static Dictionary<string, CursorSequence> cursors; static Dictionary<string, CursorSequence> cursors;
public static void Initialize(string[] sequenceFiles) public static void Initialize(string[] sequenceFiles)
@@ -34,9 +35,16 @@ namespace OpenRA.Graphics
ShadowIndex[ShadowIndex.Length - 1] = Convert.ToInt32(sequences.NodesDict["ShadowIndex"].Value); ShadowIndex[ShadowIndex.Length - 1] = Convert.ToInt32(sequences.NodesDict["ShadowIndex"].Value);
} }
Palettes = new Dictionary<string, Palette>(); var palettes = new Dictionary<string, Palette>();
foreach (var s in sequences.NodesDict["Palettes"].Nodes) foreach (var s in sequences.NodesDict["Palettes"].Nodes)
Palettes.Add(s.Key, new Palette(FileSystem.Open(s.Value.Value), ShadowIndex)); palettes.Add(s.Key, new Palette(FileSystem.Open(s.Value.Value), ShadowIndex));
Palette = new HardwarePalette();
foreach (var p in palettes)
Palette.AddPalette(p.Key, p.Value, false);
// Generate initial palette texture
Palette.Update(new IPaletteModifier[] {});
foreach (var s in sequences.NodesDict["Cursors"].Nodes) foreach (var s in sequences.NodesDict["Cursors"].Nodes)
LoadSequencesForCursor(s.Key, s.Value); LoadSequencesForCursor(s.Key, s.Value);
@@ -55,6 +63,17 @@ namespace OpenRA.Graphics
return cursors.ContainsKey(cursor); return cursors.ContainsKey(cursor);
} }
public static void DrawCursor(Renderer renderer, string cursorName, int2 lastMousePos, int cursorFrame)
{
var cursorSequence = CursorProvider.GetCursorSequence(cursorName);
var cursorSprite = cursorSequence.GetSprite(cursorFrame);
renderer.SpriteRenderer.DrawSprite(cursorSprite,
lastMousePos - cursorSequence.Hotspot,
Palette.GetPaletteIndex(cursorSequence.Palette),
cursorSprite.size);
}
public static CursorSequence GetCursorSequence(string cursor) public static CursorSequence GetCursorSequence(string cursor)
{ {
try { return cursors[cursor]; } try { return cursors[cursor]; }

9
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -127,14 +127,9 @@ namespace OpenRA.Graphics
using( new PerfSample("render_widgets") ) using( new PerfSample("render_widgets") )
{ {
Ui.Draw(); Ui.Draw();
var cursorName = Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default";
var cursorSequence = CursorProvider.GetCursorSequence(cursorName);
var cursorSprite = cursorSequence.GetSprite((int)cursorFrame);
renderer.SpriteRenderer.DrawSprite(cursorSprite, var cursorName = Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default";
Viewport.LastMousePos - cursorSequence.Hotspot, CursorProvider.DrawCursor(renderer, cursorName, Viewport.LastMousePos, (int)cursorFrame);
wr.Palette(cursorSequence.Palette).Index,
cursorSprite.size);
} }
using( new PerfSample("render_flip") ) using( new PerfSample("render_flip") )

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

@@ -42,8 +42,6 @@ namespace OpenRA.Graphics
{ {
this.world = world; this.world = world;
palette = new HardwarePalette(); palette = new HardwarePalette();
foreach (var p in CursorProvider.Palettes)
palette.AddPalette(p.Key, p.Value, false);
palettes = new Cache<string, PaletteReference>(CreatePaletteReference); palettes = new Cache<string, PaletteReference>(CreatePaletteReference);
foreach (var pal in world.traitDict.ActorsWithTraitMultiple<IPalette>(world)) foreach (var pal in world.traitDict.ActorsWithTraitMultiple<IPalette>(world))