diff --git a/examples/HelloAnimation/main.cpp b/examples/HelloAnimation/main.cpp index c4865da..35082ef 100644 --- a/examples/HelloAnimation/main.cpp +++ b/examples/HelloAnimation/main.cpp @@ -7,6 +7,7 @@ int main() { WindowWayland window(1280, 720, "Hello Input!"); RenderingElement element( + true, //opaque, wether the element is opague or semi-transparant 2, //bufferWidth: the width of this elements pixel buffer 1, //bufferHeight: the height of this elements pixel buffer FractionalToMapped(0.5), //anchorX: relative position where this elements x anchor (top-left) is placed to its parent x anchor diff --git a/implementations/Crafter.Graphics-RenderingElement.cpp b/implementations/Crafter.Graphics-RenderingElement.cpp index e469b9b..c05c322 100644 --- a/implementations/Crafter.Graphics-RenderingElement.cpp +++ b/implementations/Crafter.Graphics-RenderingElement.cpp @@ -31,16 +31,16 @@ import std; using namespace Crafter; -RenderingElement::RenderingElement() : Transform() { +RenderingElement::RenderingElement(bool opaque) : Transform(), opaque(opaque) { } -RenderingElement::RenderingElement(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) : Transform(anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { +RenderingElement::RenderingElement(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) : Transform(anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling), opaque(opaque) { } -RenderingElement::RenderingElement(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) { +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) { } @@ -61,16 +61,26 @@ void RenderingElement::CopyNearestNeighbour(Pixel_BU8_GU8_RU8_AU8* dst, std::uin } void RenderingElement::UpdatePosition(Window& window) { + std::uint_fast32_t oldWidth = scaled.width; + std::uint_fast32_t oldHeight = scaled.height; window.ScaleElement(*this); - bufferScaled.resize(scaled.width * scaled.height); - CopyNearestNeighbour(bufferScaled.data(), scaled.width, scaled.height); + if(oldWidth != scaled.width || oldHeight && scaled.height) { + bufferScaled.resize(scaled.width * scaled.height); + CopyNearestNeighbour(bufferScaled.data(), scaled.width, scaled.height); + } for(Transform* child : children) { child->UpdatePosition(window, *this); } } void RenderingElement::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); + CopyNearestNeighbour(bufferScaled.data(), scaled.width, scaled.height); + } bufferScaled.resize(scaled.width * scaled.height); CopyNearestNeighbour(bufferScaled.data(), scaled.width, scaled.height); for(Transform* child : children) { diff --git a/implementations/Crafter.Graphics-Window_wayland.cpp b/implementations/Crafter.Graphics-Window_wayland.cpp index 60f1871..a2ce396 100644 --- a/implementations/Crafter.Graphics-Window_wayland.cpp +++ b/implementations/Crafter.Graphics-Window_wayland.cpp @@ -178,22 +178,37 @@ void WindowWayland::RenderElement(Transform* transform) { std::uint_fast32_t src_width = element->scaled.width; std::uint_fast32_t src_height = element->scaled.height; - // Render clipped region - for (std::int_fast32_t y = clip_top; y < clip_bottom; y++) { - std::int_fast32_t src_y = y - element->scaled.y; - - for (std::int_fast32_t x = clip_left; x < clip_right; x++) { - std::int_fast32_t src_x = x - element->scaled.x; + // If element is opaque, we can simply copy pixels without blending + if (element->opaque) { + // Render clipped region + for (std::int_fast32_t y = clip_top; y < clip_bottom; y++) { + std::int_fast32_t src_y = y - element->scaled.y; - // Bounds check for source buffer - if (src_x >= 0 && src_x < static_cast(src_width) && src_y >= 0 && src_y < static_cast(src_height)) { + for (std::int_fast32_t x = clip_left; x < clip_right; x++) { + std::int_fast32_t src_x = x - element->scaled.x; - // Get pixel indices - std::uint_fast32_t dst_idx = y * width + x; - std::uint_fast32_t src_idx = src_y * src_width + src_x; + // Bounds check for source buffer + if (src_x >= 0 && src_x < static_cast(src_width) && src_y >= 0 && src_y < static_cast(src_height)) { + + // Direct copy for opaque elements (skip blending) + framebuffer[y * width + x] = src_buffer[src_y * src_width + src_x]; + } + } + } + } else { + // Render clipped region with blending for non-opaque elements + for (std::int_fast32_t y = clip_top; y < clip_bottom; y++) { + std::int_fast32_t src_y = y - element->scaled.y; + + for (std::int_fast32_t x = clip_left; x < clip_right; x++) { + std::int_fast32_t src_x = x - element->scaled.x; - // Blend pixels - blend_pixel_optimized(framebuffer[dst_idx], src_buffer[src_idx]); + // Bounds check for source buffer + if (src_x >= 0 && src_x < static_cast(src_width) && src_y >= 0 && src_y < static_cast(src_height)) { + + // Blend pixels + blend_pixel_optimized(framebuffer[y * width + x], src_buffer[src_y * src_width + src_x]); + } } } } diff --git a/interfaces/Crafter.Graphics-Animation.cppm b/interfaces/Crafter.Graphics-Animation.cppm index b1e88ac..31d24c5 100644 --- a/interfaces/Crafter.Graphics-Animation.cppm +++ b/interfaces/Crafter.Graphics-Animation.cppm @@ -61,27 +61,12 @@ namespace Crafter { std::vector> keyframes; std::uint_fast32_t currentFrame; std::chrono::time_point startedAt; - mutable T cachedValue; // Cache the last computed value - mutable std::chrono::time_point lastTime; // Track when cached value was computed - - Animation(std::vector>&& keyframes) : keyframes(std::move(keyframes)), currentFrame(0) {} - + Animation(std::vector>&& keyframes) : keyframes(std::move(keyframes)) {} void Start(std::chrono::time_point time) { currentFrame = 0; startedAt = time; - // Invalidate cache - lastTime = std::chrono::time_point(); } - T Play(std::chrono::time_point time) { - // Check if we can reuse cached value - if (lastTime != std::chrono::time_point()) { - // Only use cached value if we haven't moved forward in time - if (time <= lastTime) { - return cachedValue; - } - } - std::chrono::duration elapsed = time - startedAt; // elapsed time since animation started std::chrono::duration accumulated(0); @@ -92,21 +77,17 @@ namespace Crafter { auto t = (elapsed - frameStartTime) / keyframes[i+1].duration.count(); currentFrame = i; - cachedValue = LerpTuple( + return LerpTuple( keyframes[i].values, keyframes[i + 1].values, t.count() ); - lastTime = time; - return cachedValue; } } // If we get here, we're past the last keyframe currentFrame = keyframes.size() - 1; - cachedValue = keyframes.back().values; - lastTime = time; - return cachedValue; + return keyframes.back().values; } }; } \ No newline at end of file diff --git a/interfaces/Crafter.Graphics-RenderingElement.cppm b/interfaces/Crafter.Graphics-RenderingElement.cppm index 4ff9cd7..3cecea3 100644 --- a/interfaces/Crafter.Graphics-RenderingElement.cppm +++ b/interfaces/Crafter.Graphics-RenderingElement.cppm @@ -31,10 +31,11 @@ export namespace Crafter { std::vector bufferScaled; std::uint_fast32_t bufferWidth; std::uint_fast32_t bufferHeight; + bool opaque = false; - RenderingElement(); - RenderingElement(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(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(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;