mirror of
https://github.com/zhenyan121/Cubed.git
synced 2026-08-08 17:57:02 +08:00
* 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
176 lines
5.6 KiB
C++
176 lines
5.6 KiB
C++
/// @ref gtx_hash
|
|
|
|
namespace glm {
|
|
namespace detail
|
|
{
|
|
GLM_INLINE void hash_combine(size_t &seed, size_t hash)
|
|
{
|
|
hash += 0x9e3779b9 + (seed << 6) + (seed >> 2);
|
|
seed ^= hash;
|
|
}
|
|
}}
|
|
|
|
namespace std
|
|
{
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::vec<1, T, Q> >::operator()(glm::vec<1, T, Q> const& v) const GLM_NOEXCEPT
|
|
{
|
|
hash<T> hasher;
|
|
return hasher(v.x);
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::vec<2, T, Q> >::operator()(glm::vec<2, T, Q> const& v) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<T> hasher;
|
|
glm::detail::hash_combine(seed, hasher(v.x));
|
|
glm::detail::hash_combine(seed, hasher(v.y));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::vec<3, T, Q> >::operator()(glm::vec<3, T, Q> const& v) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<T> hasher;
|
|
glm::detail::hash_combine(seed, hasher(v.x));
|
|
glm::detail::hash_combine(seed, hasher(v.y));
|
|
glm::detail::hash_combine(seed, hasher(v.z));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::vec<4, T, Q> >::operator()(glm::vec<4, T, Q> const& v) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<T> hasher;
|
|
glm::detail::hash_combine(seed, hasher(v.x));
|
|
glm::detail::hash_combine(seed, hasher(v.y));
|
|
glm::detail::hash_combine(seed, hasher(v.z));
|
|
glm::detail::hash_combine(seed, hasher(v.w));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::qua<T, Q> >::operator()(glm::qua<T,Q> const& q) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<T> hasher;
|
|
glm::detail::hash_combine(seed, hasher(q.x));
|
|
glm::detail::hash_combine(seed, hasher(q.y));
|
|
glm::detail::hash_combine(seed, hasher(q.z));
|
|
glm::detail::hash_combine(seed, hasher(q.w));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::tdualquat<T, Q> >::operator()(glm::tdualquat<T, Q> const& q) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<glm::qua<T, Q> > hasher;
|
|
glm::detail::hash_combine(seed, hasher(q.real));
|
|
glm::detail::hash_combine(seed, hasher(q.dual));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::mat<2, 2, T, Q> >::operator()(glm::mat<2, 2, T, Q> const& m) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<glm::vec<2, T, Q> > hasher;
|
|
glm::detail::hash_combine(seed, hasher(m[0]));
|
|
glm::detail::hash_combine(seed, hasher(m[1]));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::mat<2, 3, T, Q> >::operator()(glm::mat<2, 3, T, Q> const& m) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<glm::vec<3, T, Q> > hasher;
|
|
glm::detail::hash_combine(seed, hasher(m[0]));
|
|
glm::detail::hash_combine(seed, hasher(m[1]));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::mat<2, 4, T, Q> >::operator()(glm::mat<2, 4, T, Q> const& m) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<glm::vec<4, T, Q> > hasher;
|
|
glm::detail::hash_combine(seed, hasher(m[0]));
|
|
glm::detail::hash_combine(seed, hasher(m[1]));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::mat<3, 2, T, Q> >::operator()(glm::mat<3, 2, T, Q> const& m) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<glm::vec<2, T, Q> > hasher;
|
|
glm::detail::hash_combine(seed, hasher(m[0]));
|
|
glm::detail::hash_combine(seed, hasher(m[1]));
|
|
glm::detail::hash_combine(seed, hasher(m[2]));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::mat<3, 3, T, Q> >::operator()(glm::mat<3, 3, T, Q> const& m) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<glm::vec<3, T, Q> > hasher;
|
|
glm::detail::hash_combine(seed, hasher(m[0]));
|
|
glm::detail::hash_combine(seed, hasher(m[1]));
|
|
glm::detail::hash_combine(seed, hasher(m[2]));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::mat<3, 4, T, Q> >::operator()(glm::mat<3, 4, T, Q> const& m) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<glm::vec<4, T, Q> > hasher;
|
|
glm::detail::hash_combine(seed, hasher(m[0]));
|
|
glm::detail::hash_combine(seed, hasher(m[1]));
|
|
glm::detail::hash_combine(seed, hasher(m[2]));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::mat<4, 2, T,Q> >::operator()(glm::mat<4, 2, T,Q> const& m) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<glm::vec<2, T, Q> > hasher;
|
|
glm::detail::hash_combine(seed, hasher(m[0]));
|
|
glm::detail::hash_combine(seed, hasher(m[1]));
|
|
glm::detail::hash_combine(seed, hasher(m[2]));
|
|
glm::detail::hash_combine(seed, hasher(m[3]));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::mat<4, 3, T,Q> >::operator()(glm::mat<4, 3, T,Q> const& m) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<glm::vec<3, T, Q> > hasher;
|
|
glm::detail::hash_combine(seed, hasher(m[0]));
|
|
glm::detail::hash_combine(seed, hasher(m[1]));
|
|
glm::detail::hash_combine(seed, hasher(m[2]));
|
|
glm::detail::hash_combine(seed, hasher(m[3]));
|
|
return seed;
|
|
}
|
|
|
|
template<typename T, glm::qualifier Q>
|
|
GLM_FUNC_QUALIFIER size_t hash<glm::mat<4, 4, T,Q> >::operator()(glm::mat<4, 4, T, Q> const& m) const GLM_NOEXCEPT
|
|
{
|
|
size_t seed = 0;
|
|
hash<glm::vec<4, T, Q> > hasher;
|
|
glm::detail::hash_combine(seed, hasher(m[0]));
|
|
glm::detail::hash_combine(seed, hasher(m[1]));
|
|
glm::detail::hash_combine(seed, hasher(m[2]));
|
|
glm::detail::hash_combine(seed, hasher(m[3]));
|
|
return seed;
|
|
}
|
|
}
|