mirror of
https://github.com/zhenyan121/Cubed.git
synced 2026-08-08 17:57:02 +08:00
feature: hud (#37)
* build: replace FetchContent with direct includes for glm * build(deps): replace SOIL2 with stb for image and vorbis decoding * build: replace FetchContent with direct includes for toml++ * refactor(texture): bump block texture size to 512 and disable items tab * feat: add hotbar system with ItemStack and RowLayout * fix(ui): restrict Ctrl key handling to typing mode * feat(ui): add widget border support and highlight selected hotbar slot * fix(ui): update borders on scale change and correct Image width - Added update_border() calls in set_scale() for Button, ChatBox, Image, Label, and TextField. - Fixed Image::width() to multiply by width instead of height. - Added early return in Widget::update_border() if border is not supported. * feat(ui): add border visual feedback on slider drag * feat(ui): add ItemSlot widget and refactor hotbar to use it * feat(world_scene): add inventory UI and pause type enum * feat(ui): add item slot tooltip and make window size static * fix(ui label): account for background offset in width/height * refactor(ui): centralize item info label in inventory and add update * feat(ui): add hotbar interaction in inventory UI * fix(inventory-ui): correct row creation logic for first item The loop starting at index 0 created a new row on the first iteration (i % 10 == 0). Shift the loop to start at 1 and adjust modulus condition to create rows correctly every 10 items. * feat(block): add name_key for localized block names Add `name_key` field to all block TOML definitions, enabling per-block localization. Update `BlockData` struct and `BlockManager` with `local_name()` method that returns a localized string via the translation system. Add corresponding entries to `en_US.json` and `zh_CN.json`. Modify inventory UI to use the localized name when displaying block info, and fix a bug where emptying a hotbar slot did not clear the item locally. * fix(ui): change inventory item slot color from white to gray * fix(ui): add missing include for std::array
This commit is contained in:
zhenyan121
354
include/glm/gtx/associated_min_max.inl
Normal file
354
include/glm/gtx/associated_min_max.inl
Normal file
@@ -0,0 +1,354 @@
|
||||
/// @ref gtx_associated_min_max
|
||||
|
||||
namespace glm{
|
||||
|
||||
// Min comparison between 2 variables
|
||||
template<typename T, typename U>
|
||||
GLM_FUNC_QUALIFIER U associatedMin(T x, U a, T y, U b)
|
||||
{
|
||||
return x < y ? a : b;
|
||||
}
|
||||
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
|
||||
(
|
||||
vec<L, T, Q> const& x, vec<L, U, Q> const& a,
|
||||
vec<L, T, Q> const& y, vec<L, U, Q> const& b
|
||||
)
|
||||
{
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
Result[i] = x[i] < y[i] ? a[i] : b[i];
|
||||
return Result;
|
||||
}
|
||||
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
|
||||
(
|
||||
T x, const vec<L, U, Q>& a,
|
||||
T y, const vec<L, U, Q>& b
|
||||
)
|
||||
{
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
Result[i] = x < y ? a[i] : b[i];
|
||||
return Result;
|
||||
}
|
||||
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
|
||||
(
|
||||
vec<L, T, Q> const& x, U a,
|
||||
vec<L, T, Q> const& y, U b
|
||||
)
|
||||
{
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
Result[i] = x[i] < y[i] ? a : b;
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Min comparison between 3 variables
|
||||
template<typename T, typename U>
|
||||
GLM_FUNC_QUALIFIER U associatedMin
|
||||
(
|
||||
T x, U a,
|
||||
T y, U b,
|
||||
T z, U c
|
||||
)
|
||||
{
|
||||
U Result = x < y ? (x < z ? a : c) : (y < z ? b : c);
|
||||
return Result;
|
||||
}
|
||||
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
|
||||
(
|
||||
vec<L, T, Q> const& x, vec<L, U, Q> const& a,
|
||||
vec<L, T, Q> const& y, vec<L, U, Q> const& b,
|
||||
vec<L, T, Q> const& z, vec<L, U, Q> const& c
|
||||
)
|
||||
{
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
Result[i] = x[i] < y[i] ? (x[i] < z[i] ? a[i] : c[i]) : (y[i] < z[i] ? b[i] : c[i]);
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Min comparison between 4 variables
|
||||
template<typename T, typename U>
|
||||
GLM_FUNC_QUALIFIER U associatedMin
|
||||
(
|
||||
T x, U a,
|
||||
T y, U b,
|
||||
T z, U c,
|
||||
T w, U d
|
||||
)
|
||||
{
|
||||
T Test1 = min(x, y);
|
||||
T Test2 = min(z, w);
|
||||
U Result1 = x < y ? a : b;
|
||||
U Result2 = z < w ? c : d;
|
||||
U Result = Test1 < Test2 ? Result1 : Result2;
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Min comparison between 4 variables
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
|
||||
(
|
||||
vec<L, T, Q> const& x, vec<L, U, Q> const& a,
|
||||
vec<L, T, Q> const& y, vec<L, U, Q> const& b,
|
||||
vec<L, T, Q> const& z, vec<L, U, Q> const& c,
|
||||
vec<L, T, Q> const& w, vec<L, U, Q> const& d
|
||||
)
|
||||
{
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
{
|
||||
T Test1 = min(x[i], y[i]);
|
||||
T Test2 = min(z[i], w[i]);
|
||||
U Result1 = x[i] < y[i] ? a[i] : b[i];
|
||||
U Result2 = z[i] < w[i] ? c[i] : d[i];
|
||||
Result[i] = Test1 < Test2 ? Result1 : Result2;
|
||||
}
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Min comparison between 4 variables
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
|
||||
(
|
||||
T x, vec<L, U, Q> const& a,
|
||||
T y, vec<L, U, Q> const& b,
|
||||
T z, vec<L, U, Q> const& c,
|
||||
T w, vec<L, U, Q> const& d
|
||||
)
|
||||
{
|
||||
T Test1 = min(x, y);
|
||||
T Test2 = min(z, w);
|
||||
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
{
|
||||
U Result1 = x < y ? a[i] : b[i];
|
||||
U Result2 = z < w ? c[i] : d[i];
|
||||
Result[i] = Test1 < Test2 ? Result1 : Result2;
|
||||
}
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Min comparison between 4 variables
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
|
||||
(
|
||||
vec<L, T, Q> const& x, U a,
|
||||
vec<L, T, Q> const& y, U b,
|
||||
vec<L, T, Q> const& z, U c,
|
||||
vec<L, T, Q> const& w, U d
|
||||
)
|
||||
{
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
{
|
||||
T Test1 = min(x[i], y[i]);
|
||||
T Test2 = min(z[i], w[i]);
|
||||
U Result1 = x[i] < y[i] ? a : b;
|
||||
U Result2 = z[i] < w[i] ? c : d;
|
||||
Result[i] = Test1 < Test2 ? Result1 : Result2;
|
||||
}
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Max comparison between 2 variables
|
||||
template<typename T, typename U>
|
||||
GLM_FUNC_QUALIFIER U associatedMax(T x, U a, T y, U b)
|
||||
{
|
||||
return x > y ? a : b;
|
||||
}
|
||||
|
||||
// Max comparison between 2 variables
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
|
||||
(
|
||||
vec<L, T, Q> const& x, vec<L, U, Q> const& a,
|
||||
vec<L, T, Q> const& y, vec<L, U, Q> const& b
|
||||
)
|
||||
{
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
Result[i] = x[i] > y[i] ? a[i] : b[i];
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Max comparison between 2 variables
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, T, Q> associatedMax
|
||||
(
|
||||
T x, vec<L, U, Q> const& a,
|
||||
T y, vec<L, U, Q> const& b
|
||||
)
|
||||
{
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
Result[i] = x > y ? a[i] : b[i];
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Max comparison between 2 variables
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
|
||||
(
|
||||
vec<L, T, Q> const& x, U a,
|
||||
vec<L, T, Q> const& y, U b
|
||||
)
|
||||
{
|
||||
vec<L, T, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
Result[i] = x[i] > y[i] ? a : b;
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Max comparison between 3 variables
|
||||
template<typename T, typename U>
|
||||
GLM_FUNC_QUALIFIER U associatedMax
|
||||
(
|
||||
T x, U a,
|
||||
T y, U b,
|
||||
T z, U c
|
||||
)
|
||||
{
|
||||
U Result = x > y ? (x > z ? a : c) : (y > z ? b : c);
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Max comparison between 3 variables
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
|
||||
(
|
||||
vec<L, T, Q> const& x, vec<L, U, Q> const& a,
|
||||
vec<L, T, Q> const& y, vec<L, U, Q> const& b,
|
||||
vec<L, T, Q> const& z, vec<L, U, Q> const& c
|
||||
)
|
||||
{
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
Result[i] = x[i] > y[i] ? (x[i] > z[i] ? a[i] : c[i]) : (y[i] > z[i] ? b[i] : c[i]);
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Max comparison between 3 variables
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, T, Q> associatedMax
|
||||
(
|
||||
T x, vec<L, U, Q> const& a,
|
||||
T y, vec<L, U, Q> const& b,
|
||||
T z, vec<L, U, Q> const& c
|
||||
)
|
||||
{
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
Result[i] = x > y ? (x > z ? a[i] : c[i]) : (y > z ? b[i] : c[i]);
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Max comparison between 3 variables
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
|
||||
(
|
||||
vec<L, T, Q> const& x, U a,
|
||||
vec<L, T, Q> const& y, U b,
|
||||
vec<L, T, Q> const& z, U c
|
||||
)
|
||||
{
|
||||
vec<L, T, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
Result[i] = x[i] > y[i] ? (x[i] > z[i] ? a : c) : (y[i] > z[i] ? b : c);
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Max comparison between 4 variables
|
||||
template<typename T, typename U>
|
||||
GLM_FUNC_QUALIFIER U associatedMax
|
||||
(
|
||||
T x, U a,
|
||||
T y, U b,
|
||||
T z, U c,
|
||||
T w, U d
|
||||
)
|
||||
{
|
||||
T Test1 = max(x, y);
|
||||
T Test2 = max(z, w);
|
||||
U Result1 = x > y ? a : b;
|
||||
U Result2 = z > w ? c : d;
|
||||
U Result = Test1 > Test2 ? Result1 : Result2;
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Max comparison between 4 variables
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
|
||||
(
|
||||
vec<L, T, Q> const& x, vec<L, U, Q> const& a,
|
||||
vec<L, T, Q> const& y, vec<L, U, Q> const& b,
|
||||
vec<L, T, Q> const& z, vec<L, U, Q> const& c,
|
||||
vec<L, T, Q> const& w, vec<L, U, Q> const& d
|
||||
)
|
||||
{
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
{
|
||||
T Test1 = max(x[i], y[i]);
|
||||
T Test2 = max(z[i], w[i]);
|
||||
U Result1 = x[i] > y[i] ? a[i] : b[i];
|
||||
U Result2 = z[i] > w[i] ? c[i] : d[i];
|
||||
Result[i] = Test1 > Test2 ? Result1 : Result2;
|
||||
}
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Max comparison between 4 variables
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
|
||||
(
|
||||
T x, vec<L, U, Q> const& a,
|
||||
T y, vec<L, U, Q> const& b,
|
||||
T z, vec<L, U, Q> const& c,
|
||||
T w, vec<L, U, Q> const& d
|
||||
)
|
||||
{
|
||||
T Test1 = max(x, y);
|
||||
T Test2 = max(z, w);
|
||||
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
{
|
||||
U Result1 = x > y ? a[i] : b[i];
|
||||
U Result2 = z > w ? c[i] : d[i];
|
||||
Result[i] = Test1 > Test2 ? Result1 : Result2;
|
||||
}
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Max comparison between 4 variables
|
||||
template<length_t L, typename T, typename U, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
|
||||
(
|
||||
vec<L, T, Q> const& x, U a,
|
||||
vec<L, T, Q> const& y, U b,
|
||||
vec<L, T, Q> const& z, U c,
|
||||
vec<L, T, Q> const& w, U d
|
||||
)
|
||||
{
|
||||
vec<L, U, Q> Result;
|
||||
for(length_t i = 0, n = Result.length(); i < n; ++i)
|
||||
{
|
||||
T Test1 = max(x[i], y[i]);
|
||||
T Test2 = max(z[i], w[i]);
|
||||
U Result1 = x[i] > y[i] ? a : b;
|
||||
U Result2 = z[i] > w[i] ? c : d;
|
||||
Result[i] = Test1 > Test2 ? Result1 : Result2;
|
||||
}
|
||||
return Result;
|
||||
}
|
||||
}//namespace glm
|
||||
Reference in New Issue
Block a user