sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics: Fix text atlas resizing

This commit is contained in:
SirLynix 2023-01-21 19:10:40 +01:00
parent 3de7297bd8
commit a1480fc2db
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.inl
View File

@ -541,7 +541,9 @@ namespace Nz
dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
break; break;
case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL:
srcAccessMask |= VK_ACCESS_TRANSFER_READ_BIT; if (oldImageLayout != VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
srcAccessMask |= VK_ACCESS_TRANSFER_READ_BIT;
dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
break; break;
case VK_IMAGE_LAYOUT_GENERAL: case VK_IMAGE_LAYOUT_GENERAL:

3
src/Nazara/Graphics/GuillotineTextureAtlas.cpp
View File

@ -41,6 +41,7 @@ namespace Nz
textureInfo.height = size.y; textureInfo.height = size.y;
textureInfo.pixelFormat = PixelFormat::A8; textureInfo.pixelFormat = PixelFormat::A8;
textureInfo.type = ImageType::E2D; textureInfo.type = ImageType::E2D;
textureInfo.usageFlags = TextureUsage::ShaderSampling | TextureUsage::TransferSource | TextureUsage::TransferDestination;
std::shared_ptr<Texture> newTexture; std::shared_ptr<Texture> newTexture;
try try
@ -58,7 +59,7 @@ namespace Nz
const Texture& oldTexture = static_cast<const Texture&>(*oldImage); const Texture& oldTexture = static_cast<const Texture&>(*oldImage);
Vector3ui oldSize = oldTexture.GetSize(); Vector3ui oldSize = oldTexture.GetSize();
if (!newTexture->Copy(oldTexture, Rectui(0, 0, oldSize.x, oldSize.y))) if (!newTexture->Copy(oldTexture, Boxui(0, 0, 0, oldSize.x, oldSize.y, oldSize.z)))
{ {
NazaraError("Failed to update texture"); NazaraError("Failed to update texture");
return nullptr; return nullptr;

29
src/Nazara/Graphics/TextSprite.cpp
View File

@ -240,10 +240,8 @@ namespace Nz
* \param oldLayer Pointer to the previous layer * \param oldLayer Pointer to the previous layer
* \param newLayer Pointer to the new layer * \param newLayer Pointer to the new layer
*/ */
void TextSprite::OnAtlasLayerChange(const AbstractAtlas* atlas, AbstractImage* oldLayer, AbstractImage* newLayer) void TextSprite::OnAtlasLayerChange([[maybe_unused]] const AbstractAtlas* atlas, AbstractImage* oldLayer, AbstractImage* newLayer)
{ {
NazaraUnused(atlas);
assert(m_atlases.find(atlas) != m_atlases.end()); assert(m_atlases.find(atlas) != m_atlases.end());
if (!oldLayer) if (!oldLayer)
@ -258,13 +256,19 @@ namespace Nz
Vector2ui oldSize(oldTexture->GetSize()); Vector2ui oldSize(oldTexture->GetSize());
Vector2ui newSize(newTexture->GetSize()); Vector2ui newSize(newTexture->GetSize());
Vector2f scale = Vector2f(oldSize) / Vector2f(newSize); // ratio of the old one to the new one Vector2f scale = Vector2f(oldSize) / Vector2f(newSize);
// It is possible we actually use that texture multiple times, check them all // Rebuild new render infos with adjusted texture
for (auto it = m_renderInfos.begin(); it != m_renderInfos.end(); ++it) decltype(m_renderInfos) newRenderInfos;
newRenderInfos.reserve(m_renderInfos.size());
for (auto&& [renderKey, indices] : m_renderInfos)
{ {
const RenderKey& renderKey = it->first; if (renderKey.texture != oldTexture)
const RenderIndices& indices = it->second; {
newRenderInfos.emplace(renderKey, indices);
continue;
}
// Adjust texture coordinates by size ratio // Adjust texture coordinates by size ratio
SparsePtr<Vector2f> texCoordPtr(&m_vertices[indices.first].uv, sizeof(VertexStruct_XY_Color_UV)); SparsePtr<Vector2f> texCoordPtr(&m_vertices[indices.first].uv, sizeof(VertexStruct_XY_Color_UV));
@ -274,10 +278,11 @@ namespace Nz
m_vertices[i * 4 + j].uv *= scale; m_vertices[i * 4 + j].uv *= scale;
} }
// Erase and re-insert with the new texture handle newRenderInfos.emplace(RenderKey{ newTexture, renderKey.renderOrder }, indices);
m_renderInfos.erase(it);
m_renderInfos.insert(std::make_pair(RenderKey{ newTexture, renderKey.renderOrder }, indices));
it = m_renderInfos.begin(); //< std::unordered_map::insert may invalidate all iterators, start from the beginning...
} }
m_renderInfos = std::move(newRenderInfos);
OnElementInvalidated(this);
} }
} }