Catcrafts/Crafter.Graphics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayland rewrite complete

Browse source
This commit is contained in:
Jorijn van der Graaf 2025-11-24 01:47:49 +01:00
commit 721ff8f42f
8 changed files with 134 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/HelloInput/main.cpp
View file

@ -9,8 +9,8 @@ int main() {
// Listen for left mouse click events on the window // Listen for left mouse click events on the window
// The callback receives the MousePoint struct containing the click coordinates in float pixels from the top left corner // The callback receives the MousePoint struct containing the click coordinates in float pixels from the top left corner
EventListener<MousePoint> clickListener(&window.onMouseLeftClick, [&window](MousePoint point){ EventListener<MousePoint> clickListener(&window.onMouseLeftClick, [&window](MousePoint point){
// Print the coordinates where the user clicked // Print the coordinates where the user clicked, we recieve the point in mapped space so we must convert it to pixels first
std::cout << std::format("Clicked on X:{} Y:{}!", MappedToPixel(point.x, window.width), MappedToPixel(point.y, window.height)) << std::endl; std::cout << std::format("Clicked on X:{} Y:{}!", MappedToPixelBoundless(point.x, window.width), MappedToPixelBoundless(point.y, window.height)) << std::endl;
}); });
// Listen specifically for the 'a' key being pressed down // Listen specifically for the 'a' key being pressed down

15
examples/HelloUI/main.cpp
View file

@ -20,14 +20,25 @@ int main() {
); );
window.elements.push_back(element); window.elements.push_back(element);
window.mouseElements.push_back(element);
element->UpdatePosition(window); element->UpdatePosition(window);
window.ScaleMouse(element->UiElementMouse::transform, element->UiElement::transform);
EventListener<MousePoint> clickListener(&element.onMouseLeftClick, [](MousePoint point){ EventListener<MousePoint> clickListener(&element->onMouseLeftClick, [element, &window](MousePoint point){
// Print the coordinates where the user clicked relative to the element's top left corner. // Print the coordinates where the user clicked relative to the element's top left corner.
std::cout << std::format("Clicked on X:{} Y:{}!", point.x, point.y) << std::endl;
//Mapped space
std::cout << std::format("Clicked on Mapped X:{} Y:{}!", point.x, point.y) << std::endl;
// Fraction space
std::cout << std::format("Clicked on Fraction X:{} Y:{}!", MappedToFractionalBoundless(point.x), MappedToFractionalBoundless(point.y)) << std::endl;
// Screen space
std::cout << std::format("Clicked on Screen X:{} Y:{}!\n", MappedToPixelBoundless(point.x, MappedToPixelBoundless(element->UiElementMouse::transform.scaled.width, window.width)), MappedToPixelBoundless(element->UiElementMouse::transform.scaled.height, window.height)) << std::endl;
}); });
element->buffer = {{255, 0, 0 ,255}, {0, 255, 0 ,255}}; element->buffer = {{255, 0, 0 ,255}, {0, 255, 0 ,255}};
window.Render(); window.Render();
window.StartSync(); window.StartSync();

40
implementations/Crafter.Graphics-UiElement.cpp
View file

@ -26,7 +26,15 @@ import std;
using namespace Crafter; using namespace Crafter;
UiElement::UiElement(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) : anchorX(anchorX), anchorY(anchorY), relativeWidth(relativeWidth), relativeHeight(relativeHeight), anchorOffsetX(anchorOffsetX), anchorOffsetY(anchorOffsetY), z(z), ignoreScaling(ignoreScaling) { Transform::Transform(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) : anchorX(anchorX), anchorY(anchorY), relativeWidth(relativeWidth), relativeHeight(relativeHeight), anchorOffsetX(anchorOffsetX), anchorOffsetY(anchorOffsetY), z(z), ignoreScaling(ignoreScaling) {
}
UiElement::UiElement(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) {
}
UiElementMouse::UiElementMouse(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) {
} }
@ -34,22 +42,16 @@ UiElementBuffer::UiElementBuffer(std::uint_fast32_t width, std::uint_fast32_t he
} }
// void UiElement::UpdatePosition(Window& window) { void UiElement::UpdatePosition(WindowFramebuffer& window) {
// // scaled.width = relativeWidth; window.ScaleElement(transform);
// // scaled.height = relativeHeight; for(UiElement* child : children) {
// // scaled.x = anchorX - (anchorOffsetX * scaled.width); UpdatePosition(window, *child);
// // scaled.y = anchorY - (anchorOffsetY * scaled.height); }
// // for(UiElement* child : children) { }
// // UpdatePosition(*child);
// // }
// }
// void UiElement::UpdatePosition(UiElement& parent) { void UiElement::UpdatePosition(WindowFramebuffer& window, UiElement& parent) {
// // scaled.width = parent.scaled.width / relativeWidth; window.ScaleElement(transform, parent.transform);
// // scaled.height = parent.scaled.height / relativeHeight; for(UiElement* child : children) {
// // scaled.x = (parent.scaled.width / anchorX) - (anchorOffsetX * scaled.width); UpdatePosition(window, *child);
// // scaled.y = (parent.scaled.height / anchorY) - (anchorOffsetY * scaled.height); }
// // for(UiElement* child : children) { }
// // UpdatePosition(*child);
// // }
// }

4
implementations/Crafter.Graphics-UiElementBufferMouseBuffer.cpp
View file

@ -24,10 +24,10 @@ import std;
using namespace Crafter; using namespace Crafter;
UiElementBufferMouseBuffer::UiElementBufferMouseBuffer(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) : UiElementBufferBuffer(anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { UiElementBufferMouseBuffer::UiElementBufferMouseBuffer(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) : UiElementBufferBuffer(anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling), UiElementMouse() {
} }
UiElementBufferMouseBuffer::UiElementBufferMouseBuffer(std::uint_fast32_t width, std::uint_fast32_t height, 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) : UiElementBufferBuffer(width, height, anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { UiElementBufferMouseBuffer::UiElementBufferMouseBuffer(std::uint_fast32_t width, std::uint_fast32_t height, 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) : UiElementBufferBuffer(width, height, anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling), UiElementMouse() {
} }

92
implementations/Crafter.Graphics-Window_wayland.cpp
View file

@ -51,6 +51,30 @@ WindowFramebuffer::WindowFramebuffer(std::uint_fast32_t width, std::uint_fast32
} }
void WindowFramebuffer::ScaleElement(Transform& element) {
element.scaled.width = MappedToPixel(element.relativeWidth, width);
element.scaled.height = MappedToPixel(element.relativeHeight, height);
element.scaled.x = MappedToPixel(element.anchorX, width) - MappedToPixel(element.anchorOffsetX, element.scaled.width);
element.scaled.y = MappedToPixel(element.anchorY, height) - MappedToPixel(element.anchorOffsetY, element.scaled.height);
}
void WindowFramebuffer::ScaleElement(Transform& element, Transform& parent) {
element.scaled.width = MappedToPixel(element.relativeWidth, parent.scaled.width);
element.scaled.height = MappedToPixel(element.relativeHeight, parent.scaled.height);
element.scaled.x = MappedToPixel(element.anchorX, parent.scaled.width) - MappedToPixel(element.anchorOffsetX, element.scaled.width) + parent.scaled.x;
element.scaled.y = MappedToPixel(element.anchorY, parent.scaled.height) - MappedToPixel(element.anchorOffsetY, element.scaled.height) + parent.scaled.y;
}
void WindowFramebuffer::ScaleMouse(Transform& element, Transform& parent) {
std::int_fast32_t boundlessWidth = PixelToMappedBoundless(parent.scaled.width, width);
std::int_fast32_t boundlessHeight = PixelToMappedBoundless(parent.scaled.height, height);
element.scaled.width = BoundToBoundless(MappedToPixel(element.relativeWidth, PixelToMapped(parent.scaled.width, width)));
element.scaled.height = BoundToBoundless(MappedToPixel(element.relativeHeight, PixelToMapped(parent.scaled.height, height)));
element.scaled.x = MappedToPixelBoundless(element.anchorX, boundlessWidth) - MappedToPixelBoundless(element.anchorOffsetX, element.scaled.width) + PixelToMappedBoundless(parent.scaled.x, width);
element.scaled.y = MappedToPixelBoundless(element.anchorY, boundlessHeight) - MappedToPixelBoundless(element.anchorOffsetY, element.scaled.height) + PixelToMappedBoundless(parent.scaled.y, height);
}
WindowWayland::WindowWayland(std::uint_fast32_t width, std::uint_fast32_t height) : WindowFramebuffer(width, height) { WindowWayland::WindowWayland(std::uint_fast32_t width, std::uint_fast32_t height) : WindowFramebuffer(width, height) {
display = wl_display_connect(NULL); display = wl_display_connect(NULL);
if (display == NULL) { if (display == NULL) {
@ -135,15 +159,15 @@ void WindowWayland::StartSync() {
void RenderElement(UiElementBufferBuffer* element, ScaleData data , WindowWayland* window) { void RenderElement(UiElementBufferBuffer* element, WindowWayland* window) {
std::vector<Pixel_BU8_GU8_RU8_AU8> scaled(data.width*data.height); std::vector<Pixel_BU8_GU8_RU8_AU8> scaled(element->transform.scaled.width*element->transform.scaled.height);
element->CopyNearestNeighbour(scaled.data(), data.width, data.height); element->CopyNearestNeighbour(scaled.data(), element->transform.scaled.width, element->transform.scaled.height);
for (std::int32_t x = data.x; x - data.x < data.width; x++) { for (std::int32_t x = element->transform.scaled.x; x - element->transform.scaled.x < element->transform.scaled.width; x++) {
for (std::int32_t y = data.y; y - data.y < data.height; y++) { for (std::int32_t y = element->transform.scaled.y; y - element->transform.scaled.y < element->transform.scaled.height; y++) {
if (x >= 0 && x < window->width && y >= 0 && y < window->height) { if (x >= 0 && x < window->width && y >= 0 && y < window->height) {
Pixel_BU8_GU8_RU8_AU8& dst = window->framebuffer[y * window->width + x]; Pixel_BU8_GU8_RU8_AU8& dst = window->framebuffer[y * window->width + x];
const Pixel_BU8_GU8_RU8_AU8& src = scaled[(y - data.y) * data.width + (x - data.x)]; const Pixel_BU8_GU8_RU8_AU8& src = scaled[(y - element->transform.scaled.y) * element->transform.scaled.width + (x - element->transform.scaled.x)];
float srcA = src.a / 255.0f; float srcA = src.a / 255.0f;
float dstA = dst.a / 255.0f; float dstA = dst.a / 255.0f;
@ -158,35 +182,17 @@ void RenderElement(UiElementBufferBuffer* element, ScaleData data , WindowWaylan
} }
} }
} }
std::sort(element->children.begin(), element->children.end(), [](UiElement* a, UiElement* b){ return a->z < b->z; }); std::sort(element->children.begin(), element->children.end(), [](UiElement* a, UiElement* b){ return a->transform.z < b->transform.z; });
for(UiElement* child : element->children) { for(UiElement* child : element->children) {
std::int32_t scaledWidth = MappedToPixel(element->relativeWidth, data.width); RenderElement(element, window);
std::int32_t scaledHeight = MappedToPixel(element->relativeHeight, data.height);
std::int32_t scaledX = MappedToPixel(element->anchorX, data.width) - MappedToPixel(element->anchorOffsetX, scaledWidth) - data.x;
std::int32_t scaledY = MappedToPixel(element->anchorY, data.height) - MappedToPixel(element->anchorOffsetY, scaledHeight) - data.y;
RenderElement(element, {
scaledX,
scaledY,
scaledWidth,
scaledHeight
}, window);
} }
} }
void WindowWayland::Render() { void WindowWayland::Render() {
std::sort(elements.begin(), elements.end(), [](UiElementBufferBuffer* a, UiElementBufferBuffer* b){ return a->z < b->z; }); std::sort(elements.begin(), elements.end(), [](UiElementBufferBuffer* a, UiElementBufferBuffer* b){ return a->transform.z < b->transform.z; });
for(UiElementBufferBuffer* element : elements) { for(UiElementBufferBuffer* element : elements) {
std::int32_t scaledWidth = MappedToPixel(element->relativeWidth, width); RenderElement(element, this);
std::int32_t scaledHeight = MappedToPixel(element->relativeHeight, height);
std::int32_t scaledX = MappedToPixel(element->anchorX, width) - MappedToPixel(element->anchorOffsetX, scaledWidth);
std::int32_t scaledY = MappedToPixel(element->anchorY, height) - MappedToPixel(element->anchorOffsetY, scaledHeight);
RenderElement(element, {
scaledX,
scaledY,
scaledWidth,
scaledHeight
}, this);
} }
wl_surface_attach(surface, buffer, 0, 0); wl_surface_attach(surface, buffer, 0, 0);
@ -260,16 +266,16 @@ void WindowWayland::pointer_handle_button(void* data, wl_pointer* pointer, std::
window->mouseLeftHeld = true; window->mouseLeftHeld = true;
window->onMouseLeftClick.Invoke(window->currentMousePos); window->onMouseLeftClick.Invoke(window->currentMousePos);
for(UiElementMouse* element : window->mouseElements) { for(UiElementMouse* element : window->mouseElements) {
if(window->currentMousePos.x >= element->clickArea.x && window->currentMousePos.x <= element->clickArea.x+element->clickArea.width && window->currentMousePos.y > element->clickArea.y && window->currentMousePos.y < element->clickArea.y+element->clickArea.height) { if(window->currentMousePos.x >= element->transform.scaled.x && window->currentMousePos.x <= element->transform.scaled.x+element->transform.scaled.width && window->currentMousePos.y > element->transform.scaled.y && window->currentMousePos.y < element->transform.scaled.y+element->transform.scaled.height) {
element->onMouseLeftClick.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); element->onMouseLeftClick.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->transform.scaled.x) / element->transform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->transform.scaled.y) / element->transform.scaled.height)});
} }
} }
} else { } else {
window->mouseLeftHeld = false; window->mouseLeftHeld = false;
window->onMouseLeftRelease.Invoke(window->currentMousePos); window->onMouseLeftRelease.Invoke(window->currentMousePos);
for(UiElementMouse* element : window->mouseElements) { for(UiElementMouse* element : window->mouseElements) {
if(window->currentMousePos.x >= element->clickArea.x && window->currentMousePos.x <= element->clickArea.x+element->clickArea.width && window->currentMousePos.y > element->clickArea.y && window->currentMousePos.y < element->clickArea.y+element->clickArea.height) { if(window->currentMousePos.x >= element->transform.scaled.x && window->currentMousePos.x <= element->transform.scaled.x+element->transform.scaled.width && window->currentMousePos.y > element->transform.scaled.y && window->currentMousePos.y < element->transform.scaled.y+element->transform.scaled.height) {
element->onMouseLeftRelease.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); element->onMouseLeftRelease.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->transform.scaled.x) / element->transform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->transform.scaled.y) / element->transform.scaled.height)});
} }
} }
} }
@ -278,16 +284,16 @@ void WindowWayland::pointer_handle_button(void* data, wl_pointer* pointer, std::
window->mouseRightHeld = true; window->mouseRightHeld = true;
window->onMouseRightClick.Invoke(window->currentMousePos); window->onMouseRightClick.Invoke(window->currentMousePos);
for(UiElementMouse* element : window->mouseElements) { for(UiElementMouse* element : window->mouseElements) {
if(window->currentMousePos.x >= element->clickArea.x && window->currentMousePos.x <= element->clickArea.x+element->clickArea.width && window->currentMousePos.y > element->clickArea.y && window->currentMousePos.y < element->clickArea.y+element->clickArea.height) { if(window->currentMousePos.x >= element->transform.scaled.x && window->currentMousePos.x <= element->transform.scaled.x+element->transform.scaled.width && window->currentMousePos.y > element->transform.scaled.y && window->currentMousePos.y < element->transform.scaled.y+element->transform.scaled.height) {
element->onMouseRightClick.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); element->onMouseRightClick.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->transform.scaled.x) / element->transform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->transform.scaled.y) / element->transform.scaled.height)});
} }
} }
} else { } else {
window->mouseRightHeld = true; window->mouseRightHeld = true;
window->onMouseRightRelease.Invoke(window->currentMousePos); window->onMouseRightRelease.Invoke(window->currentMousePos);
for(UiElementMouse* element : window->mouseElements) { for(UiElementMouse* element : window->mouseElements) {
if(window->currentMousePos.x >= element->clickArea.x && window->currentMousePos.x <= element->clickArea.x+element->clickArea.width && window->currentMousePos.y > element->clickArea.y && window->currentMousePos.y < element->clickArea.y+element->clickArea.height) { if(window->currentMousePos.x >= element->transform.scaled.x && window->currentMousePos.x <= element->transform.scaled.x+element->transform.scaled.width && window->currentMousePos.y > element->transform.scaled.y && window->currentMousePos.y < element->transform.scaled.y+element->transform.scaled.height) {
element->onMouseRightRelease.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); element->onMouseRightRelease.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->transform.scaled.x) / element->transform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->transform.scaled.y) / element->transform.scaled.height)});
} }
} }
} }
@ -296,19 +302,19 @@ void WindowWayland::pointer_handle_button(void* data, wl_pointer* pointer, std::
void WindowWayland::PointerListenerHandleMotion(void* data, wl_pointer* wl_pointer, uint time, wl_fixed_t surface_x, wl_fixed_t surface_y) { void WindowWayland::PointerListenerHandleMotion(void* data, wl_pointer* wl_pointer, uint time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
WindowWayland* window = reinterpret_cast<WindowWayland*>(data); WindowWayland* window = reinterpret_cast<WindowWayland*>(data);
MousePoint pos = {PixelToMapped(wl_fixed_to_double(surface_x), window->width), PixelToMapped(wl_fixed_to_double(surface_y), window->height)}; MousePoint pos = {FractionalToMappedBoundless(wl_fixed_to_double(surface_x) / window->width), FractionalToMappedBoundless(wl_fixed_to_double(surface_y) / window->height)};
window->lastMousePos = window->currentMousePos; window->lastMousePos = window->currentMousePos;
window->currentMousePos = pos; window->currentMousePos = pos;
window->mouseDelta = {window->currentMousePos.x-window->lastMousePos.x, window->currentMousePos.y-window->lastMousePos.y}; window->mouseDelta = {window->currentMousePos.x-window->lastMousePos.x, window->currentMousePos.y-window->lastMousePos.y};
window->onMouseMove.Invoke({window->lastMousePos, window->currentMousePos, window->mouseDelta}); window->onMouseMove.Invoke({window->lastMousePos, window->currentMousePos, window->mouseDelta});
for(UiElementMouse* element : window->mouseElements) { for(UiElementMouse* element : window->mouseElements) {
if(window->currentMousePos.x >= element->clickArea.x && window->currentMousePos.x <= element->clickArea.x+element->clickArea.width && window->currentMousePos.y > element->clickArea.y && window->currentMousePos.y < element->clickArea.y+element->clickArea.height) { if(window->currentMousePos.x >= element->transform.scaled.x && window->currentMousePos.x <= element->transform.scaled.x+element->transform.scaled.width && window->currentMousePos.y > element->transform.scaled.y && window->currentMousePos.y < element->transform.scaled.y+element->transform.scaled.height) {
element->onMouseMove.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); element->onMouseMove.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->transform.scaled.x) / element->transform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->transform.scaled.y) / element->transform.scaled.height)});
if(!(window->lastMousePos.x >= element->clickArea.x && window->lastMousePos.x <= element->clickArea.x+element->clickArea.width && window->lastMousePos.y > element->clickArea.y && window->lastMousePos.y < element->clickArea.y+element->clickArea.height)) { if(!(window->lastMousePos.x >= element->transform.scaled.x && window->lastMousePos.x <= element->transform.scaled.x+element->transform.scaled.width && window->lastMousePos.y > element->transform.scaled.y && window->lastMousePos.y < element->transform.scaled.y+element->transform.scaled.height)) {
element->onMouseEnter.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); element->onMouseEnter.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->transform.scaled.x) / element->transform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->transform.scaled.y) / element->transform.scaled.height)});
} }
} else if(window->lastMousePos.x >= element->clickArea.x && window->lastMousePos.x <= element->clickArea.x+element->clickArea.width && window->lastMousePos.y > element->clickArea.y && window->lastMousePos.y < element->clickArea.y+element->clickArea.height) { } else if(window->lastMousePos.x >= element->transform.scaled.x && window->lastMousePos.x <= element->transform.scaled.x+element->transform.scaled.width && window->lastMousePos.y > element->transform.scaled.y && window->lastMousePos.y < element->transform.scaled.y+element->transform.scaled.height) {
element->onMouseLeave.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); element->onMouseLeave.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->transform.scaled.x) / element->transform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->transform.scaled.y) / element->transform.scaled.height)});
} }
} }
} }

39
interfaces/Crafter.Graphics-Types.cppm
View file

@ -23,8 +23,8 @@ import std;
namespace Crafter { namespace Crafter {
export struct MousePoint { export struct MousePoint {
std::uint_fast32_t x; std::int_fast32_t x;
std::uint_fast32_t y; std::int_fast32_t y;
}; };
export struct MouseMoveEvent { export struct MouseMoveEvent {
@ -101,22 +101,45 @@ namespace Crafter {
export constexpr std::int_fast32_t SCALE = std::numeric_limits<std::int_fast32_t>::max() / BOUND; export constexpr std::int_fast32_t SCALE = std::numeric_limits<std::int_fast32_t>::max() / BOUND;
export constexpr double SCALEDOUBLE = static_cast<double>(std::numeric_limits<std::int_fast32_t>::max()) / BOUND; export constexpr double SCALEDOUBLE = static_cast<double>(std::numeric_limits<std::int_fast32_t>::max()) / BOUND;
export constexpr std::int_fast32_t SCALEBOUNDLESS = std::numeric_limits<std::int_fast32_t>::max();
export constexpr double SCALEDOUBLEBOUNDLESS = static_cast<double>(std::numeric_limits<std::int_fast32_t>::max());
export constexpr std::int_fast32_t FractionalToMapped(double f) { export constexpr std::int_fast32_t FractionalToMapped(double f) {
return std::int_fast32_t(f * SCALEDOUBLE); return std::int_fast32_t(f * SCALEDOUBLE);
} }
export constexpr std::int_fast32_t MappedToPixel(std::int_fast32_t mapped, std::int_fast32_t width) {
return mapped / (SCALE / width);
}
export constexpr double MappedToFractional(std::int_fast32_t mapped) { export constexpr double MappedToFractional(std::int_fast32_t mapped) {
return static_cast<double>(mapped) / SCALEDOUBLE; return static_cast<double>(mapped) / SCALEDOUBLE;
} }
export constexpr std::int_fast32_t MappedToPixel(std::int_fast32_t mapped, std::int_fast32_t width) {
return mapped / (SCALE / width);
}
export constexpr std::int_fast32_t PixelToMapped(std::int_fast32_t pixel, std::int_fast32_t width) { export constexpr std::int_fast32_t PixelToMapped(std::int_fast32_t pixel, std::int_fast32_t width) {
return pixel * (SCALE / width); return pixel * (SCALE / width);
} }
export constexpr std::int_fast32_t BoundToBoundless(std::int_fast32_t bound) {
return bound * BOUND;
}
export constexpr std::int_fast32_t FractionalToMappedBoundless(double f) {
return std::int_fast32_t(f * SCALEDOUBLEBOUNDLESS);
}
export constexpr double MappedToFractionalBoundless(std::int_fast32_t mapped) {
return static_cast<double>(mapped) / SCALEDOUBLEBOUNDLESS;
}
export constexpr std::int_fast32_t MappedToPixelBoundless(std::int_fast32_t mapped, std::int_fast32_t width) {
return mapped / (SCALEBOUNDLESS / width);
}
export constexpr std::int_fast32_t PixelToMappedBoundless(std::int_fast32_t pixel, std::int_fast32_t width) {
return pixel * (SCALEBOUNDLESS / width);
}
// export constexpr double bound = 10; // export constexpr double bound = 10;
// export constexpr std::uint_fast32_t FractionalToMapped(double fractional) { // export constexpr std::uint_fast32_t FractionalToMapped(double fractional) {
@ -166,8 +189,4 @@ namespace Crafter {
// return static_cast<std::int_fast32_t>(t * static_cast<double>(size)); // return static_cast<std::int_fast32_t>(t * static_cast<double>(size));
// } // }
export constexpr std::uint_fast32_t PixelToMapped(double pixel, std::uint_fast32_t size) {
return static_cast<std::uint_fast32_t>((pixel / size) * static_cast<double>((std::numeric_limits<std::uint_fast32_t>::max() / 10)));
}
} }

19
interfaces/Crafter.Graphics-UiElement.cppm
View file

@ -23,8 +23,7 @@ import Crafter.Event;
import :Types; import :Types;
export namespace Crafter { export namespace Crafter {
class Window; class Transform {
class UiElement {
public: public:
std::int_fast32_t z; std::int_fast32_t z;
std::int_fast32_t anchorX; std::int_fast32_t anchorX;
@ -34,19 +33,26 @@ export namespace Crafter {
std::uint_fast32_t relativeWidth; std::uint_fast32_t relativeWidth;
std::uint_fast32_t relativeHeight; std::uint_fast32_t relativeHeight;
bool ignoreScaling; bool ignoreScaling;
std::vector<UiElement*> children;
ScaleData scaled; ScaleData scaled;
Transform(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 = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false);
};
class WindowFramebuffer;
class UiElement {
public:
Transform transform;
std::vector<UiElement*> children;
UiElement(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 = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false); UiElement(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 = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false);
UiElement(UiElement&) = delete; UiElement(UiElement&) = delete;
UiElement& operator=(UiElement&) = delete; UiElement& operator=(UiElement&) = delete;
// void UpdatePosition(Window& window); void UpdatePosition(WindowFramebuffer& window);
// void UpdatePosition(UiElement& parent); void UpdatePosition(WindowFramebuffer& window, UiElement& parent);
}; };
class UiElementMouse { class UiElementMouse {
public: public:
ScaleData clickArea; Transform transform;
Event<MouseMoveEvent> onMouseMove; Event<MouseMoveEvent> onMouseMove;
Event<MouseMoveEvent> onMouseEnter; Event<MouseMoveEvent> onMouseEnter;
Event<MouseMoveEvent> onMouseLeave; Event<MouseMoveEvent> onMouseLeave;
@ -56,6 +62,7 @@ export namespace Crafter {
Event<MousePoint> onMouseLeftHold; Event<MousePoint> onMouseLeftHold;
Event<MousePoint> onMouseRightRelease; Event<MousePoint> onMouseRightRelease;
Event<MousePoint> onMouseLeftRelease; Event<MousePoint> onMouseLeftRelease;
UiElementMouse(std::int_fast32_t anchorX = FractionalToMapped(0), std::int_fast32_t anchorY = FractionalToMapped(0), std::uint_fast32_t relativeWidth = FractionalToMapped(1), std::uint_fast32_t relativeHeight = FractionalToMapped(1), std::int_fast32_t anchorOffsetX = FractionalToMapped(0), std::int_fast32_t anchorOffsetY = FractionalToMapped(0), std::int_fast32_t z = 0, bool ignoreScaling = false);
}; };
class UiElementBuffer { class UiElementBuffer {

6
interfaces/Crafter.Graphics-Window.cppm
View file

@ -59,7 +59,6 @@ export namespace Crafter {
virtual void StartSync() = 0; virtual void StartSync() = 0;
virtual void StartUpdate() = 0; virtual void StartUpdate() = 0;
virtual void StopUpdate() = 0; virtual void StopUpdate() = 0;
ScaleData ScaleElement(const UiElement& element);
}; };
class WindowKeyboard { class WindowKeyboard {
@ -99,6 +98,7 @@ export namespace Crafter {
virtual void SetTitle(const std::string_view title) = 0; virtual void SetTitle(const std::string_view title) = 0;
}; };
class Transform;
class WindowFramebuffer { class WindowFramebuffer {
public: public:
std::uint_fast32_t width; std::uint_fast32_t width;
@ -113,7 +113,9 @@ export namespace Crafter {
virtual Pixel_BU8_GU8_RU8_AU8* Get() = 0; virtual Pixel_BU8_GU8_RU8_AU8* Get() = 0;
virtual void Store() = 0; virtual void Store() = 0;
virtual void Render() = 0; virtual void Render() = 0;
ScaleData ScaleElementAbsolute(const UiElement& element); void ScaleElement(Transform& element, Transform& parent);
void ScaleElement(Transform& element);
void ScaleMouse(Transform& element, Transform& parent);
}; };
#ifdef CRAFTER_GRAPHICS_WAYLAND #ifdef CRAFTER_GRAPHICS_WAYLAND