mirror of
https://github.com/zhenyan121/Cubed.git
synced 2026-08-08 17:57:02 +08:00
def311c7dd
* 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
167 lines
3.7 KiB
C++
167 lines
3.7 KiB
C++
/// @ref gtx_matrix_major_storage
|
|
|
|
namespace glm
|
|
{
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<2, 2, T, Q> rowMajor2
|
|
(
|
|
vec<2, T, Q> const& v1,
|
|
vec<2, T, Q> const& v2
|
|
)
|
|
{
|
|
mat<2, 2, T, Q> Result;
|
|
Result[0][0] = v1.x;
|
|
Result[1][0] = v1.y;
|
|
Result[0][1] = v2.x;
|
|
Result[1][1] = v2.y;
|
|
return Result;
|
|
}
|
|
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<2, 2, T, Q> rowMajor2(
|
|
const mat<2, 2, T, Q>& m)
|
|
{
|
|
mat<2, 2, T, Q> Result;
|
|
Result[0][0] = m[0][0];
|
|
Result[0][1] = m[1][0];
|
|
Result[1][0] = m[0][1];
|
|
Result[1][1] = m[1][1];
|
|
return Result;
|
|
}
|
|
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<3, 3, T, Q> rowMajor3(
|
|
const vec<3, T, Q>& v1,
|
|
const vec<3, T, Q>& v2,
|
|
const vec<3, T, Q>& v3)
|
|
{
|
|
mat<3, 3, T, Q> Result;
|
|
Result[0][0] = v1.x;
|
|
Result[1][0] = v1.y;
|
|
Result[2][0] = v1.z;
|
|
Result[0][1] = v2.x;
|
|
Result[1][1] = v2.y;
|
|
Result[2][1] = v2.z;
|
|
Result[0][2] = v3.x;
|
|
Result[1][2] = v3.y;
|
|
Result[2][2] = v3.z;
|
|
return Result;
|
|
}
|
|
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<3, 3, T, Q> rowMajor3(
|
|
const mat<3, 3, T, Q>& m)
|
|
{
|
|
mat<3, 3, T, Q> Result;
|
|
Result[0][0] = m[0][0];
|
|
Result[0][1] = m[1][0];
|
|
Result[0][2] = m[2][0];
|
|
Result[1][0] = m[0][1];
|
|
Result[1][1] = m[1][1];
|
|
Result[1][2] = m[2][1];
|
|
Result[2][0] = m[0][2];
|
|
Result[2][1] = m[1][2];
|
|
Result[2][2] = m[2][2];
|
|
return Result;
|
|
}
|
|
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<4, 4, T, Q> rowMajor4(
|
|
const vec<4, T, Q>& v1,
|
|
const vec<4, T, Q>& v2,
|
|
const vec<4, T, Q>& v3,
|
|
const vec<4, T, Q>& v4)
|
|
{
|
|
mat<4, 4, T, Q> Result;
|
|
Result[0][0] = v1.x;
|
|
Result[1][0] = v1.y;
|
|
Result[2][0] = v1.z;
|
|
Result[3][0] = v1.w;
|
|
Result[0][1] = v2.x;
|
|
Result[1][1] = v2.y;
|
|
Result[2][1] = v2.z;
|
|
Result[3][1] = v2.w;
|
|
Result[0][2] = v3.x;
|
|
Result[1][2] = v3.y;
|
|
Result[2][2] = v3.z;
|
|
Result[3][2] = v3.w;
|
|
Result[0][3] = v4.x;
|
|
Result[1][3] = v4.y;
|
|
Result[2][3] = v4.z;
|
|
Result[3][3] = v4.w;
|
|
return Result;
|
|
}
|
|
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<4, 4, T, Q> rowMajor4(
|
|
const mat<4, 4, T, Q>& m)
|
|
{
|
|
mat<4, 4, T, Q> Result;
|
|
Result[0][0] = m[0][0];
|
|
Result[0][1] = m[1][0];
|
|
Result[0][2] = m[2][0];
|
|
Result[0][3] = m[3][0];
|
|
Result[1][0] = m[0][1];
|
|
Result[1][1] = m[1][1];
|
|
Result[1][2] = m[2][1];
|
|
Result[1][3] = m[3][1];
|
|
Result[2][0] = m[0][2];
|
|
Result[2][1] = m[1][2];
|
|
Result[2][2] = m[2][2];
|
|
Result[2][3] = m[3][2];
|
|
Result[3][0] = m[0][3];
|
|
Result[3][1] = m[1][3];
|
|
Result[3][2] = m[2][3];
|
|
Result[3][3] = m[3][3];
|
|
return Result;
|
|
}
|
|
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<2, 2, T, Q> colMajor2(
|
|
const vec<2, T, Q>& v1,
|
|
const vec<2, T, Q>& v2)
|
|
{
|
|
return mat<2, 2, T, Q>(v1, v2);
|
|
}
|
|
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<2, 2, T, Q> colMajor2(
|
|
const mat<2, 2, T, Q>& m)
|
|
{
|
|
return mat<2, 2, T, Q>(m);
|
|
}
|
|
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<3, 3, T, Q> colMajor3(
|
|
const vec<3, T, Q>& v1,
|
|
const vec<3, T, Q>& v2,
|
|
const vec<3, T, Q>& v3)
|
|
{
|
|
return mat<3, 3, T, Q>(v1, v2, v3);
|
|
}
|
|
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<3, 3, T, Q> colMajor3(
|
|
const mat<3, 3, T, Q>& m)
|
|
{
|
|
return mat<3, 3, T, Q>(m);
|
|
}
|
|
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<4, 4, T, Q> colMajor4(
|
|
const vec<4, T, Q>& v1,
|
|
const vec<4, T, Q>& v2,
|
|
const vec<4, T, Q>& v3,
|
|
const vec<4, T, Q>& v4)
|
|
{
|
|
return mat<4, 4, T, Q>(v1, v2, v3, v4);
|
|
}
|
|
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<4, 4, T, Q> colMajor4(
|
|
const mat<4, 4, T, Q>& m)
|
|
{
|
|
return mat<4, 4, T, Q>(m);
|
|
}
|
|
}//namespace glm
|