TMX: save UserId, allow editing in UI

AMD: fix 'Cannot open a closed file'
tge-was-taken · Jun 18, 2020 · 0a38165 · 0a38165
1 parent 91989ef
commit 0a38165
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 13 deletions.
diff --git a/Dependencies/Nuget/System.ValueTuple.4.4.0/.signature.p7s b/Dependencies/Nuget/System.ValueTuple.4.4.0/.signature.p7s
diff --git a/Dependencies/Nuget/morelinq.2.10.0/.signature.p7s b/Dependencies/Nuget/morelinq.2.10.0/.signature.p7s
diff --git a/Source/Amicitia/Properties/AssemblyInfo.cs b/Source/Amicitia/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]
diff --git a/Source/Amicitia/ResourceWrapperFactory.cs b/Source/Amicitia/ResourceWrapperFactory.cs
@@ -28,6 +28,9 @@ public static IResourceWrapper GetResourceWrapper(string text, Stream stream, in
         {
             if ( stream is FileStream fileStream )
             {
+                if ( filePath == null )
+                    filePath = fileStream.Name;
+
                 stream = fileStream.ToMemoryStream( leaveOpen: false );
             }
 

diff --git a/Source/Amicitia/ResourceWrappers/PAKFileSystemWrapper.cs b/Source/Amicitia/ResourceWrappers/PAKFileSystemWrapper.cs
@@ -22,8 +22,7 @@ protected override void Initialize()
 
             RegisterFileExportAction(SupportedFileType.PakArchiveFile, ( res, path ) =>
             {
-                res.Save().SaveToFile( leaveOpen: false, path );
-
+                res.Save( path );
             } );
             RegisterFileReplaceAction( SupportedFileType.PakArchiveFile, ( res, path ) =>
             {

diff --git a/Source/Amicitia/ResourceWrappers/ResourceWrapper.cs b/Source/Amicitia/ResourceWrappers/ResourceWrapper.cs
@@ -96,6 +96,8 @@ public abstract partial class ResourceWrapper<TResource> : TreeNode, IResourceWr
         private Dictionary<SupportedFileType, Action<string, ResourceWrapper<TResource>>> mFileAddActions;
         private Func<ResourceWrapper<TResource>, TResource> mRebuildAction;
         private List<ContextMenuAction> mCustomActions;
+        private Dictionary<Type, ContextMenuStrip> mContextMenuStripCache
+            = new Dictionary<Type, ContextMenuStrip>();
 
         public event PropertyChangedEventHandler PropertyChanged;
 
@@ -574,6 +576,13 @@ private void PopulateViewFully()
         /// </summary>
         private void PopulateContextMenuStrip()
         {
+            var type = GetType();
+            if (mContextMenuStripCache.TryGetValue( type, out var temp ) )
+            {
+                ContextMenuStrip = temp;
+                return;
+            }
+
             ContextMenuStrip = new ContextMenuStrip();
 
             if ( mCustomActions != null )
@@ -629,6 +638,8 @@ private void PopulateContextMenuStrip()
             {
                 ContextMenuStrip.Items.Add(new ToolStripMenuItem("&Delete", null, DeleteEventHandler, Keys.Control | Keys.Delete));
             }
+
+            mContextMenuStripCache[type] = ContextMenuStrip;
         }
 
         /// <summary>

diff --git a/Source/Amicitia/ResourceWrappers/TMXFileWrapper.cs b/Source/Amicitia/ResourceWrappers/TMXFileWrapper.cs
@@ -37,6 +37,14 @@ public class TmxFileWrapper : ResourceWrapper<TmxFile>
         [OrderedProperty]
         public byte MipMapCount => Resource.MipMapCount;
 
+        [Category( "Texture format" )]
+        [OrderedProperty]
+        public float MipMapKValue => Resource.MipMapKValue;
+
+        [Category( "Texture format" )]
+        [OrderedProperty]
+        public float MipMapLValue => Resource.MipMapLValue;
+
         [Category("Texture wrapping modes")]
         [OrderedProperty]
         public TmxWrapMode HorizontalWrappingMode
@@ -53,6 +61,13 @@ public TmxWrapMode VerticalWrappingMode
             set => SetProperty(Resource, value);
         }
 
+        [Category("Texture metadata"), OrderedProperty]
+        public short UserId
+        {
+            get => Resource.UserId;
+            set => SetProperty(Resource, value);
+        }
+
         [Category("Texture metadata")]
         [OrderedProperty]
         public int UserTextureId
@@ -77,6 +92,14 @@ public string UserComment
             set => SetProperty(Resource, value);
         }
 
+        [Category("Misc")]
+        [OrderedProperty]
+        public byte Reserved
+        {
+            get => Resource.Reserved;
+            set => SetProperty(Resource, value);
+        }
+
         public TmxFileWrapper(string text, TmxFile resource) : base(text, resource)
         {
         }

diff --git a/Source/AmicitiaLibrary/FileSystems/AMD/AMDFile.cs b/Source/AmicitiaLibrary/FileSystems/AMD/AMDFile.cs
@@ -3,6 +3,7 @@
     using IO;
     using System.Collections.Generic;
     using System.IO;
+    using System.Text;
     using Utilities;
 
     public class AmdFile : BinaryBase
@@ -65,7 +66,7 @@ public AmdFile(string path)
         /// <param name="path">The path pointing to the the file to load.</param>
         public AmdFile(Stream stream, bool leaveOpen = false)
         {
-            using (BinaryReader reader = new BinaryReader(stream))
+            using (BinaryReader reader = new BinaryReader( stream, Encoding.Default, leaveOpen ) )
             {
                 Read(reader);
             }

diff --git a/Source/AmicitiaLibrary/FileSystems/CVM/CVMExecutableListing.cs b/Source/AmicitiaLibrary/FileSystems/CVM/CVMExecutableListing.cs
@@ -17,9 +17,9 @@ public CvmExecutableListing(string path)
                 mRootDirectoryListing = new CvmDirectoryListing(reader, null);
         }
 
-        public CvmExecutableListing(Stream stream)
+        public CvmExecutableListing(Stream stream, bool leaveOpen = false)
         {
-            using (BinaryReader reader = new BinaryReader(stream, System.Text.Encoding.Default, true))
+            using (BinaryReader reader = new BinaryReader(stream, System.Text.Encoding.Default, leaveOpen ) )
                 mRootDirectoryListing = new CvmDirectoryListing(reader, null);
         }
 

diff --git a/Source/AmicitiaLibrary/Graphics/RenderWare/RMDNodeLink.cs b/Source/AmicitiaLibrary/Graphics/RenderWare/RMDNodeLink.cs
@@ -35,9 +35,9 @@ public RmdNodeLink(byte[] data)
         {
         }
 
-        public RmdNodeLink(Stream stream)
+        public RmdNodeLink(Stream stream, bool leaveOpen = false)
         {
-            using (BinaryReader reader = new BinaryReader(stream))
+            using (BinaryReader reader = new BinaryReader(stream, System.Text.Encoding.Default, leaveOpen) )
             {
                 Read(reader);
             }

diff --git a/Source/AmicitiaLibrary/Graphics/TMX/TMXFile.cs b/Source/AmicitiaLibrary/Graphics/TMX/TMXFile.cs
@@ -96,6 +96,7 @@ internal TmxFile(BinaryReader reader)
         /********************/
         /**** Properties ****/
         /********************/
+        public short UserId { get; set; }
 
         public byte PaletteCount { get; private set; }
 
@@ -139,6 +140,8 @@ public byte MipMapLValue
             }
         }
 
+        public byte Reserved { get; set; }
+
         public TmxWrapMode HorizontalWrappingMode
         {
             get
@@ -289,7 +292,7 @@ internal override void Write(BinaryWriter writer)
             writer.Write((byte)PixelFormat);
             writer.Write(MipMapCount);
             writer.Write(mMipKl);
-            writer.Write((byte)0);
+            writer.Write(Reserved);
             writer.Write(mWrapModes);
             writer.Write(UserTextureId);
             writer.Write(UserClutId);
@@ -311,7 +314,7 @@ internal override void Write(BinaryWriter writer)
             // Seek back to the chunk header and write it
             writer.BaseStream.Seek(posFileStart, SeekOrigin.Begin);
             writer.Write(FLAG);
-            writer.Write((short)0); // userID
+            writer.Write(UserId); // userID
             writer.Write(length);
             writer.WriteCString(TAG, 4);
 
@@ -323,7 +326,7 @@ private void Read(BinaryReader reader)
         {
             long posFileStart = reader.GetPosition();
             short flag = reader.ReadInt16();
-            short userId = reader.ReadInt16();
+            UserId = reader.ReadInt16();
             int length = reader.ReadInt32();
             string tag = reader.ReadCString(4);
             reader.AlignPosition(16);
@@ -340,7 +343,7 @@ private void Read(BinaryReader reader)
             PixelFormat = (PS2PixelFormat)reader.ReadByte();
             MipMapCount = reader.ReadByte();
             mMipKl = reader.ReadUInt16();
-            byte reserved = reader.ReadByte();
+            Reserved = reader.ReadByte();
             mWrapModes = reader.ReadByte();
             UserTextureId = reader.ReadInt32();
             UserClutId = reader.ReadInt32();