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

Store map packages in MapPreview.

Browse Source
This commit is contained in:
Paul Chote
2016-02-20 17:50:04 +00:00
parent 226081d379
commit d492c23a6d
12 changed files with 102 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Map/MapCache.cs
View File

@@ -60,13 +60,11 @@ namespace OpenRA
{
using (new Support.PerfTimer(path.Key))
{
using (var package = modData.ModFiles.OpenPackage(path.Key))
{
var package = modData.ModFiles.OpenPackage(path.Key);
var uid = Map.ComputeUID(package);
previews[uid].UpdateFromMap(package, path.Value, modData.Manifest.MapCompatibility, mapGrid.Type);
}
}
}
catch (Exception e)
{
Console.WriteLine("Failed to load map: {0}", path);
@@ -189,7 +187,7 @@ namespace OpenRA
if (bitmap == null)
{
createdPreview = true;
var map = new Map(p.Path);
var map = new Map(modData, p.Package);
bitmap = Minimap.RenderMapPreview(modData.DefaultRules.TileSets[map.Tileset], map, modData.DefaultRules, true);
}

4
OpenRA.Game/Map/MapPreview.cs
View File

@@ -58,7 +58,7 @@ namespace OpenRA
MapCache cache;
public readonly string Uid;
public string Path { get; private set; }
public IReadOnlyPackage Package { get; private set; }
public string Title { get; private set; }
public string Type { get; private set; }
@@ -126,7 +126,7 @@ namespace OpenRA
yaml = new MiniYaml(null, MiniYaml.FromStream(yamlStream, "map.yaml")).ToDictionary();
}
Path = p.Name;
Package = p;
GridType = gridType;
Class = classification;

2
OpenRA.Game/ModData.cs
View File

@@ -165,7 +165,7 @@ namespace OpenRA
throw new InvalidDataException("Invalid map uid: {0}".F(uid));
// Operate on a copy of the map to avoid gameplay state leaking into the cache
var map = new Map(MapCache[uid].Path);
var map = new Map(this, MapCache[uid].Package);
LoadTranslations(map);

2
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -948,7 +948,7 @@ namespace OpenRA.Mods.Common.Server
static void LoadMap(S server)
{
server.Map = new Map(server.ModData.MapCache[server.LobbyInfo.GlobalSettings.Map].Path);
server.Map = new Map(server.ModData, server.ModData.MapCache[server.LobbyInfo.GlobalSettings.Map].Package);
server.MapPlayers = new MapPlayers(server.Map.PlayerDefinitions);
server.LobbyInfo.Slots = server.MapPlayers.Players

2
OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
modData.MapCache.LoadMaps();
maps.AddRange(modData.MapCache
.Where(m => m.Status == MapStatus.Available)
.Select(m => new Map(m.Path)));
.Select(m => new Map(modData, m.Package)));
}
else
maps.Add(new Map(args[1]));

7
OpenRA.Mods.Common/UtilityCommands/UpgradeMapCommand.cs
View File

@@ -27,15 +27,16 @@ namespace OpenRA.Mods.Common.UtilityCommands
// HACK: The engine code assumes that Game.modData is set.
Game.ModData = modData;
UpgradeRules.UpgradeMapFormat(modData, args[1]);
var package = modData.ModFiles.OpenWritablePackage(args[1]);
UpgradeRules.UpgradeMapFormat(modData, package);
var map = new Map(args[1]);
var map = new Map(modData, package);
var engineDate = Exts.ParseIntegerInvariant(args[2]);
UpgradeRules.UpgradeWeaponRules(engineDate, ref map.WeaponDefinitions, null, 0);
UpgradeRules.UpgradeActorRules(engineDate, ref map.RuleDefinitions, null, 0);
UpgradeRules.UpgradePlayers(engineDate, ref map.PlayerDefinitions, null, 0);
UpgradeRules.UpgradeActors(engineDate, ref map.ActorDefinitions, null, 0);
map.Save((IReadWritePackage)map.Package);
map.Save(package);
}
}
}

16
OpenRA.Mods.Common/UtilityCommands/UpgradeModCommand.cs
View File

@@ -100,21 +100,21 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
Console.WriteLine("Processing Maps:");
var mapPaths = modData.MapCache
.Where(m => m.Status == MapStatus.Available)
.Select(m => m.Path);
var mapPreviews = modData.MapCache
.Where(m => m.Status == MapStatus.Available);
foreach (var path in mapPaths)
foreach (var p in mapPreviews)
{
Console.WriteLine("\t" + path);
UpgradeRules.UpgradeMapFormat(modData, path);
var package = (IReadWritePackage)p.Package;
Console.WriteLine("\t" + package.Name);
UpgradeRules.UpgradeMapFormat(modData, package);
var map = new Map(path);
var map = new Map(modData, package);
UpgradeRules.UpgradeActorRules(engineDate, ref map.RuleDefinitions, null, 0);
UpgradeRules.UpgradeWeaponRules(engineDate, ref map.WeaponDefinitions, null, 0);
UpgradeRules.UpgradePlayers(engineDate, ref map.PlayerDefinitions, null, 0);
UpgradeRules.UpgradeActors(engineDate, ref map.ActorDefinitions, null, 0);
map.Save((IReadWritePackage)map.Package);
map.Save(package);
}
}
}

16
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -15,6 +15,7 @@ using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Traits;
@@ -3601,9 +3602,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
}
internal static void UpgradeMapFormat(ModData modData, string path)
{
using (var package = modData.ModFiles.OpenWritablePackage(path))
internal static void UpgradeMapFormat(ModData modData, IReadWritePackage package)
{
if (package == null)
return;
@@ -3612,11 +3611,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (yamlStream == null)
return;
var yaml = new MiniYaml(null, MiniYaml.FromStream(yamlStream, path));
var yaml = new MiniYaml(null, MiniYaml.FromStream(yamlStream, package.Name));
var nd = yaml.ToDictionary();
var mapFormat = FieldLoader.GetValue<int>("MapFormat", nd["MapFormat"].Value);
if (mapFormat < 6)
throw new InvalidDataException("Map format {0} is not supported.\n File: {1}".F(mapFormat, path));
throw new InvalidDataException("Map format {0} is not supported.\n File: {1}".F(mapFormat, package.Name));
// Nothing to do
if (mapFormat >= 8)
@@ -3661,18 +3660,18 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
catch (Exception)
{
throw new InvalidDataException("Invalid ColorRamp value.\n File: " + path);
throw new InvalidDataException("Invalid ColorRamp value.\n File: " + package.Name);
}
}
else if (parts.Length != 1 || !HSLColor.TryParseRGB(parts[0], out dummy))
throw new InvalidDataException("Invalid ColorRamp value.\n File: " + path);
throw new InvalidDataException("Invalid ColorRamp value.\n File: " + package.Name);
colorRampNode.Key = "Color";
noteColorRamp = true;
}
}
Console.WriteLine("Converted " + path + " to MapFormat 8.");
Console.WriteLine("Converted " + package.Name + " to MapFormat 8.");
if (noteHexColors)
Console.WriteLine("ColorRamp is now called Color and uses rgb(a) hex value - rrggbb[aa].");
else if (noteColorRamp)
@@ -3691,5 +3690,4 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
}
}
}
}

2
OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
View File

@@ -75,7 +75,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var mapDirectories = modData.Manifest.MapFolders
.ToDictionary(kv => makeMapDirectory(kv.Key), kv => Enum<MapClassification>.Parse(kv.Value));
var mapPath = map.Package.Name;
var mapPath = map.Package != null ? map.Package.Name : null;
var directoryDropdown = widget.Get<DropDownButtonWidget>("DIRECTORY_DROPDOWN");
{
Func<string, ScrollItemWidget, ScrollItemWidget> setupItem = (option, template) =>

5
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -737,14 +737,15 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (MapPreview.Uid == uid)
return;
MapPreview = Game.ModData.MapCache[uid];
var modData = Game.ModData;
MapPreview = modData.MapCache[uid];
Map = null;
if (MapPreview.Status == MapStatus.Available)
{
// Maps need to be validated and pre-loaded before they can be accessed
new Thread(_ =>
{
var currentMap = Map = new Map(MapPreview.Path);
var currentMap = Map = new Map(modData, MapPreview.Package);
currentMap.PreloadRules();
Game.RunAfterTick(() =>
{

2
OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs
View File

@@ -284,7 +284,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
string DeleteMap(string map)
{
var path = Game.ModData.MapCache[map].Path;
var path = Game.ModData.MapCache[map].Package.Name;
try
{
if (File.Exists(path))

7
OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly ScrollPanelWidget missionList;
readonly ScrollItemWidget headerTemplate;
readonly ScrollItemWidget template;
readonly Cache<MapPreview, Map> mapCache = new Cache<MapPreview, Map>(p => new Map(p.Path));
readonly Cache<MapPreview, Map> mapCache;
MapPreview selectedMapPreview;
Map selectedMap;
@@ -55,6 +55,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public MissionBrowserLogic(Widget widget, World world, Action onStart, Action onExit)
{
modData = Game.ModData;
mapCache = new Cache<MapPreview, Map>(p => new Map(modData, p.Package));
this.onStart = onStart;
missionList = widget.Get<ScrollPanelWidget>("MISSION_LIST");
@@ -108,8 +109,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var missionMapPaths = kv.Value.Nodes.Select(n => Path.GetFullPath(n.Key)).ToList();
var previews = modData.MapCache
.Where(p => p.Status == MapStatus.Available && missionMapPaths.Contains(Path.GetFullPath(p.Path)))
.OrderBy(p => missionMapPaths.IndexOf(Path.GetFullPath(p.Path)));
.Where(p => p.Status == MapStatus.Available && missionMapPaths.Contains(p.Package.Name))
.OrderBy(p => missionMapPaths.IndexOf(p.Package.Name));
CreateMissionGroup(kv.Key, previews);
allPreviews.AddRange(previews);