diff --git a/OpenRa.FileFormats/Terrain.cs b/OpenRa.FileFormats/Terrain.cs index 37d157ae50..106cca99bf 100644 --- a/OpenRa.FileFormats/Terrain.cs +++ b/OpenRa.FileFormats/Terrain.cs @@ -8,18 +8,12 @@ namespace OpenRa.FileFormats { public class Terrain { - public readonly int Width; - public readonly int Height; - public readonly int XDim; - public readonly int YDim; - public readonly int NumTiles; - - readonly byte[] index; - readonly List TileBitmaps = new List(); public readonly List TileBitmapBytes = new List(); public Terrain( Stream stream, Palette pal ) { + int Width, Height, XDim, YDim, NumTiles; + BinaryReader reader = new BinaryReader( stream ); Width = reader.ReadUInt16(); Height = reader.ReadUInt16(); @@ -40,45 +34,17 @@ namespace OpenRa.FileFormats int IndexStart = reader.ReadInt32(); stream.Position = IndexStart; - index = new byte[ IndexEnd - IndexStart ]; - stream.Read( index, 0, IndexEnd - IndexStart ); - for( int i = 0 ; i < index.Length ; i++ ) + foreach( byte b in new BinaryReader(stream).ReadBytes(IndexEnd - IndexStart) ) { - if (index[i] != 255) + if (b != 255) { - byte[] tileData = new byte[24 * 24]; - stream.Position = ImgStart + index[i] * 24 * 24; - stream.Read(tileData, 0, 24 * 24); - TileBitmaps.Add(BitmapBuilder.FromBytes(tileData, new Size(24, 24), pal)); - TileBitmapBytes.Add(tileData); + stream.Position = ImgStart + b * 24 * 24; + TileBitmapBytes.Add(new BinaryReader(stream).ReadBytes(24 * 24)); } else - { - TileBitmaps.Add(null); TileBitmapBytes.Add(null); - } } } - - public Bitmap GetTile( int index ) - { - if( index < TileBitmaps.Count ) - return TileBitmaps[ index ]; - else - return null; - } - - public Bitmap[ , ] GetTiles( int tileNum ) - { - int startIndex = tileNum * XDim * YDim; - Bitmap[ , ] ret = new Bitmap[ XDim, YDim ]; - - for( int x = 0 ; x < XDim ; x++ ) - for( int y = 0 ; y < YDim ; y++ ) - ret[ x, y ] = GetTile( startIndex + x + XDim * y ); - - return ret; - } } } diff --git a/OpenRa.FileFormats/TileSet.cs b/OpenRa.FileFormats/TileSet.cs index 2ab9889fb9..db5948be7b 100644 --- a/OpenRa.FileFormats/TileSet.cs +++ b/OpenRa.FileFormats/TileSet.cs @@ -28,16 +28,13 @@ namespace OpenRa.FileFormats int start = int.Parse( startStr, NumberStyles.HexNumber ); for( int i = 0 ; i < count ; i++ ) { - Stream s; try { - s = mixFile.GetContent( string.Format( pattern, i + 1 ) ); + Stream s = mixFile.GetContent(string.Format(pattern, i + 1)); + if (!tiles.ContainsKey((ushort)(start + i))) + tiles.Add((ushort)(start + i), new Terrain(s, pal)); } - catch { continue; } - Terrain t = new Terrain( s, pal ); - if( tiles.ContainsKey( (ushort)( start + i ) ) ) - continue; - tiles.Add( (ushort)( start + i ), t ); + catch { } } } diff --git a/OpenRa.FileFormats/TileSheetBuilder.cs b/OpenRa.FileFormats/TileSheetBuilder.cs index 55ef8f3917..f7f98a3d70 100644 --- a/OpenRa.FileFormats/TileSheetBuilder.cs +++ b/OpenRa.FileFormats/TileSheetBuilder.cs @@ -28,16 +28,15 @@ namespace OpenRa.FileFormats if (t == null) return TextureChannel.Red; - if (t == TextureChannel.Red) - return TextureChannel.Green; + switch (t.Value) + { + case TextureChannel.Red: return TextureChannel.Green; + case TextureChannel.Green: return TextureChannel.Blue; + case TextureChannel.Blue: return TextureChannel.Alpha; + case TextureChannel.Alpha: return null; - if (t == TextureChannel.Green) - return TextureChannel.Blue; - - if (t == TextureChannel.Blue) - return TextureChannel.Alpha; - - return null; + default: return null; + } } public SheetRectangle AddImage(Size imageSize) diff --git a/OpenRa.sln b/OpenRa.sln index 68f52e7841..bbfa823aba 100644 --- a/OpenRa.sln +++ b/OpenRa.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MixDecrypt", "MixDecrypt\MixDecrypt.vcproj", "{6F5D4280-3D23-41FF-AE2A-511B5553E377}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShpViewer", "ShpViewer\ShpViewer.csproj", "{4303FE72-B07F-4EBB-8CD2-5F33E44801B3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.FileFormats", "OpenRa.FileFormats\OpenRa.FileFormats.csproj", "{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}" ProjectSection(ProjectDependencies) = postProject {6F5D4280-3D23-41FF-AE2A-511B5553E377} = {6F5D4280-3D23-41FF-AE2A-511B5553E377} @@ -41,16 +39,6 @@ Global {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release|Mixed Platforms.Build.0 = Release|Win32 {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release|Win32.ActiveCfg = Release|Win32 {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release|Win32.Build.0 = Release|Win32 - {4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Debug|Win32.ActiveCfg = Debug|Any CPU - {4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Release|Any CPU.Build.0 = Release|Any CPU - {4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4303FE72-B07F-4EBB-8CD2-5F33E44801B3}.Release|Win32.ActiveCfg = Release|Any CPU {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Any CPU.Build.0 = Debug|Any CPU {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU diff --git a/ShpViewer/MapViewControl.cs b/ShpViewer/MapViewControl.cs deleted file mode 100644 index d09c4cf4c0..0000000000 --- a/ShpViewer/MapViewControl.cs +++ /dev/null @@ -1,168 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Windows.Forms; -using OpenRa.FileFormats; -using System.Drawing; -using System.IO; - -namespace ShpViewer -{ - public class MapViewControl : Control - { - public int XScroll, YScroll; - - Map map; - public Map Map - { - get { return map; } - set - { - map = value; - TileSet = LoadTileSet(Map); - } - } - - Palette pal; - TileSet TileSet; - Package TileMix; - string TileSuffix; - Dictionary TreeCache = new Dictionary(); - - public MapViewControl() - { - SetStyle(ControlStyles.OptimizedDoubleBuffer, true); - UpdateStyles(); - } - - static Font font = new Font(FontFamily.GenericMonospace, 10); - protected override void OnPaint(PaintEventArgs e) - { - base.OnPaint(e); - if (Map == null || TileSet == null) - return; - - Graphics g = e.Graphics; - - for (int x = 55; x >= 0; x--) - { - int tX = x + Map.XOffset + XScroll; - if (tX < Map.XOffset || tX >= Map.XOffset + Map.Width) - continue; - - for (int y = 50; y >= 0; y--) - { - int tY = y + Map.YOffset + YScroll; - if (tY < Map.YOffset || tY >= Map.YOffset + Map.Height) - continue; - - Terrain t; - if (TileSet.tiles.TryGetValue(Map.MapTiles[tX, tY].tile, out t)) - { - Bitmap b = t.GetTile(Map.MapTiles[tX, tY].image); - if (b == null) - { - g.FillRectangle(Brushes.Blue, x * 24, y * 24, 24, 24); - g.DrawString(string.Format("{0:x}", Map.MapTiles[tX, tY].image), - font, Brushes.White, x * 24, y * 24); - } - else - g.DrawImage(b, x * 24, y * 24); - } - else - { - g.FillRectangle(Brushes.Red, x * 24, y * 24, 24, 24); - g.DrawString(string.Format("{0:x}", Map.MapTiles[tX, tY].tile), - font, Brushes.White, x * 24, y * 24); - } - } - } - - foreach (TreeReference tr in Map.Trees) - { - int tX = tr.X - Map.XOffset - XScroll; - int tY = tr.Y - Map.YOffset - YScroll; - g.DrawImage(GetTree(tr.Image, TileMix), tX * 24, tY * 24); - } - } - - Bitmap GetTree(string name, Package mix) - { - Bitmap ret; - if (!TreeCache.TryGetValue(name, out ret)) - { - ShpReader shp = new ShpReader(TileSet.MixFile.GetContent(name + TileSuffix)); - ret = BitmapBuilder.FromBytes(shp[0].Image, shp.Size, pal); ; - TreeCache.Add(name, ret); - } - return ret; - } - - TileSet LoadTileSet(Map currentMap) - { - switch (currentMap.Theater.ToLowerInvariant()) - { - case "temperate": - pal = new Palette(File.OpenRead("../../../temperat.pal")); - TileMix = new Package("../../../temperat.mix"); - TileSuffix = ".tem"; - break; - case "snow": - pal = new Palette(File.OpenRead("../../../snow.pal")); - TileMix = new Package("../../../snow.mix"); - TileSuffix = ".sno"; - break; - case "interior": - pal = new Palette(File.OpenRead("../../../interior.pal")); - TileMix = new Package("../../../interior.mix"); - TileSuffix = ".int"; - break; - default: - throw new NotImplementedException(); - } - return new TileSet(TileMix, TileSuffix, pal); - } - - int ux,uy, vx, vy; - - protected override void OnMouseDown(MouseEventArgs e) - { - base.OnMouseDown(e); - - if (e.Button == MouseButtons.Right) - { - ux = e.X; - uy = e.Y; - - vx = XScroll; - vy = YScroll; - - Cursor = Cursors.NoMove2D; - } - } - - protected override void OnMouseMove(MouseEventArgs e) - { - base.OnMouseMove(e); - - if (e.Button == MouseButtons.Right) - { - int dx = ux - e.X; - int dy = uy - e.Y; - - XScroll = vx + dx / 24; - YScroll = vy + dy / 24; - - Invalidate(); - } - } - - protected override void OnMouseUp(MouseEventArgs e) - { - base.OnMouseUp(e); - - Cursor = Cursors.Default; - } - - } -} diff --git a/ShpViewer/Program.cs b/ShpViewer/Program.cs deleted file mode 100644 index 53febeb6a3..0000000000 --- a/ShpViewer/Program.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Windows.Forms; -using System.IO; - -namespace ShpViewer -{ - static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault( false ); - - try - { - OpenFileDialog ofd = new OpenFileDialog(); - ofd.Filter = "SHP Files (*.shp)|*.shp|Terrain Files (*.tem; *.sno; *.int)|*.tem;*.sno;*.int|Map Files (*.ini;*.mpr)|*.ini;*.mpr|All Files (*.*)|*.*"; - ofd.RestoreDirectory = true; - if( ofd.ShowDialog() == DialogResult.OK ) - Application.Run( new ShpViewForm( ofd.FileName ) ); - } - catch( Exception e ) - { - MessageBox.Show( e.ToString() ); - } - } - } -} \ No newline at end of file diff --git a/ShpViewer/Properties/AssemblyInfo.cs b/ShpViewer/Properties/AssemblyInfo.cs deleted file mode 100644 index b69d4a9b40..0000000000 --- a/ShpViewer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle( "ShpViewer" )] -[assembly: AssemblyDescription( "" )] -[assembly: AssemblyConfiguration( "" )] -[assembly: AssemblyCompany( "" )] -[assembly: AssemblyProduct( "ShpViewer" )] -[assembly: AssemblyCopyright( "Copyright © 2007" )] -[assembly: AssemblyTrademark( "" )] -[assembly: AssemblyCulture( "" )] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible( false )] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid( "69816600-0431-4ad8-b648-47f5ac2d545c" )] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion( "1.0.0.0" )] -[assembly: AssemblyFileVersion( "1.0.0.0" )] diff --git a/ShpViewer/Properties/Resources.Designer.cs b/ShpViewer/Properties/Resources.Designer.cs deleted file mode 100644 index a53ec290f2..0000000000 --- a/ShpViewer/Properties/Resources.Designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.1318 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ShpViewer.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ShpViewer.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - } -} diff --git a/ShpViewer/Properties/Resources.resx b/ShpViewer/Properties/Resources.resx deleted file mode 100644 index ffecec851a..0000000000 --- a/ShpViewer/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/ShpViewer/Properties/Settings.Designer.cs b/ShpViewer/Properties/Settings.Designer.cs deleted file mode 100644 index eebe26a36b..0000000000 --- a/ShpViewer/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.1318 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ShpViewer.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/ShpViewer/Properties/Settings.settings b/ShpViewer/Properties/Settings.settings deleted file mode 100644 index abf36c5d3d..0000000000 --- a/ShpViewer/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ShpViewer/ShpViewForm.Designer.cs b/ShpViewer/ShpViewForm.Designer.cs deleted file mode 100644 index 80e738c5f4..0000000000 --- a/ShpViewer/ShpViewForm.Designer.cs +++ /dev/null @@ -1,77 +0,0 @@ -namespace ShpViewer -{ - partial class ShpViewForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose( bool disposing ) - { - if( disposing && ( components != null ) ) - { - components.Dispose(); - } - base.Dispose( disposing ); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.mapViewControl1 = new ShpViewer.MapViewControl(); - this.SuspendLayout(); - // - // flowLayoutPanel1 - // - this.flowLayoutPanel1.Anchor = ( (System.Windows.Forms.AnchorStyles)( ( ( ( System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom ) - | System.Windows.Forms.AnchorStyles.Left ) - | System.Windows.Forms.AnchorStyles.Right ) ) ); - this.flowLayoutPanel1.Location = new System.Drawing.Point( 1, 1 ); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size( 292, 273 ); - this.flowLayoutPanel1.TabIndex = 0; - // - // mapViewControl1 - // - this.mapViewControl1.Anchor = ( (System.Windows.Forms.AnchorStyles)( ( ( ( System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom ) - | System.Windows.Forms.AnchorStyles.Left ) - | System.Windows.Forms.AnchorStyles.Right ) ) ); - this.mapViewControl1.BackColor = System.Drawing.Color.Black; - this.mapViewControl1.Location = new System.Drawing.Point( 0, 0 ); - this.mapViewControl1.Name = "mapViewControl1"; - this.mapViewControl1.Size = new System.Drawing.Size( 293, 274 ); - this.mapViewControl1.TabIndex = 1; - this.mapViewControl1.Text = "mapViewControl1"; - this.mapViewControl1.Visible = false; - // - // ShpViewForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF( 6F, 13F ); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size( 292, 273 ); - this.Controls.Add( this.mapViewControl1 ); - this.Controls.Add( this.flowLayoutPanel1 ); - this.Name = "ShpViewForm"; - this.Text = "Form1"; - this.ResumeLayout( false ); - - } - - #endregion - - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; - private MapViewControl mapViewControl1; - } -} - diff --git a/ShpViewer/ShpViewForm.cs b/ShpViewer/ShpViewForm.cs deleted file mode 100644 index e990d4297a..0000000000 --- a/ShpViewer/ShpViewForm.cs +++ /dev/null @@ -1,91 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Text; -using System.Windows.Forms; -using System.IO; - -using OpenRa.FileFormats; - -namespace ShpViewer -{ - public partial class ShpViewForm : Form - { - List bitmaps = new List(); - - public ShpViewForm( string filename ) - { - InitializeComponent(); - - string ext = Path.GetExtension( filename ).ToLowerInvariant(); - if( ext == ".shp" ) - { - ShpReader shpReader = new ShpReader( File.OpenRead( filename ) ); - - Palette pal = new Palette( File.OpenRead( "../../../temperat.pal" ) ); - - PaletteRemap remap = new PaletteRemap(File.OpenRead("../../../blue.rem")); - pal = new Palette(pal, remap); - - foreach( ImageHeader h in shpReader ) - bitmaps.Add( BitmapBuilder.FromBytes( h.Image, shpReader.Size, pal ) ); - } - else if( ext == ".tem" || ext == ".sno" || ext == ".int" ) - { - Palette pal = new Palette( File.OpenRead( "../../../temperat.pal" ) ); - switch( ext ) - { - case ".sno": - pal = new Palette( File.OpenRead( "../../../snow.pal" ) ); - break; - case ".int": - pal = new Palette( File.OpenRead( "../../../interior.pal" ) ); - break; - } - - Terrain t = new Terrain( File.OpenRead( filename ), pal ); - - Bitmap bigTile = new Bitmap( 24 * t.XDim, 24 * t.YDim ); - using( Graphics g = Graphics.FromImage( bigTile ) ) - { - for( int x = 0 ; x < t.XDim ; x++ ) - for( int y = 0 ; y < t.YDim ; y++ ) - g.DrawImageUnscaled( t.GetTile( x + y * t.XDim ) ?? new Bitmap( 24, 24 ), x * 24, y * 24 ); - } - bitmaps.Add( bigTile ); - } - else if( ext == ".ini" || ext == ".mpr" ) - { - IniFile iniFile = new IniFile( File.OpenRead( filename ) ); - Map map = new Map( iniFile ); - - flowLayoutPanel1.Visible = false; - mapViewControl1.Visible = true; - mapViewControl1.Map = map; - mapViewControl1.Invalidate(); - - mapViewControl1.MouseClick += delegate( object sender, MouseEventArgs e ) - { - if( e.Button == MouseButtons.Left ) - { - mapViewControl1.Map = new Map( iniFile ); - mapViewControl1.Invalidate(); - } - }; - } - - foreach (Bitmap b in bitmaps) - { - PictureBox p = new PictureBox(); - p.Image = b; - p.Size = b.Size; - flowLayoutPanel1.Controls.Add(p); - } - - Focus(); - BringToFront(); - } - } -} diff --git a/ShpViewer/ShpViewForm.resx b/ShpViewer/ShpViewForm.resx deleted file mode 100644 index ff31a6db56..0000000000 --- a/ShpViewer/ShpViewForm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/ShpViewer/ShpViewer.csproj b/ShpViewer/ShpViewer.csproj deleted file mode 100644 index 04cf1de0cf..0000000000 --- a/ShpViewer/ShpViewer.csproj +++ /dev/null @@ -1,90 +0,0 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {4303FE72-B07F-4EBB-8CD2-5F33E44801B3} - WinExe - Properties - ShpViewer - ShpViewer - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - Component - - - Form - - - ShpViewForm.cs - - - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - Designer - ShpViewForm.cs - - - True - Resources.resx - True - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA} - OpenRa.FileFormats - - - - - \ No newline at end of file