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

Graphics/SlicedSprite: Handle corner removal + lower size

This commit is contained in:
Jérôme Leclercq 2021-12-01 10:38:53 +01:00
parent b62d5f6846
commit b256ddd06b
2 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/Nazara/Graphics/SlicedSprite.hpp
View File

@ -51,8 +51,8 @@ namespace Nz
struct Corner struct Corner
{ {
Vector2f textureCoords = Vector2f(0.125f, 0.125f); Vector2f textureCoords = Vector2f(0.15625f, 0.15625f);
Vector2f size = Vector2f(16.f, 16.f); Vector2f size = Vector2f(10.f, 10.f);
}; };
private: private:
@ -60,6 +60,7 @@ namespace Nz
std::array<VertexStruct_XYZ_Color_UV, 4 * 9> m_vertices; std::array<VertexStruct_XYZ_Color_UV, 4 * 9> m_vertices;
std::shared_ptr<Material> m_material; std::shared_ptr<Material> m_material;
std::size_t m_spriteCount;
Color m_color; Color m_color;
Corner m_topLeftCorner; Corner m_topLeftCorner;
Corner m_bottomRightCorner; Corner m_bottomRightCorner;

39
src/Nazara/Graphics/SlicedSprite.cpp
View File

@ -39,7 +39,7 @@ namespace Nz
const auto& whiteTexture = Graphics::Instance()->GetDefaultTextures().whiteTextures[UnderlyingCast(ImageType::E2D)]; const auto& whiteTexture = Graphics::Instance()->GetDefaultTextures().whiteTextures[UnderlyingCast(ImageType::E2D)];
elements.emplace_back(std::make_unique<RenderSpriteChain>(0, materialPass, renderPipeline, worldInstance, vertexDeclaration, whiteTexture, 9, m_vertices.data())); elements.emplace_back(std::make_unique<RenderSpriteChain>(0, materialPass, renderPipeline, worldInstance, vertexDeclaration, whiteTexture, m_spriteCount, m_vertices.data()));
} }
const std::shared_ptr<Material>& SlicedSprite::GetMaterial(std::size_t i) const const std::shared_ptr<Material>& SlicedSprite::GetMaterial(std::size_t i) const
@ -111,9 +111,16 @@ namespace Nz
Vector3f origin = Vector3f::Zero(); Vector3f origin = Vector3f::Zero();
Vector2f topLeftUV = m_textureCoords.GetCorner(RectCorner::LeftTop); Vector2f topLeftUV = m_textureCoords.GetCorner(RectCorner::LeftTop);
m_spriteCount = 0;
for (std::size_t y = 0; y < 3; ++y) for (std::size_t y = 0; y < 3; ++y)
{
float height = heights[y];
if (height > 0.f)
{ {
for (std::size_t x = 0; x < 3; ++x) for (std::size_t x = 0; x < 3; ++x)
{
float width = widths[x];
if (width > 0.f)
{ {
vertices->color = m_color; vertices->color = m_color;
vertices->position = origin; vertices->position = origin;
@ -121,39 +128,49 @@ namespace Nz
vertices++; vertices++;
vertices->color = m_color; vertices->color = m_color;
vertices->position = origin + widths[x] * Vector3f::Right(); vertices->position = origin + width * Vector3f::Right();
vertices->uv = topLeftUV + Vector2f(texCoordsX[x], 0.f); vertices->uv = topLeftUV + Vector2f(texCoordsX[x], 0.f);
vertices++; vertices++;
vertices->color = m_color; vertices->color = m_color;
vertices->position = origin + heights[y] * Vector3f::Up(); vertices->position = origin + height * Vector3f::Up();
vertices->uv = topLeftUV + Vector2f(0.f, texCoordsY[y]); vertices->uv = topLeftUV + Vector2f(0.f, texCoordsY[y]);
vertices++; vertices++;
vertices->color = m_color; vertices->color = m_color;
vertices->position = origin + widths[x] * Vector3f::Right() + heights[y] * Vector3f::Up(); vertices->position = origin + width * Vector3f::Right() + height * Vector3f::Up();
vertices->uv = topLeftUV + Vector2f(texCoordsX[x], texCoordsY[y]); vertices->uv = topLeftUV + Vector2f(texCoordsX[x], texCoordsY[y]);
vertices++; vertices++;
origin.x += widths[x]; origin.x += width;
m_spriteCount++;
}
topLeftUV.x += texCoordsX[x]; topLeftUV.x += texCoordsX[x];
} }
origin.y += height;
}
origin.x = 0; origin.x = 0;
origin.y += heights[y];
topLeftUV.x = m_textureCoords.x; topLeftUV.x = m_textureCoords.x;
topLeftUV.y += texCoordsY[y]; topLeftUV.y += texCoordsY[y];
} }
// Reverse texcoords Y Boxf aabb = Boxf::Zero();
for (auto& vertex : m_vertices)
vertex.uv.y = m_textureCoords.height - vertex.uv.y; std::size_t vertexCount = 4 * m_spriteCount;
if (vertexCount > 0)
{
// Reverse texcoords Y
for (std::size_t i = 0; i < vertexCount; ++i)
m_vertices[i].uv.y = m_textureCoords.height - m_vertices[i].uv.y;
Boxf aabb;
aabb.Set(m_vertices[0].position); aabb.Set(m_vertices[0].position);
for (std::size_t i = 1; i < m_vertices.size(); ++i) for (std::size_t i = 1; i < vertexCount; ++i)
aabb.ExtendTo(m_vertices[i].position); aabb.ExtendTo(m_vertices[i].position);
}
UpdateAABB(aabb); UpdateAABB(aabb);
OnElementInvalidated(this); OnElementInvalidated(this);