clean up some messy GC behavior & needlessly longwinded code. slight perf cost on map save.

This commit is contained in:
Chris Forbes
2010-04-08 21:07:50 +12:00
committed by Paul Chote
parent ba24ffc442
commit ed08314ec0
3 changed files with 303 additions and 298 deletions

View File

@@ -16,63 +16,60 @@
* You should have received a copy of the GNU General Public License
* along with OpenRA. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System;
namespace OpenRA.FileFormats
{
public class MapStub
{
public IFolder Package;
// Yaml map data
public string Uid;
public string Title;
public string Description;
public string Author;
public int PlayerCount;
public string Tileset;
public int2 TopLeft;
public int2 BottomRight;
public int Width {get {return BottomRight.X - TopLeft.X;}}
public int Height {get {return BottomRight.Y - TopLeft.Y;}}
public Lazy<Bitmap> Preview;
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
namespace OpenRA.FileFormats
{
public class MapStub
{
public IFolder Package;
// Yaml map data
public string Uid;
public string Title;
public string Description;
public string Author;
public int PlayerCount;
public string Tileset;
public int2 TopLeft;
public int2 BottomRight;
public int Width { get { return BottomRight.X - TopLeft.X; } }
public int Height { get { return BottomRight.Y - TopLeft.Y; } }
public Lazy<Bitmap> Preview;
static List<string> Fields = new List<string>() {
"Title", "Description", "Author", "PlayerCount", "Tileset", "TopLeft", "BottomRight"
};
public MapStub() {}
public MapStub(IFolder package)
{
Package = package;
var yaml = MiniYaml.FromStream(Package.GetContent("map.yaml"));
FieldLoader.LoadFields(this,yaml,Fields);
Preview = Lazy.New(
() => {return new Bitmap(Package.GetContent("preview.png"));}
);
StreamReader uidStream = new StreamReader(Package.GetContent("map.uid"));
Uid = uidStream.ReadLine();
uidStream.Close();
}
public Rectangle PreviewBounds(Rectangle container)
{
float scale = Math.Min(container.Width*1.0f/Width,container.Height*1.0f/Height);
var size = Math.Max(Width, Height);
var dw = (int)(scale*(size - Width)) / 2;
var dh = (int)(scale*(size - Height)) / 2;
return new Rectangle(container.X + dw, container.Y + dh, (int)(Width*scale), (int)(Height*scale));
}
}
};
public MapStub() { }
public MapStub(IFolder package)
{
Package = package;
var yaml = MiniYaml.FromStream(Package.GetContent("map.yaml"));
FieldLoader.LoadFields(this, yaml, Fields);
Preview = Lazy.New(
() => { return new Bitmap(Package.GetContent("preview.png")); }
);
Uid = Package.GetContent("map.uid").ReadAllText();
}
public Rectangle PreviewBounds(Rectangle container)
{
float scale = Math.Min(container.Width * 1.0f / Width, container.Height * 1.0f / Height);
var size = Math.Max(Width, Height);
var dw = (int)(scale * (size - Width)) / 2;
var dh = (int)(scale * (size - Height)) / 2;
return new Rectangle(container.X + dw, container.Y + dh, (int)(Width * scale), (int)(Height * scale));
}
}
}