GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Add missing support for some formats in TextureTool

Browse Source
This commit is contained in:
Wojtek Figat
2021-10-11 14:02:41 +02:00
parent bcbfaa347a
commit 7880bbe7ec
3 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Engine/Tools/TextureTool/TextureTool.cpp
View File

@@ -610,7 +610,20 @@ TextureTool::PixelFormatSampler PixelFormatSamplers[] =
},
[](const void* ptr, const Color& color)
{
*(FloatR11G11B10*)ptr = Float1010102(color.R, color.G, color.B, color.A);
*(FloatR11G11B10*)ptr = FloatR11G11B10(color.R, color.G, color.B);
},
},
{
PixelFormat::R10G10B10A2_UNorm,
sizeof(Float1010102),
[](const void* ptr)
{
const Vector3 rgb = ((Float1010102*)ptr)->ToVector3();
return Color(rgb.X, rgb.Y, rgb.Z);
},
[](const void* ptr, const Color& color)
{
*(Float1010102*)ptr = Float1010102(color.R, color.G, color.B, color.A);
},
},
};

22
Source/Engine/Tools/TextureTool/TextureTool.stb.cpp
View File

@@ -5,6 +5,7 @@
#include "TextureTool.h"
#include "Engine/Core/Log.h"
#include "Engine/Core/Math/Color32.h"
#include "Engine/Core/Math/Int2.h"
#include "Engine/Serialization/FileWriteStream.h"
#include "Engine/Graphics/RenderTools.h"
#include "Engine/Graphics/Textures/TextureData.h"
@@ -375,14 +376,14 @@ bool TextureTool::ImportTextureStb(ImageType type, const StringView& path, Textu
// Load image data
if (type == ImageType::Internal)
{
if (!options.InternalLoad.IsBinded() || options.InternalLoad(textureData))
return true;
if (options.FlipY)
{
// TODO: impl this
errorMsg = TEXT("Flipping images imported from Internal source is not supported by stb.");
return true;
}
MISSING_CODE("Importing internal textures with STB.");
return true;
}
else
{
@@ -684,6 +685,7 @@ bool TextureTool::ResizeStb(PixelFormat format, TextureMipData& dstMip, const Te
auto components = PixelFormatExtensions::ComputeComponentsCount(format);
auto srcMipWidth = srcMip.RowPitch / formatSize;
auto srcMipHeight = srcMip.DepthPitch / srcMip.RowPitch;
auto sampler = GetSampler(format);
// Allocate memory
dstMip.RowPitch = dstMipWidth * formatSize;
@@ -742,6 +744,20 @@ bool TextureTool::ResizeStb(PixelFormat format, TextureMipData& dstMip, const Te
break;
}
default:
if (sampler)
{
const Int2 srcSize(srcMipWidth, srcMipHeight);
for (int32 y = 0; y < dstMipHeight; y++)
{
for (int32 x = 0; x < dstMipWidth; x++)
{
const Vector2 uv((float)x / dstMipWidth, (float)y / dstMipHeight);
Color color = SamplePoint(sampler, uv, srcMip.Data.Get(), srcSize, srcMip.RowPitch);
Store(sampler, x, y, dstMip.Data.Get(), dstMip.RowPitch, color);
}
}
return false;
}
LOG(Warning, "Cannot resize image. Unsupported format {0}", static_cast<int32>(format));
return true;
}