Skip to content
This repository has been archived by the owner on Nov 27, 2018. It is now read-only.

Commit

Permalink
Fixed alpha settings during save with original data.
Browse files Browse the repository at this point in the history 
Nuget release.
  • Loading branch information
@KFreon
KFreon committed Jan 31, 2017
1 parent c7e2fda commit f284b74
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CSharpImageLibrary/CSharpImageLibrary.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<projectUrl>https://github.com/KFreon/CSharpImageLibrary</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Loads and saves standard images including DDS (all sorts and weird ones like V8U8, G8, etc. See full list on github.)</description>
<releaseNotes>Support for large component DDS' enabled.</releaseNotes>
<releaseNotes>Minor fix for using original data during save not working as intended.</releaseNotes>
<copyright>Copyright KFreon 2015</copyright>
<tags>Image DDS Texture</tags>
</metadata>
Expand Down
83 changes: 82 additions & 1 deletion CSharpImageLibrary/ImageEngineImage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ byte[] AttemptSaveUsingOriginalData(ImageFormats.ImageEngineFormatDetails destFo
int newHeight = Height;
DDS_Header tempHeader = null;
byte[] data = null;
byte[] tempOriginalData = OriginalData;

if (destFormatDetails.IsDDS)
{
Expand Down Expand Up @@ -299,6 +300,86 @@ byte[] AttemptSaveUsingOriginalData(ImageFormats.ImageEngineFormatDetails destFo
}
else
{
if (alphaSetting == AlphaSettings.RemoveAlphaChannel)
{
// Can't edit alpha directly in premultiplied formats. Not easily anyway.
if (destFormatDetails.IsPremultipliedFormat)
return ImageEngine.Save(MipMaps, destFormatDetails, GenerateMips, alphaSetting, desiredMaxDimension, mipToSave);


// DDS Formats only
switch (destFormatDetails.Format)
{
// Excluded cos they have no true alpha
case ImageEngineFormat.DDS_A8:
case ImageEngineFormat.DDS_A8L8:
case ImageEngineFormat.DDS_ATI1:
case ImageEngineFormat.DDS_ATI2_3Dc:
case ImageEngineFormat.DDS_V8U8:
case ImageEngineFormat.DDS_G16_R16:
case ImageEngineFormat.DDS_G8_L8:
case ImageEngineFormat.DDS_R5G6B5:
case ImageEngineFormat.DDS_RGB_8:
case ImageEngineFormat.DDS_DXT1:
break;

// Exluded cos they're alpha isn't easily edited
case ImageEngineFormat.DDS_DXT2:
case ImageEngineFormat.DDS_DXT4:
break;

// Excluded cos they're currently unsupported
case ImageEngineFormat.DDS_CUSTOM:
case ImageEngineFormat.DDS_DX10:
case ImageEngineFormat.DDS_ARGB_4:
break;

case ImageEngineFormat.DDS_ABGR_8:
case ImageEngineFormat.DDS_ARGB_32F:
case ImageEngineFormat.DDS_ARGB_8:
case ImageEngineFormat.DDS_DXT3:
case ImageEngineFormat.DDS_DXT5:
tempOriginalData = new byte[OriginalData.Length];
Array.Copy(OriginalData, tempOriginalData, OriginalData.Length);

// Edit alpha values
int alphaStart = 128;
int alphaJump = 0;
byte[] alphaBlock = null;
if (destFormatDetails.IsBlockCompressed)
{
alphaJump = 16;
alphaBlock = new byte[8];
for (int i = 0; i < 8; i++)
alphaBlock[i] = 255;
}
else
{
alphaJump = destFormatDetails.ComponentSize * 4;
alphaBlock = new byte[destFormatDetails.ComponentSize];

switch (destFormatDetails.ComponentSize)
{
case 1:
alphaBlock[0] = 255;
break;
case 2:
alphaBlock = BitConverter.GetBytes(ushort.MaxValue);
break;
case 4:
alphaBlock = BitConverter.GetBytes(1f);
break;
}
}

for (int i = alphaStart; i < OriginalData.Length; i += alphaJump)
Array.Copy(alphaBlock, 0, tempOriginalData, i, alphaBlock.Length);

break;
}
}


switch (GenerateMips)
{
case MipHandling.KeepExisting:
Expand Down Expand Up @@ -344,7 +425,7 @@ byte[] AttemptSaveUsingOriginalData(ImageFormats.ImageEngineFormatDetails destFo

// Use existing array, otherwise create one.
data = data ?? new byte[length];
Array.Copy(OriginalData, start, data, destStart, length - destStart);
Array.Copy(tempOriginalData, start, data, destStart, length - destStart);

// Write header if existing (DDS Only)
if (tempHeader != null)
Expand Down

0 comments on commit f284b74

Please sign in to comment.