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

Another compilation fix

Browse Source
This commit is contained in:
Wojtek Figat
2025-01-14 23:26:26 +01:00
parent be8686bbb2
commit d0a6edbb2c
5 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Engine/Platform/Linux/LinuxWindow.cpp
View File

@@ -14,10 +14,8 @@
#include "Engine/Core/Collections/Dictionary.h"
#include "Engine/Utilities/StringConverter.h"
#include "Engine/Graphics/RenderTask.h"
#include "Engine/Graphics/PixelFormatSampler.h"
#include "Engine/Graphics/Textures/TextureData.h"
// hack using TextureTool in Platform module -> TODO: move texture data sampling to texture data itself
#define COMPILE_WITH_TEXTURE_TOOL 1
#include "Engine/Tools/TextureTool/TextureTool.h"
#include "IncludeX11.h"
// ICCCM
@@ -888,13 +886,13 @@ void LinuxWindow::SetIcon(TextureData& icon)
const auto mipData = mip.Data.Get<Color32>();
const auto iconData = icon.GetData(0, 0);
const Int2 iconSize(icon.Width, icon.Height);
const auto sampler = TextureTool::GetSampler(icon.Format);
const auto sampler = PixelFormatSampler::GetSampler(icon.Format);
for (int32 y = 0; y < icon.Height; y++)
{
for (int32 x = 0; x < icon.Width; x++)
{
const Float2 uv((float)x / icon.Width, (float)y / icon.Height);
Color color = TextureTool::SampleLinear(sampler, uv, iconData->Data.Get(), iconSize, iconData->RowPitch);
Color color = sampler->SampleLinear(iconData->Data.Get(), uv, iconSize, iconData->RowPitch);
*(mipData + y * icon.Width + x) = Color32(color);
}
}
@@ -932,13 +930,13 @@ void LinuxWindow::SetIcon(TextureData& icon)
const auto mipData = mip.Data.Get<Color32>();
const auto iconData = icon.GetData(0, 0);
const Int2 iconSize(icon.Width, icon.Height);
const auto sampler = TextureTool::GetSampler(img.Format);
const auto sampler = PixelFormatSampler::GetSampler(img.Format);
for (int32 y = 0; y < newHeight; y++)
{
for (int32 x = 0; x < newWidth; x++)
{
const Float2 uv((float)x / newWidth, (float)y / newHeight);
Color color = TextureTool::SampleLinear(sampler, uv, iconData->Data.Get(), iconSize, iconData->RowPitch);
Color color = sampler->SampleLinear(iconData->Data.Get(), uv, iconSize, iconData->RowPitch);
*(mipData + y * newWidth + x) = Color32(color);
}
}