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

oh yeah its rewrite time

Browse source
This commit is contained in:
Jorijn van der Graaf 2025-11-25 19:43:40 +01:00
commit 1c4f476f18
7 changed files with 183 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -135,7 +135,7 @@ void WindowWayland::StartSync() {
void RenderElement(UiElement* element, WindowWayland* window) {
void RenderElement(RenderingElement* element, WindowWayland* window) {
for (std::int_fast32_t x = element->transform.scaled.x; x - element->transform.scaled.x < element->transform.scaled.width; x++) {
for (std::int_fast32_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) {
@ -157,14 +157,14 @@ void RenderElement(UiElement* element, WindowWayland* window) {
}
}
}
std::sort(element->children.begin(), element->children.end(), [](UiElement* a, UiElement* b){ return a->transform.z < b->transform.z; });
for(UiElement* child : element->children) {
RenderElement(child, window);
std::sort(element->transform.children.begin(), element->transform.children.end(), [](Transform* a, Transform* b){ return a->z < b->z; });
for(Transform* child : element->transform.children) {
RenderElement(reinterpret_cast<RenderingElement*>(child->element), window);
}
}
void WindowWayland::Render() {
std::sort(elements.begin(), elements.end(), [](UiElement* a, UiElement* b){ return a->transform.z < b->transform.z; });
std::sort(elements.begin(), elements.end(), [](RenderingElement* a, RenderingElement* b){ return a->transform.z < b->transform.z; });
for (std::uint_fast32_t x = 0; x < width; x++) {
for (std::uint_fast32_t y = 0; y - height; y++) {
@ -172,7 +172,7 @@ void WindowWayland::Render() {
}
}
for(UiElement* element : elements) {
for(RenderingElement* element : elements) {
RenderElement(element, this);
}
@ -260,17 +260,17 @@ void WindowWayland::pointer_handle_button(void* data, wl_pointer* pointer, std::
if(state == WL_POINTER_BUTTON_STATE_PRESSED) {
window->mouseLeftHeld = true;
window->onMouseLeftClick.Invoke(window->currentMousePos);
for(UiElement* element : window->mouseElements) {
if(window->currentMousePos.x >= element->mouseTransform.scaled.x && window->currentMousePos.x <= element->mouseTransform.scaled.x+element->mouseTransform.scaled.width && window->currentMousePos.y > element->mouseTransform.scaled.y && window->currentMousePos.y < element->mouseTransform.scaled.y+element->mouseTransform.scaled.height) {
element->onMouseLeftClick.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->mouseTransform.scaled.x) / element->mouseTransform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->mouseTransform.scaled.y) / element->mouseTransform.scaled.height)});
for(MouseElement* element : window->mouseElements) {
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({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 {
window->mouseLeftHeld = false;
window->onMouseLeftRelease.Invoke(window->currentMousePos);
for(UiElement* element : window->mouseElements) {
if(window->currentMousePos.x >= element->mouseTransform.scaled.x && window->currentMousePos.x <= element->mouseTransform.scaled.x+element->mouseTransform.scaled.width && window->currentMousePos.y > element->mouseTransform.scaled.y && window->currentMousePos.y < element->mouseTransform.scaled.y+element->mouseTransform.scaled.height) {
element->onMouseLeftRelease.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->mouseTransform.scaled.x) / element->mouseTransform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->mouseTransform.scaled.y) / element->mouseTransform.scaled.height)});
for(MouseElement* element : window->mouseElements) {
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({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,17 +278,17 @@ void WindowWayland::pointer_handle_button(void* data, wl_pointer* pointer, std::
if(state == WL_POINTER_BUTTON_STATE_PRESSED) {
window->mouseRightHeld = true;
window->onMouseRightClick.Invoke(window->currentMousePos);
for(UiElement* element : window->mouseElements) {
if(window->currentMousePos.x >= element->mouseTransform.scaled.x && window->currentMousePos.x <= element->mouseTransform.scaled.x+element->mouseTransform.scaled.width && window->currentMousePos.y > element->mouseTransform.scaled.y && window->currentMousePos.y < element->mouseTransform.scaled.y+element->mouseTransform.scaled.height) {
element->onMouseRightClick.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->mouseTransform.scaled.x) / element->mouseTransform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->mouseTransform.scaled.y) / element->mouseTransform.scaled.height)});
for(MouseElement* element : window->mouseElements) {
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({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 {
window->mouseRightHeld = true;
window->onMouseRightRelease.Invoke(window->currentMousePos);
for(UiElement* element : window->mouseElements) {
if(window->currentMousePos.x >= element->mouseTransform.scaled.x && window->currentMousePos.x <= element->mouseTransform.scaled.x+element->mouseTransform.scaled.width && window->currentMousePos.y > element->mouseTransform.scaled.y && window->currentMousePos.y < element->mouseTransform.scaled.y+element->mouseTransform.scaled.height) {
element->onMouseRightRelease.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->mouseTransform.scaled.x) / element->mouseTransform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->mouseTransform.scaled.y) / element->mouseTransform.scaled.height)});
for(MouseElement* element : window->mouseElements) {
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({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)});
}
}
}
@ -302,14 +302,14 @@ void WindowWayland::PointerListenerHandleMotion(void* data, wl_pointer* wl_point
window->currentMousePos = pos;
window->mouseDelta = {window->currentMousePos.x-window->lastMousePos.x, window->currentMousePos.y-window->lastMousePos.y};
window->onMouseMove.Invoke({window->lastMousePos, window->currentMousePos, window->mouseDelta});
for(UiElement* element : window->mouseElements) {
if(window->currentMousePos.x >= element->mouseTransform.scaled.x && window->currentMousePos.x <= element->mouseTransform.scaled.x+element->mouseTransform.scaled.width && window->currentMousePos.y > element->mouseTransform.scaled.y && window->currentMousePos.y < element->mouseTransform.scaled.y+element->mouseTransform.scaled.height) {
element->onMouseMove.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->mouseTransform.scaled.x) / element->mouseTransform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->mouseTransform.scaled.y) / element->mouseTransform.scaled.height)});
if(!(window->lastMousePos.x >= element->mouseTransform.scaled.x && window->lastMousePos.x <= element->mouseTransform.scaled.x+element->mouseTransform.scaled.width && window->lastMousePos.y > element->mouseTransform.scaled.y && window->lastMousePos.y < element->mouseTransform.scaled.y+element->mouseTransform.scaled.height)) {
element->onMouseEnter.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->mouseTransform.scaled.x) / element->mouseTransform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->mouseTransform.scaled.y) / element->mouseTransform.scaled.height)});
for(MouseElement* element : window->mouseElements) {
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({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->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({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->mouseTransform.scaled.x && window->lastMousePos.x <= element->mouseTransform.scaled.x+element->mouseTransform.scaled.width && window->lastMousePos.y > element->mouseTransform.scaled.y && window->lastMousePos.y < element->mouseTransform.scaled.y+element->mouseTransform.scaled.height) {
element->onMouseLeave.Invoke({FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.x - element->mouseTransform.scaled.x) / element->mouseTransform.scaled.width), FractionalToMappedBoundless(static_cast<double>(window->currentMousePos.y - element->mouseTransform.scaled.y) / element->mouseTransform.scaled.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({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)});
}
}
}