voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-08 12:31:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

aabb block shape WIP + common refactor

Browse source
This commit is contained in:
MihailRis 2023-11-30 14:48:38 +03:00
parent 73d87ae451
commit 0c35eeb072
21 changed files with 177 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/frontend/gui/GUI.cpp
View file

@ -12,6 +12,8 @@
#include "../../window/input.h"
#include "../../window/Camera.h"
using glm::vec2;
using glm::vec3;
using std::string;
using std::shared_ptr;
using namespace gui;

2
src/frontend/gui/controls.cpp
View file

@ -11,6 +11,8 @@ using std::string;
using std::wstring;
using std::shared_ptr;
using glm::vec2;
using glm::vec3;
using glm::vec4;
#define KEY_ESCAPE 256
#define KEY_ENTER 257

4
src/frontend/gui/panels.cpp
View file

@ -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));
}