Skip to content

Commit

Permalink
Merge pull request #4 from TheDogKSP/master
Browse files Browse the repository at this point in the history
Further fixes for KSP 1.0
  • Loading branch information
Telanor committed May 7, 2015
2 parents 98880ff + afb49cc commit a1345a2
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 17 deletions.
26 changes: 14 additions & 12 deletions FolderDialog.designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion FolderProcessingParams.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions ImageManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ModsExceptions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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!)
Expand Down

0 comments on commit a1345a2

Please sign in to comment.