izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

GenerateMipChain() and AdjustImageColors() are made public and changed to ITextureCompressorModule::GenerateMipChain() and ITextureCompressorModule::AdjustImageColors(). This allows us to export the specific MipMap levels and the textures with adjustments to PNG.

Browse Source 
Fix SRGB of 16bit cubemap

Import the existing texture asset without Dialog box
New parameter to SuppressImportOverwriteDialog which can suppress the dialog box that, when importing over an existing texture, force to overwrite its settings.

#jira UE-78899

PR #6123: Texture changes for NVIDIA USD plugin.

#rb jeanmichel.dignard
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 8127249 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v401-8057353)

[CL 8127258 by simon tourangeau in Main branch]
This commit is contained in:
simon tourangeau
2019-08-20 13:24:46 -04:00
parent 0d233fce7a
commit 311a249228
6 changed files with 102 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Engine/Source/Developer/TextureCompressor/Private/TextureCompressorModule.cpp
View File

@@ -692,18 +692,11 @@ static void GenerateTopMip(const FImage& SrcImage, FImage& DestImage, const FTex
}
}
/**
* Generate a full mip chain. The input mip chain must have one or more mips.
* @param Settings - Preprocess settings.
* @param BaseImage - An image that will serve as the source for the generation of the mip chain.
* @param OutMipChain - An array that will contain the resultant mip images. Generated mip levels are appended to the array.
* @param MipChainDepth - number of mip images to produce. Mips chain is finished when either a 1x1 mip is produced or 'MipChainDepth' images have been produced.
*/
static void GenerateMipChain(
void ITextureCompressorModule::GenerateMipChain(
const FTextureBuildSettings& Settings,
const FImage& BaseImage,
TArray<FImage> &OutMipChain,
uint32 MipChainDepth = MAX_uint32
uint32 MipChainDepth
)
{
check(BaseImage.Format == ERawImageFormat::RGBA32F);
@@ -1380,17 +1373,7 @@ static void GenerateAngularFilteredMips(TArray<FImage>& InOutMipChain, int32 Num
}
}
/*------------------------------------------------------------------------------
Image Processing.
------------------------------------------------------------------------------*/
/**
* Adjusts the colors of the image using the specified settings
*
* @param Image Image to adjust
* @param InBuildSettings Image build settings
*/
static void AdjustImageColors( FImage& Image, const FTextureBuildSettings& InBuildSettings )
void ITextureCompressorModule::AdjustImageColors(FImage& Image, const FTextureBuildSettings& InBuildSettings)
{
const FColorAdjustmentParameters& InParams = InBuildSettings.ColorAdjustment;
check( Image.SizeX > 0 && Image.SizeY > 0 );
@@ -2028,6 +2011,11 @@ private:
int32 NumSourceMips = InSourceMips.Num();
if (BuildSettings.MipGenSettings == TMGS_LeaveExistingMips)
{
NumOutputMips = InSourceMips.Num();
}
if (BuildSettings.MipGenSettings != TMGS_LeaveExistingMips || bLongLatCubemap)
{
NumSourceMips = 1;