aabb block shape WIP + common refactor

2023-11-30 14:48:38 +03:00
parent 73d87ae451
commit 0c35eeb072
21 changed files with 177 additions and 76 deletions
@@ -171,7 +171,7 @@ void Panel::refresh() {
        }
        if (resizing_) {
            if (maxLength_)
-                this->size(vec2(size.x, min(maxLength_, (int)(y+padding.w))));
+                this->size(vec2(size.x, glm::min(maxLength_, (int)(y+padding.w))));
            else
                this->size(vec2(size.x, y+padding.w));
        }
@@ -193,7 +193,7 @@ void Panel::refresh() {
        bool increased = maxh > size.y;
        if (resizing_) {
            if (maxLength_)
-                this->size(vec2(min(maxLength_, (int)(x+padding.z)), size.y));
+                this->size(vec2(glm::min(maxLength_, (int)(x+padding.z)), size.y));
            else
                this->size(vec2(x+padding.z, size.y));
        }