diff --git a/implementations/Crafter.Graphics-ImageElement.cpp b/implementations/Crafter.Graphics-ImageElement.cpp index ea1629c..32c5cf1 100644 --- a/implementations/Crafter.Graphics-ImageElement.cpp +++ b/implementations/Crafter.Graphics-ImageElement.cpp @@ -30,11 +30,11 @@ import std; using namespace Crafter; -ImageElement::ImageElement() : RenderingElement() { +ImageElement::ImageElement() : RenderingElementScaling() { } -ImageElement::ImageElement(const std::string_view imagePath, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : RenderingElement(false, anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { +ImageElement::ImageElement(const std::string_view imagePath, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : RenderingElementScaling(false, anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { RenderImage(imagePath); } diff --git a/implementations/Crafter.Graphics-RenderingElement.cpp b/implementations/Crafter.Graphics-RenderingElement.cpp index 238a8fc..7ecc90a 100644 --- a/implementations/Crafter.Graphics-RenderingElement.cpp +++ b/implementations/Crafter.Graphics-RenderingElement.cpp @@ -36,17 +36,63 @@ RenderingElement::RenderingElement(bool opaque, std::int_fast32_t anchorX, std:: } -RenderingElement::RenderingElement(bool opaque, std::uint_fast32_t bufferWidth, std::uint_fast32_t bufferHeight, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : bufferWidth(bufferWidth), bufferHeight(bufferHeight), buffer(bufferWidth*bufferHeight), Transform(anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling), opaque(opaque) { +RenderingElementPreScaled::RenderingElementPreScaled(bool opaque) : RenderingElement(opaque) { } -void RenderingElement::ResizeBuffer(std::uint_fast32_t width, std::uint_fast32_t height) { - this->bufferWidth = width; - this->bufferHeight = height; - buffer.resize(width * height); +RenderingElementPreScaled::RenderingElementPreScaled(bool opaque, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : RenderingElement(opaque, anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { + } -void RenderingElement::CopyNearestNeighbour(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const { +RenderingElementScaling::RenderingElementScaling(bool opaque) : RenderingElement(opaque) { + +} + +RenderingElementScaling::RenderingElementScaling(bool opaque, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : RenderingElement(opaque, anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { + +} + +RenderingElementScaling::RenderingElementScaling(bool opaque, std::uint_fast32_t bufferWidth, std::uint_fast32_t bufferHeight, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : bufferWidth(bufferWidth), bufferHeight(bufferHeight), buffer(bufferWidth*bufferHeight), RenderingElement(opaque, anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { + +} + + + +void RenderingElementPreScaled::UpdatePosition(Window& window) { + std::uint_fast32_t oldWidth = scaled.width; + std::uint_fast32_t oldHeight = scaled.height; + window.ScaleElement(*this); + if(oldWidth != scaled.width || oldHeight && scaled.height) { + bufferScaled.resize(scaled.width * scaled.height); + } + for(Transform* child : children) { + child->UpdatePosition(window, *this); + } +} + +void RenderingElementPreScaled::UpdatePosition(Window& window, Transform& parent) { + std::uint_fast32_t oldWidth = scaled.width; + std::uint_fast32_t oldHeight = scaled.height; + window.ScaleElement(*this, parent); + if(oldWidth != scaled.width || oldHeight && scaled.height) { + bufferScaled.resize(scaled.width * scaled.height); + } + for(Transform* child : children) { + child->UpdatePosition(window, *this); + } +} + +void RenderingElementPreScaled::CopyNearestNeighbour(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const { + for (std::uint_fast32_t y = 0; y < dstHeight; y++) { + std::uint_fast32_t srcY = y * scaled.height / dstHeight; + for (std::uint_fast32_t x = 0; x < dstWidth; x++) { + std::uint_fast32_t srcX = x * scaled.width / dstWidth; + dst[y * dstWidth + x] = bufferScaled[srcY * scaled.width + srcX]; + } + } +} + +void RenderingElementScaling::CopyNearestNeighbour(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const { for (std::uint_fast32_t y = 0; y < dstHeight; y++) { std::uint_fast32_t srcY = y * bufferHeight / dstHeight; for (std::uint_fast32_t x = 0; x < dstWidth; x++) { @@ -56,7 +102,7 @@ void RenderingElement::CopyNearestNeighbour(Pixel_BU8_GU8_RU8_AU8* dst, std::uin } } -void RenderingElement::UpdatePosition(Window& window) { +void RenderingElementScaling::UpdatePosition(Window& window) { std::uint_fast32_t oldWidth = scaled.width; std::uint_fast32_t oldHeight = scaled.height; window.ScaleElement(*this); @@ -69,7 +115,7 @@ void RenderingElement::UpdatePosition(Window& window) { } } -void RenderingElement::UpdatePosition(Window& window, Transform& parent) { +void RenderingElementScaling::UpdatePosition(Window& window, Transform& parent) { std::uint_fast32_t oldWidth = scaled.width; std::uint_fast32_t oldHeight = scaled.height; window.ScaleElement(*this, parent); @@ -77,9 +123,13 @@ void RenderingElement::UpdatePosition(Window& window, Transform& parent) { bufferScaled.resize(scaled.width * scaled.height); CopyNearestNeighbour(bufferScaled.data(), scaled.width, scaled.height); } - bufferScaled.resize(scaled.width * scaled.height); - CopyNearestNeighbour(bufferScaled.data(), scaled.width, scaled.height); for(Transform* child : children) { child->UpdatePosition(window, *this); } -} \ No newline at end of file +} + +void RenderingElementScaling::ResizeBuffer(std::uint_fast32_t width, std::uint_fast32_t height) { + this->bufferWidth = width; + this->bufferHeight = height; + buffer.resize(width * height); +} diff --git a/implementations/Crafter.Graphics-TextElement.cpp b/implementations/Crafter.Graphics-TextElement.cpp index ea7e4de..b4f8125 100644 --- a/implementations/Crafter.Graphics-TextElement.cpp +++ b/implementations/Crafter.Graphics-TextElement.cpp @@ -30,57 +30,69 @@ import std; using namespace Crafter; -TextElement::TextElement() : RenderingElement() { +TextElement::TextElement(std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : RenderingElementPreScaled(false, anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { } -TextElement::TextElement(const std::string_view text, float size, Pixel_BU8_GU8_RU8_AU8 pixel, Font& font, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : RenderingElement(false, anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { - RenderText(text, size, pixel, font); -} - void TextElement::RenderText(const std::string_view text, float size, Pixel_BU8_GU8_RU8_AU8 color, Font& font) { - buffer.clear(); - + // Calculate the actual size needed for the text float scale = stbtt_ScaleForPixelHeight(&font.font, size); - int baseline = (int)(font.ascent * scale); - std::uint_fast32_t bufferWidth = 0; + std::uint_fast32_t textWidth = 0; for (const char c : text) { int advance, lsb; stbtt_GetCodepointHMetrics(&font.font, c, &advance, &lsb); - bufferWidth += (int)(advance * scale); + textWidth += (int)(advance * scale); + } + + // Clear the scaled buffer + for (auto& pixel : bufferScaled) { + pixel = {0, 0, 0, 0}; } - ResizeBuffer(bufferWidth, (font.ascent - font.descent) * scale); + // Only render text if we have space + if (textWidth <= scaled.width && (font.ascent - font.descent) * scale <= scaled.height) { + // Calculate starting position to center text horizontally and vertically + int startX = (scaled.width - textWidth) / 2; + int startY = ( scaled.height - (font.ascent - font.descent) * scale) / 2; + startY += baseline; // Adjust for baseline + + int x = startX; + for (std::uint_fast32_t i = 0; i < text.size(); i++) { + int codepoint = text[i]; - int x = 0; - for (std::uint_fast32_t i = 0; i < text.size(); i++) { - int codepoint = text[i]; + int ax; + int lsb; + stbtt_GetCodepointHMetrics(&font.font, codepoint, &ax, &lsb); - int ax; - int lsb; - stbtt_GetCodepointHMetrics(&font.font, codepoint, &ax, &lsb); + int c_x1, c_y1, c_x2, c_y2; + stbtt_GetCodepointBitmapBox(&font.font, codepoint, scale, scale, &c_x1, &c_y1, &c_x2, &c_y2); - int c_x1, c_y1, c_x2, c_y2; - stbtt_GetCodepointBitmapBox(&font.font, codepoint, scale, scale, &c_x1, &c_y1, &c_x2, &c_y2); + int w = c_x2 - c_x1; + int h = c_y2 - c_y1; - int w = c_x2 - c_x1; - int h = c_y2 - c_y1; + std::vector bitmap(w * h); + stbtt_MakeCodepointBitmap(&font.font, bitmap.data(), w, h, w, scale, scale, codepoint); - std::vector bitmap(w * h); - stbtt_MakeCodepointBitmap(&font.font, bitmap.data(), w, h, w, scale, scale, codepoint); - - for (int j = 0; j < h; j++) { - for (int i = 0; i < w; i++) { - buffer[(baseline + j + c_y1) * bufferWidth + (x + i + c_x1)] = {color.r, color.g, color.b, bitmap[j * w + i]}; + // Only render characters that fit within the scaled bounds + for (int j = 0; j < h; j++) { + for (int i = 0; i < w; i++) { + int bufferX = x + i + c_x1; + int bufferY = startY + j + c_y1; + + // Only draw pixels that are within our scaled buffer bounds + if (bufferX >= 0 && bufferX < (int)scaled.width && bufferY >= 0 && bufferY < (int) scaled.height) { + bufferScaled[bufferY * scaled.width + bufferX] = {color.r, color.g, color.b, bitmap[j * w + i]}; + } + } } - } - x += (int)(ax * scale); + x += (int)(ax * scale); - if (i + 1 < text.size()) { - x += (int)stbtt_GetCodepointKernAdvance(&font.font, codepoint, text[i+1] * scale); + if (i + 1 < text.size()) { + x += (int)stbtt_GetCodepointKernAdvance(&font.font, codepoint, text[i+1] * scale); + } } } } \ No newline at end of file diff --git a/interfaces/Crafter.Graphics-ImageElement.cppm b/interfaces/Crafter.Graphics-ImageElement.cppm index 943ca87..6ce51d9 100644 --- a/interfaces/Crafter.Graphics-ImageElement.cppm +++ b/interfaces/Crafter.Graphics-ImageElement.cppm @@ -23,7 +23,7 @@ import :RenderingElement; import :Types; export namespace Crafter { - class ImageElement : public RenderingElement { + class ImageElement : public RenderingElementScaling { public: ImageElement(); ImageElement(const std::string_view imagePath, std::int_fast32_t anchorX = FractionalToMapped(0.5), std::int_fast32_t anchorY = FractionalToMapped(0.5), std::uint_fast32_t relativeWidth = FractionalToMapped(1), std::uint_fast32_t relativeHeight = FractionalToMapped(1), std::int_fast32_t anchorOffsetX = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false); diff --git a/interfaces/Crafter.Graphics-RenderingElement.cppm b/interfaces/Crafter.Graphics-RenderingElement.cppm index 3cecea3..37f163f 100644 --- a/interfaces/Crafter.Graphics-RenderingElement.cppm +++ b/interfaces/Crafter.Graphics-RenderingElement.cppm @@ -24,20 +24,41 @@ import :Types; export namespace Crafter { class Window; - class Font; class RenderingElement : public Transform { public: - std::vector buffer; std::vector bufferScaled; - std::uint_fast32_t bufferWidth; - std::uint_fast32_t bufferHeight; bool opaque = false; RenderingElement(bool opague = false); RenderingElement(bool opague, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling); - RenderingElement(bool opague, std::uint_fast32_t bufferWidth, std::uint_fast32_t bufferHeight, std::int_fast32_t anchorX = FractionalToMapped(0.5), std::int_fast32_t anchorY = FractionalToMapped(0.5), std::uint_fast32_t relativeWidth = FractionalToMapped(1), std::uint_fast32_t relativeHeight = FractionalToMapped(1), std::int_fast32_t anchorOffsetX = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false); RenderingElement(RenderingElement&) = delete; RenderingElement& operator=(RenderingElement&) = delete; + }; + + class RenderingElementPreScaled : public RenderingElement { + public: + RenderingElementPreScaled(bool opague = false); + RenderingElementPreScaled(bool opague, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling); + RenderingElementPreScaled(RenderingElementPreScaled&) = delete; + RenderingElementPreScaled& operator=(RenderingElementPreScaled&) = delete; + + void CopyNearestNeighbour(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const; + void UpdatePosition(Window& window) override; + void UpdatePosition(Window& window, Transform& parent) override; + }; + + class RenderingElementScaling: public RenderingElement { + public: + std::vector buffer; + std::uint_fast32_t bufferWidth; + std::uint_fast32_t bufferHeight; + bool opaque = false; + + RenderingElementScaling(bool opague = false); + RenderingElementScaling(bool opague, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling); + RenderingElementScaling(bool opague, std::uint_fast32_t bufferWidth, std::uint_fast32_t bufferHeight, std::int_fast32_t anchorX = FractionalToMapped(0.5), std::int_fast32_t anchorY = FractionalToMapped(0.5), std::uint_fast32_t relativeWidth = FractionalToMapped(1), std::uint_fast32_t relativeHeight = FractionalToMapped(1), std::int_fast32_t anchorOffsetX = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false); + RenderingElementScaling(RenderingElementScaling&) = delete; + RenderingElementScaling& operator=(RenderingElementScaling&) = delete; void ResizeBuffer(std::uint_fast32_t width, std::uint_fast32_t height); void CopyNearestNeighbour(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const; diff --git a/interfaces/Crafter.Graphics-TextElement.cppm b/interfaces/Crafter.Graphics-TextElement.cppm index 7311e62..c94f9a9 100644 --- a/interfaces/Crafter.Graphics-TextElement.cppm +++ b/interfaces/Crafter.Graphics-TextElement.cppm @@ -24,11 +24,9 @@ import :Types; import :Font; export namespace Crafter { - class TextElement : public RenderingElement { + class TextElement : public RenderingElementPreScaled { public: - TextElement(); - TextElement(const std::string_view text, float size, Pixel_BU8_GU8_RU8_AU8 pixel, Font& font, std::int_fast32_t anchorX = FractionalToMapped(0.5), std::int_fast32_t anchorY = FractionalToMapped(0.5), std::uint_fast32_t relativeWidth = FractionalToMapped(1), std::uint_fast32_t relativeHeight = FractionalToMapped(1), std::int_fast32_t anchorOffsetX = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false); - + TextElement(std::int_fast32_t anchorX = FractionalToMapped(0.5), std::int_fast32_t anchorY = FractionalToMapped(0.5), std::uint_fast32_t relativeWidth = FractionalToMapped(1), std::uint_fast32_t relativeHeight = FractionalToMapped(1), std::int_fast32_t anchorOffsetX = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false); void RenderText(const std::string_view text, float size, Pixel_BU8_GU8_RU8_AU8 pixel, Font& font); }; } \ No newline at end of file