* Added function to get fragments from resources by name

* Added texture info to ERP Archiver textures tab
* Fixed hook up to Export/Import menu item
* Fix for getting package files from AnimClip and EventGraph resources

Author: ptasev

EgoEngineLibrary/EgoEngineLibrary/Archive/Erp/ErpResource.cs

@@ -198,5 +198,33 @@ public void Import(string[] files)
                 }
             }
         }
+
+        public ErpFragment TryGetFragment(string name, int count)
+        {
+            try
+            {
+                return GetFragment(name, count);
+            }
+            catch
+            {
+                return null;
+            }
+        }
+        public ErpFragment GetFragment(string name, int count)
+        {
+            foreach (ErpFragment fragment in Fragments)
+            {
+                if (fragment.Name == name)
+                {
+                    if (count == 0)
+                    {
+                        return fragment;
+                    }
+                    --count;
+                }
+            }
+
+            throw new ArgumentOutOfRangeException("name", name);
+        }
     }
 }

EgoEngineLibrary/EgoEngineLibrary/Properties/AssemblyInfo.cs

@@ -32,5 +32,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("10.1.2016.0322")]
-[assembly: AssemblyFileVersion("10.1.2016.0322")]
+[assembly: AssemblyVersion("11.0.2016.0901")]
+[assembly: AssemblyFileVersion("11.0.2016.0901")]

EgoErpArchiver/EgoErpArchiver/MainWindow.xaml

@@ -28,8 +28,8 @@
                 </MenuItem>
             </MenuItem>
             <MenuItem Header="_Resources">
-                <MenuItem Header="_Export" Command="{Binding Path=ResourcesWorkspace.Export}" CommandParameter="{Binding ElementName=resourceTreeView, Path=SelectedItem}"></MenuItem>
-                <MenuItem Header="_Import" Command="{Binding Path=ResourcesWorkspace.Import}" CommandParameter="{Binding ElementName=resourceTreeView, Path=SelectedItem}"></MenuItem>
+                <MenuItem Header="_Export" Command="{Binding Path=ResourcesWorkspace.Export}" CommandParameter="{Binding ElementName=resourcesDataGrid, Path=SelectedItem}"></MenuItem>
+                <MenuItem Header="_Import" Command="{Binding Path=ResourcesWorkspace.Import}" CommandParameter="{Binding ElementName=resourcesDataGrid, Path=SelectedItem}"></MenuItem>
                 <MenuItem Header="E_xport All" Command="{Binding Path=ResourcesWorkspace.ExportAll}"></MenuItem>
                 <MenuItem Header="I_mport All" Command="{Binding Path=ResourcesWorkspace.ImportAll}"></MenuItem>
             </MenuItem>
@@ -166,13 +166,19 @@
                     </DockPanel>
                     <GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Stretch" />
                     <DockPanel Grid.Column="2" Background="LightGray">
-                        <TextBlock Panel.ZIndex="2" 
-                                   Text="{Binding ElementName=texListView, Path=SelectedItem.PreviewError}" 
-                                   Visibility="{Binding ElementName=texListView, Path=SelectedItem.PreviewErrorVisibility}"/>
-                        <Image Panel.ZIndex="1" 
+                        <Grid>
+                            <Image 
                                Source="{Binding ElementName=texListView, Path=SelectedItem.Preview}" 
                                MaxWidth="{Binding ElementName=texListView, Path=SelectedItem.Width}" 
                                MaxHeight="{Binding ElementName=texListView, Path=SelectedItem.Height}"></Image>
+                            <StackPanel>
+                                <TextBlock Text="{Binding ElementName=texListView, Path=SelectedItem.TextureInfo}"
+                                       Foreground="Yellow"></TextBlock>
+                                <TextBlock
+                                   Text="{Binding ElementName=texListView, Path=SelectedItem.PreviewError}" 
+                                   Visibility="{Binding ElementName=texListView, Path=SelectedItem.PreviewErrorVisibility}"/>
+                            </StackPanel>
+                        </Grid>
                     </DockPanel>
                 </Grid>
             </TabItem>

EgoErpArchiver/EgoErpArchiver/Properties/AssemblyInfo.cs

@@ -51,5 +51,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("3.0.2016.0828")]
-[assembly: AssemblyFileVersion("3.0.2016.0828")]
+[assembly: AssemblyVersion("4.0.2016.0901")]
+[assembly: AssemblyFileVersion("4.0.2016.0901")]

EgoErpArchiver/EgoErpArchiver/Properties/Resources.Designer.cs

@@ -118,10 +118,10 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="AppTitleLong" xml:space="preserve">
-    <value>Ego ERP Archiver 3.0</value>
+    <value>Ego ERP Archiver 4.0 Beta 1</value>
   </data>
   <data name="AppTitleShort" xml:space="preserve">
-    <value>EEA 3.0</value>
+    <value>EEA 4.0 Beta 1</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="disk" type="System.Resources.ResXFileRef, System.Windows.Forms">

EgoErpArchiver/EgoErpArchiver/Properties/Resources.resx

@@ -65,7 +65,21 @@ public void GetPreview()
         {
             try
             {
-                PkgFile package = PkgFile.ReadPkg(Package.Fragments[0].GetDataStream(true));
+                PkgFile package;
+
+                switch (Package.ResourceType)
+                {
+                    case "AnimClip":
+                        package = PkgFile.ReadPkg(Package.GetFragment("temp", 0).GetDataStream(true));
+                        break;
+                    case "EventGraph":
+                        package = PkgFile.ReadPkg(Package.GetFragment("node", 0).GetDataStream(true));
+                        break;
+                    default:
+                        package = PkgFile.ReadPkg(Package.Fragments[0].GetDataStream(true));
+                        break;
+                }
+
                 StringBuilder sb = new StringBuilder();
                 using (StringWriter sw = new StringWriter(sb))
                 {

EgoErpArchiver/EgoErpArchiver/ViewModel/ErpPackageViewModel.cs

@@ -48,6 +48,7 @@ public int Height
 
         #region Presentation Props
         bool isSelected;
+        string textureInfo;
         BitmapSource preview;
         string previewError;
         Visibility previewErrorVisibility;
@@ -70,6 +71,15 @@ public bool IsSelected
                 }
             }
         }
+        public string TextureInfo
+        {
+            get { return textureInfo; }
+            set
+            {
+                textureInfo = value;
+                OnPropertyChanged("TextureInfo");
+            }
+        }
         public BitmapSource Preview
         {
             get { return preview; }
@@ -102,8 +112,6 @@ public void GetPreview()
             {
                 this.Preview = null;
                 dds = ExportDDS(System.AppDomain.CurrentDomain.BaseDirectory + "\\temp.dds", true);
-                //dds = GetPreviewDDS();
-                //dds.Write(File.Open(System.AppDomain.CurrentDomain.BaseDirectory + "\\temp.dds", FileMode.Create, FileAccess.ReadWrite, FileShare.Read), -1);
                 int maxDimension = (int)Math.Max(dds.header.width, dds.header.height);
                 Width = (int)dds.header.width;
                 Height = (int)dds.header.height;
@@ -203,7 +211,7 @@ public DdsFile ExportDDS(string fileName, bool isPreview)
             DdsFile dds = new DdsFile();
 
             string fNameImage;
-            using (ErpBinaryReader reader = new ErpBinaryReader(Texture.Fragments[0].GetDataStream(true)))
+            using (ErpBinaryReader reader = new ErpBinaryReader(Texture.GetFragment("temp", 0).GetDataStream(true)))
             {
                 reader.Seek(24, SeekOrigin.Begin);
                 fNameImage = reader.ReadString();
@@ -214,7 +222,7 @@ public DdsFile ExportDDS(string fileName, bool isPreview)
             uint width;
             uint height;
             uint mipmaps;
-            using (ErpBinaryReader reader = new ErpBinaryReader(imageEntry.Fragments[0].GetDataStream(true)))
+            using (ErpBinaryReader reader = new ErpBinaryReader(imageEntry.GetFragment("temp", 0).GetDataStream(true)))
             {
                 reader.Seek(8, SeekOrigin.Begin);
                 imageType = reader.ReadInt32();
@@ -229,9 +237,10 @@ public DdsFile ExportDDS(string fileName, bool isPreview)
             uint mipCount = 0;
             uint mipWidth = 0, mipHeight = 0;
             uint mipLinearSize = 0;
-            if (imageEntry.Fragments.Count >= 3 && imageEntry.Fragments[2].Name == "mips")
+            ErpFragment mipsFragment = imageEntry.TryGetFragment("mips", 0);
+            if (mipsFragment != null)
             {
-                using (ErpBinaryReader reader = new ErpBinaryReader(imageEntry.Fragments[2].GetDataStream(true)))
+                using (ErpBinaryReader reader = new ErpBinaryReader(mipsFragment.GetDataStream(true)))
                 {
                     byte strLength = reader.ReadByte();
                     mipMapFileName = reader.ReadString(strLength);
@@ -250,6 +259,7 @@ public DdsFile ExportDDS(string fileName, bool isPreview)
 
             dds.header.width = width;
             dds.header.height = height;
+            textureInfo = width + "x" + height + " Mips:" + (mipmaps) + " Format:" + imageType + ",";
             switch (imageType)
             {
                 case 52: // ferrari_wheel_sfc
@@ -258,19 +268,22 @@ public DdsFile ExportDDS(string fileName, bool isPreview)
                     dds.header.pitchOrLinearSize = (width * height) / 2;
                     dds.header.ddspf.flags |= DdsPixelFormat.Flags.DDPF_FOURCC;
                     dds.header.ddspf.fourCC = BitConverter.ToUInt32(Encoding.UTF8.GetBytes("DXT1"), 0);
+                    TextureInfo += "DXT1";
                     break;
                 case 55: // ferrari_sfc
                 case 57: // ferrari_decal
                     dds.header.flags |= DdsHeader.Flags.DDSD_LINEARSIZE;
                     dds.header.pitchOrLinearSize = (width * height);
                     dds.header.ddspf.flags |= DdsPixelFormat.Flags.DDPF_FOURCC;
                     dds.header.ddspf.fourCC = BitConverter.ToUInt32(Encoding.UTF8.GetBytes("DXT5"), 0);
+                    TextureInfo += "DXT5";
                     break;
                 case 65: // ferrari_wheel_nm
                     dds.header.flags |= DdsHeader.Flags.DDSD_LINEARSIZE;
                     dds.header.pitchOrLinearSize = (width * height);
                     dds.header.ddspf.flags |= DdsPixelFormat.Flags.DDPF_FOURCC;
                     dds.header.ddspf.fourCC = BitConverter.ToUInt32(Encoding.UTF8.GetBytes("ATI2"), 0);
+                    TextureInfo += "ATI2/3Dc";
                     break;
                 case 70: // flow_boot splash_bg_image; tried just about everything, can't figure it out
                     dds.header.flags |= DdsHeader.Flags.DDSD_LINEARSIZE;
@@ -288,7 +301,8 @@ public DdsFile ExportDDS(string fileName, bool isPreview)
                     //dds.header.ddspf.aBitMask = 0xF000;
                     goto default;
                 default:
-                    throw new Exception("Image type not supported!");
+                    TextureInfo += "Unknown";
+                    throw new Exception("Image format not supported!");
             }
             if (mipmaps > 0)
             {
@@ -300,7 +314,7 @@ public DdsFile ExportDDS(string fileName, bool isPreview)
             dds.header.ddspf.size = 32;
             dds.header.caps |= DdsHeader.Caps.DDSCAPS_TEXTURE;
 
-            byte[] imageData = imageEntry.Fragments[1].GetDataArray(true);
+            byte[] imageData = imageEntry.GetFragment("temp", 1).GetDataArray(true);
 
             string mipMapFullFileName = Path.Combine(Properties.Settings.Default.F12016Dir, mipMapFileName);
             bool foundMipMapFile = File.Exists(mipMapFullFileName);
@@ -345,6 +359,7 @@ public DdsFile ExportDDS(string fileName, bool isPreview)
                     Buffer.BlockCopy(mipImageData, 0, dds.bdata, 0, mipImageData.Length);
                     Buffer.BlockCopy(imageData, 0, dds.bdata, mipImageData.Length, imageData.Length);
                     dds.Write(File.Open(fileName, FileMode.Create, FileAccess.Write, FileShare.Read), -1);
+                    TextureInfo += Environment.NewLine + mipWidth + "x" + mipHeight + " Mips:" + (mipCount);
                 }
                 else
                 {
@@ -386,19 +401,20 @@ public void ImportDDS(string fileName, string mipMapSaveLocation)
                     throw new Exception("Image type not supported!");
             }
 
-            MemoryStream tgaData = Texture.Fragments[0].GetDataStream(true);
+            MemoryStream tgaData = Texture.GetFragment("temp", 0).GetDataStream(true);
             string fNameImage;
             ErpBinaryReader reader = new ErpBinaryReader(tgaData);
             reader.Seek(24, SeekOrigin.Begin);
             fNameImage = reader.ReadString();
             ErpResource imageEntry = Texture.ParentFile.FindEntry(fNameImage);
 
             byte[] imageByteData;
-            if (imageEntry.Fragments.Count >= 3 && imageEntry.Fragments[2].Name == "mips")
+            ErpFragment mipsFragment = imageEntry.TryGetFragment("mips", 0);
+            if (mipsFragment != null)
             {
                 string mipMapFileName;
                 uint mipCount = dds.header.mipMapCount / 4;
-                MemoryStream mipsData = imageEntry.Fragments[2].GetDataStream(true);
+                MemoryStream mipsData = mipsFragment.GetDataStream(true);
                 reader = new ErpBinaryReader(mipsData);
                 mipMapFileName = reader.ReadString(reader.ReadByte());
                 uint oldMipCount = reader.ReadUInt32();
@@ -456,7 +472,7 @@ public void ImportDDS(string fileName, string mipMapSaveLocation)
                             //mipHeight /= 4;
                         }
 
-                        imageEntry.Fragments[2].SetData(newMipsData.ToArray());
+                        mipsFragment.SetData(newMipsData.ToArray());
                     }
 
                     using (ErpBinaryWriter writer = new ErpBinaryWriter(EndianBitConverter.Little, File.Open(mipMapSaveLocation, FileMode.Create, FileAccess.Write, FileShare.Read)))
@@ -490,7 +506,8 @@ public void ImportDDS(string fileName, string mipMapSaveLocation)
             }
             Texture.Fragments[0].SetData(tgaData.ToArray());
 
-            MemoryStream imageData = imageEntry.Fragments[0].GetDataStream(true);
+            ErpFragment imageFragment = imageEntry.GetFragment("temp", 0);
+            MemoryStream imageData = imageFragment.GetDataStream(true);
             using (ErpBinaryWriter writer = new ErpBinaryWriter(EndianBitConverter.Little, imageData))
             {
                 writer.Seek(8, SeekOrigin.Begin);
@@ -501,8 +518,8 @@ public void ImportDDS(string fileName, string mipMapSaveLocation)
                 writer.Write(dds.header.mipMapCount);
             }
 
-            imageEntry.Fragments[0].SetData(imageData.ToArray());
-            imageEntry.Fragments[1].SetData(imageByteData);
+            imageFragment.SetData(imageData.ToArray());
+            imageEntry.GetFragment("temp", 1).SetData(imageByteData);
         }
     }
 }