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
61 lines
1.8 KiB
C++
61 lines
1.8 KiB
C++
/// @ref gtx_spline
|
|
|
|
namespace glm
|
|
{
|
|
template<typename genType>
|
|
GLM_FUNC_QUALIFIER genType catmullRom
|
|
(
|
|
genType const& v1,
|
|
genType const& v2,
|
|
genType const& v3,
|
|
genType const& v4,
|
|
typename genType::value_type const& s
|
|
)
|
|
{
|
|
typename genType::value_type s2 = pow2(s);
|
|
typename genType::value_type s3 = pow3(s);
|
|
|
|
typename genType::value_type f1 = -s3 + typename genType::value_type(2) * s2 - s;
|
|
typename genType::value_type f2 = typename genType::value_type(3) * s3 - typename genType::value_type(5) * s2 + typename genType::value_type(2);
|
|
typename genType::value_type f3 = typename genType::value_type(-3) * s3 + typename genType::value_type(4) * s2 + s;
|
|
typename genType::value_type f4 = s3 - s2;
|
|
|
|
return (f1 * v1 + f2 * v2 + f3 * v3 + f4 * v4) / typename genType::value_type(2);
|
|
|
|
}
|
|
|
|
template<typename genType>
|
|
GLM_FUNC_QUALIFIER genType hermite
|
|
(
|
|
genType const& v1,
|
|
genType const& t1,
|
|
genType const& v2,
|
|
genType const& t2,
|
|
typename genType::value_type const& s
|
|
)
|
|
{
|
|
typename genType::value_type s2 = pow2(s);
|
|
typename genType::value_type s3 = pow3(s);
|
|
|
|
typename genType::value_type f1 = typename genType::value_type(2) * s3 - typename genType::value_type(3) * s2 + typename genType::value_type(1);
|
|
typename genType::value_type f2 = typename genType::value_type(-2) * s3 + typename genType::value_type(3) * s2;
|
|
typename genType::value_type f3 = s3 - typename genType::value_type(2) * s2 + s;
|
|
typename genType::value_type f4 = s3 - s2;
|
|
|
|
return f1 * v1 + f2 * v2 + f3 * t1 + f4 * t2;
|
|
}
|
|
|
|
template<typename genType>
|
|
GLM_FUNC_QUALIFIER genType cubic
|
|
(
|
|
genType const& v1,
|
|
genType const& v2,
|
|
genType const& v3,
|
|
genType const& v4,
|
|
typename genType::value_type const& s
|
|
)
|
|
{
|
|
return ((v1 * s + v2) * s + v3) * s + v4;
|
|
}
|
|
}//namespace glm
|