diff --git a/FolderDialog.designer.cs b/FolderDialog.designer.cs index 1cb3f50..17af946 100644 --- a/FolderDialog.designer.cs +++ b/FolderDialog.designer.cs @@ -44,6 +44,7 @@ private void InitializeComponent() this.Label4 = new System.Windows.Forms.Label(); this.CB_resize_Ratio = new System.Windows.Forms.ComboBox(); this.GB_format = new System.Windows.Forms.GroupBox(); + this.CB_format_FLIPImages = new System.Windows.Forms.CheckBox(); this.Label5 = new System.Windows.Forms.Label(); this.CB_format_incPNG = new System.Windows.Forms.CheckBox(); this.CB_format_incTGA = new System.Windows.Forms.CheckBox(); @@ -60,7 +61,6 @@ private void InitializeComponent() this.CB_mipmap_Generate = new System.Windows.Forms.CheckBox(); this.GB_normal = new System.Windows.Forms.GroupBox(); this.CB_normal_ConvSelect = new System.Windows.Forms.ComboBox(); - this.CB_format_FLIPImages = new System.Windows.Forms.CheckBox(); this.TableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_misc_MinWidth)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_misc_MinHeight)).BeginInit(); @@ -318,6 +318,19 @@ private void InitializeComponent() this.GB_format.TabStop = false; this.GB_format.Text = "Format"; // + // CB_format_FLIPImages + // + this.CB_format_FLIPImages.AutoSize = true; + this.CB_format_FLIPImages.Checked = true; + this.CB_format_FLIPImages.CheckState = System.Windows.Forms.CheckState.Checked; + this.CB_format_FLIPImages.FlatStyle = System.Windows.Forms.FlatStyle.System; + this.CB_format_FLIPImages.Location = new System.Drawing.Point(9, 108); + this.CB_format_FLIPImages.Name = "CB_format_FLIPImages"; + this.CB_format_FLIPImages.Size = new System.Drawing.Size(175, 18); + this.CB_format_FLIPImages.TabIndex = 6; + this.CB_format_FLIPImages.Text = "Flip png/tag? (usually needed)"; + this.CB_format_FLIPImages.UseVisualStyleBackColor = true; + // // Label5 // this.Label5.AutoSize = true; @@ -495,17 +508,6 @@ private void InitializeComponent() this.CB_normal_ConvSelect.Size = new System.Drawing.Size(181, 21); this.CB_normal_ConvSelect.TabIndex = 0; // - // CB_format_FLIPImages - // - this.CB_format_FLIPImages.AutoSize = true; - this.CB_format_FLIPImages.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.CB_format_FLIPImages.Location = new System.Drawing.Point(9, 108); - this.CB_format_FLIPImages.Name = "CB_format_FLIPImages"; - this.CB_format_FLIPImages.Size = new System.Drawing.Size(182, 18); - this.CB_format_FLIPImages.TabIndex = 6; - this.CB_format_FLIPImages.Text = "Flip png/tag? (no for KSP 1.0+!)"; - this.CB_format_FLIPImages.UseVisualStyleBackColor = true; - // // FolderDialog // this.AcceptButton = this.OK_Button; diff --git a/FolderProcessingParams.cs b/FolderProcessingParams.cs index 0e3b1d0..70819d8 100644 --- a/FolderProcessingParams.cs +++ b/FolderProcessingParams.cs @@ -30,7 +30,7 @@ public FolderProcessingParams() DeleteFilesOnSuccess = false; BackupFile = true; IgnoreExceptions = false; - FlipImages = false; + FlipImages = true; MinRes_Resize_Height = 64; MinRes_Resize_Width = 64; MinRes_Process_Width = 8; diff --git a/ImageManager.cs b/ImageManager.cs index b2c8101..c03f022 100644 --- a/ImageManager.cs +++ b/ImageManager.cs @@ -279,8 +279,8 @@ public static void ConvertFileToDDS(ConversionParameters convParams, FolderProce if(((iInfos.Width < MinHeightForCompressed) | (iInfos.Height < MinHeightForCompressed))) { if(((form == Format.Dxt1) | (form == Format.Dxt5))) - MainForm.Log_WriteLine("LOG : Resolution is considered too low for DXT compression. Switching to uncompressed format for better quality."); - form = Format.A8R8G8B8; + MainForm.Log_WriteLine("LOG : Resolution is considered too low for DXT compression. DISABLING MIPMAPS!"); + //form = Format.A8R8G8B8; mipmapLevel = 1; } @@ -358,9 +358,10 @@ public static void ConvertFileToDDS(ConversionParameters convParams, FolderProce //another attempt to flush memory: the program tend to crash if too much large textures are converted //though, if some smaller textures are converted in between, memory is flushed correctly... - dev.Reset(pParameters); + //dev.Reset(pParameters); //saving the texture + gs.Position = 0; texture = TextureLoader.FromStream(dev, gs, (int) (iCorWidth * dRatio), (int) (iCorHeight * dRatio), mipmapLevel, Usage.None, form, Pool.SystemMemory, Filter.Triangle | Filter.DitherDiffusion, Filter.Triangle | Filter.DitherDiffusion, 0); TextureLoader.Save(fpNew, ImageFileFormat.Dds, texture); //delete unused stuff diff --git a/ModsExceptions.txt b/ModsExceptions.txt index 915e554..744d3f4 100644 --- a/ModsExceptions.txt +++ b/ModsExceptions.txt @@ -80,7 +80,7 @@ TextureReplacer\EnvMap 000_Toolbar -nm -nr // // SQUAD Folder (esp. Flags) -Squad\Flags +Squad // // Exclude everything that seems to be an icon: // (will actually match like *icon*, so if "icon" appears in the file or folder name, it is skipped!)