stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-18 14:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated SharpCompress library from 0.8.1 to 0.10.3. This fixes inability to load certain PK7 files and grants a 2x performance boost when loading PK3 and PK7 files.

Browse source
This commit is contained in:
MaxED 2014-12-29 12:28:40 +00:00
parent 4f7e2298f4
commit 8491993bf4
5 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Build/SharpCompress.3.5.dll
View file

Binary file not shown.

2
Source/Core/Builder.csproj
View file

@ -505,7 +505,7 @@
<Compile Include="Rendering\WorldVertex.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="SharpCompress.3.5, Version=0.8.1.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="SharpCompress.3.5, Version=0.10.3.0, Culture=neutral, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="SlimDX, Version=2.0.13.43, Culture=neutral, PublicKeyToken=b1b0c32fd1ffe4f9, processorArchitecture=x86" />

8
Source/Core/Data/PK3Reader.cs
View file

@ -75,8 +75,8 @@ namespace CodeImp.DoomBuilder.Data
MemoryStream s = new MemoryStream();
reader.WriteEntryTo(s);
sevenzipentries.Add(reader.Entry.FilePath.ToLowerInvariant(), s.ToArray());
fileentries.Add(new DirectoryFileEntry(reader.Entry.FilePath));
sevenzipentries.Add(reader.Entry.Key.ToLowerInvariant(), s.ToArray());
fileentries.Add(new DirectoryFileEntry(reader.Entry.Key));
}
archive.Dispose();
@ -87,7 +87,7 @@ namespace CodeImp.DoomBuilder.Data
foreach(IArchiveEntry entry in archive.Entries)
{
if(entry.IsDirectory) continue;
fileentries.Add(new DirectoryFileEntry(entry.FilePath));
fileentries.Add(new DirectoryFileEntry(entry.Key));
}
}
@ -428,7 +428,7 @@ namespace CodeImp.DoomBuilder.Data
if (entry.IsDirectory) continue;
// Is this the entry we are looking for?
if(string.Compare(entry.FilePath, fn, true) == 0)
if(string.Compare(entry.Key, fn, true) == 0)
{
filedata = new MemoryStream();
entry.WriteTo(filedata);

4
Source/Core/GZBuilder/Data/SharpCompressHelper.cs
View file

@ -12,7 +12,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Data
stream.Read(arr, 0, (int)stream.Length);
MemoryStream ms = new MemoryStream();
BZip2Stream bzip = new BZip2Stream(ms, CompressionMode.Compress, true);
BZip2Stream bzip = new BZip2Stream(ms, CompressionMode.Compress, true, false);
bzip.Write(arr, 0, arr.Length);
bzip.Close();
@ -22,7 +22,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Data
internal static MemoryStream DecompressStream(Stream stream)
{
BZip2Stream bzip = new BZip2Stream(stream, CompressionMode.Decompress, false);
BZip2Stream bzip = new BZip2Stream(stream, CompressionMode.Decompress, false, false);
byte[] buffer = new byte[16 * 1024];
MemoryStream ms = new MemoryStream();

30
Source/Core/Windows/OpenMapOptionsForm.Designer.cs generated
View file

@ -34,6 +34,7 @@ namespace CodeImp.DoomBuilder.Windows
System.Windows.Forms.Label label3;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OpenMapOptionsForm));
this.panelres = new System.Windows.Forms.GroupBox();
this.longtexturenames = new System.Windows.Forms.CheckBox();
this.strictpatches = new System.Windows.Forms.CheckBox();
this.datalocations = new CodeImp.DoomBuilder.Controls.ResourceListEditor();
this.apply = new System.Windows.Forms.Button();
@ -42,7 +43,6 @@ namespace CodeImp.DoomBuilder.Windows
this.mapslist = new System.Windows.Forms.ListView();
this.scriptcompiler = new System.Windows.Forms.ComboBox();
this.scriptcompilerlabel = new System.Windows.Forms.Label();
this.longtexturenames = new System.Windows.Forms.CheckBox();
columnHeader1 = new System.Windows.Forms.ColumnHeader();
label1 = new System.Windows.Forms.Label();
label2 = new System.Windows.Forms.Label();
@ -65,12 +65,13 @@ namespace CodeImp.DoomBuilder.Windows
//
// label2
//
label2.AutoSize = true;
label2.Location = new System.Drawing.Point(12, 89);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(396, 30);
label2.Size = new System.Drawing.Size(372, 28);
label2.TabIndex = 16;
label2.Text = "With the above selected configuration, the maps shown below were found in the cho" +
"sen WAD file. Please select the map to load for editing.";
label2.Text = "With the above selected configuration, the maps shown below were found \r\nin the c" +
"hosen WAD file. Please select the map to load for editing.";
//
// label3
//
@ -96,6 +97,16 @@ namespace CodeImp.DoomBuilder.Windows
this.panelres.TabStop = false;
this.panelres.Text = " Resources ";
//
// longtexturenames
//
this.longtexturenames.AutoSize = true;
this.longtexturenames.Location = new System.Drawing.Point(14, 45);
this.longtexturenames.Name = "longtexturenames";
this.longtexturenames.Size = new System.Drawing.Size(140, 18);
this.longtexturenames.TabIndex = 20;
this.longtexturenames.Text = "Use long texture names";
this.longtexturenames.UseVisualStyleBackColor = true;
//
// strictpatches
//
this.strictpatches.AutoSize = true;
@ -195,16 +206,6 @@ namespace CodeImp.DoomBuilder.Windows
this.scriptcompilerlabel.Text = "Script Type:";
this.scriptcompilerlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// longtexturenames
//
this.longtexturenames.AutoSize = true;
this.longtexturenames.Location = new System.Drawing.Point(14, 45);
this.longtexturenames.Name = "longtexturenames";
this.longtexturenames.Size = new System.Drawing.Size(140, 18);
this.longtexturenames.TabIndex = 20;
this.longtexturenames.Text = "Use long texture names";
this.longtexturenames.UseVisualStyleBackColor = true;
//
// OpenMapOptionsForm
//
this.AcceptButton = this.apply;
@ -236,6 +237,7 @@ namespace CodeImp.DoomBuilder.Windows
this.panelres.ResumeLayout(false);
this.panelres.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}