mirror of
https://github.com/zhenyan121/Cubed.git
synced 2026-08-09 02:07:04 +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
59 lines
1.7 KiB
C++
59 lines
1.7 KiB
C++
/// @ref gtx_rotate_normalized_axis
|
|
|
|
namespace glm
|
|
{
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER mat<4, 4, T, Q> rotateNormalizedAxis
|
|
(
|
|
mat<4, 4, T, Q> const& m,
|
|
T const& angle,
|
|
vec<3, T, Q> const& v
|
|
)
|
|
{
|
|
T const a = angle;
|
|
T const c = cos(a);
|
|
T const s = sin(a);
|
|
|
|
vec<3, T, Q> const axis(v);
|
|
|
|
vec<3, T, Q> const temp((static_cast<T>(1) - c) * axis);
|
|
|
|
mat<4, 4, T, Q> Rotate;
|
|
Rotate[0][0] = c + temp[0] * axis[0];
|
|
Rotate[0][1] = 0 + temp[0] * axis[1] + s * axis[2];
|
|
Rotate[0][2] = 0 + temp[0] * axis[2] - s * axis[1];
|
|
|
|
Rotate[1][0] = 0 + temp[1] * axis[0] - s * axis[2];
|
|
Rotate[1][1] = c + temp[1] * axis[1];
|
|
Rotate[1][2] = 0 + temp[1] * axis[2] + s * axis[0];
|
|
|
|
Rotate[2][0] = 0 + temp[2] * axis[0] + s * axis[1];
|
|
Rotate[2][1] = 0 + temp[2] * axis[1] - s * axis[0];
|
|
Rotate[2][2] = c + temp[2] * axis[2];
|
|
|
|
mat<4, 4, T, Q> Result;
|
|
Result[0] = m[0] * Rotate[0][0] + m[1] * Rotate[0][1] + m[2] * Rotate[0][2];
|
|
Result[1] = m[0] * Rotate[1][0] + m[1] * Rotate[1][1] + m[2] * Rotate[1][2];
|
|
Result[2] = m[0] * Rotate[2][0] + m[1] * Rotate[2][1] + m[2] * Rotate[2][2];
|
|
Result[3] = m[3];
|
|
return Result;
|
|
}
|
|
|
|
template<typename T, qualifier Q>
|
|
GLM_FUNC_QUALIFIER qua<T, Q> rotateNormalizedAxis
|
|
(
|
|
qua<T, Q> const& q,
|
|
T const& angle,
|
|
vec<3, T, Q> const& v
|
|
)
|
|
{
|
|
vec<3, T, Q> const Tmp(v);
|
|
|
|
T const AngleRad(angle);
|
|
T const Sin = sin(AngleRad * T(0.5));
|
|
|
|
return q * qua<T, Q>::wxyz(cos(AngleRad * static_cast<T>(0.5)), Tmp.x * Sin, Tmp.y * Sin, Tmp.z * Sin);
|
|
//return gtc::quaternion::cross(q, tquat<T, Q>(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin));
|
|
}
|
|
}//namespace glm
|