orange/omath
1
0
Fork 0
mirror of https://github.com/orange-cpp/omath.git synced 2026-06-08 16:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed arm

Browse Source
This commit is contained in:
Orange
2026-05-18 10:28:07 +03:00
parent 2130d02090
commit 36a7865b29
2 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/lua/lua_collision.cpp
+21 -4
View File
@@ -25,6 +25,20 @@ namespace
using Aabbf = omath::primitives::Aabb<float>; using Aabbf = omath::primitives::Aabb<float>;
using Obbf = omath::primitives::Obb<float>; using Obbf = omath::primitives::Obb<float>;
template<class Object, class Value>
auto lua_field(Value Object::* member)
{
return sol::property(
[member](const Object& object) -> const Value&
{
return object.*member;
},
[member](Object& object, const Value& value)
{
object.*member = value;
});
}
class LuaConvexCollider final : public omath::collision::ColliderInterface<Vec3f> class LuaConvexCollider final : public omath::collision::ColliderInterface<Vec3f>
{ {
public: public:
@@ -158,7 +172,8 @@ namespace omath::lua
sol::factories([]() { return Aabbf{}; }, sol::factories([]() { return Aabbf{}; },
[](const Vec3f& min, const Vec3f& max) { return Aabbf{min, max}; }), [](const Vec3f& min, const Vec3f& max) { return Aabbf{min, max}; }),
"min", &Aabbf::min, "max", &Aabbf::max, "center", &Aabbf::center, "extents", &Aabbf::extents, "min", lua_field(&Aabbf::min), "max", lua_field(&Aabbf::max), "center", &Aabbf::center, "extents",
&Aabbf::extents,
"top", "top",
[](const Aabbf& aabb, sol::optional<omath::primitives::UpAxis> axis) [](const Aabbf& aabb, sol::optional<omath::primitives::UpAxis> axis)
{ {
@@ -193,8 +208,9 @@ namespace omath::lua
return Obbf{center, axis_x, axis_y, axis_z, half_extents}; return Obbf{center, axis_x, axis_y, axis_z, half_extents};
}), }),
"center", &Obbf::center, "axis_x", &Obbf::axis_x, "axis_y", &Obbf::axis_y, "axis_z", &Obbf::axis_z, "center", lua_field(&Obbf::center), "axis_x", lua_field(&Obbf::axis_x), "axis_y",
"half_extents", &Obbf::half_extents, lua_field(&Obbf::axis_y), "axis_z", lua_field(&Obbf::axis_z), "half_extents",
lua_field(&Obbf::half_extents),
"vertices", "vertices",
[](const Obbf& obb, sol::this_state state) [](const Obbf& obb, sol::this_state state)
{ {
@@ -213,7 +229,8 @@ namespace omath::lua
[](const Vec3f& start, const Vec3f& end, const bool infinite_length) [](const Vec3f& start, const Vec3f& end, const bool infinite_length)
{ return Ray3f{start, end, infinite_length}; }), { return Ray3f{start, end, infinite_length}; }),
"start", &Ray3f::start, "end", &Ray3f::end, "infinite_length", &Ray3f::infinite_length, "start", lua_field(&Ray3f::start), "end", lua_field(&Ray3f::end), "infinite_length",
lua_field(&Ray3f::infinite_length),
"direction_vector", &Ray3f::direction_vector, "direction_vector_normalized", "direction_vector", &Ray3f::direction_vector, "direction_vector_normalized",
&Ray3f::direction_vector_normalized); &Ray3f::direction_vector_normalized);
source/lua/lua_hud.cpp
+18 -4
View File
@@ -179,6 +179,20 @@ namespace
} }
return result; return result;
} }
template<class Object, class Value>
auto lua_field(Value Object::* member)
{
return sol::property(
[member](const Object& object) -> const Value&
{
return object.*member;
},
[member](Object& object, const Value& value)
{
object.*member = value;
});
}
} // namespace } // namespace
namespace omath::lua namespace omath::lua
@@ -194,10 +208,10 @@ namespace omath::lua
[](const omath::Vector2<float>& top, const omath::Vector2<float>& bottom, [](const omath::Vector2<float>& top, const omath::Vector2<float>& bottom,
const float ratio) { return omath::hud::CanvasBox(top, bottom, ratio); }), const float ratio) { return omath::hud::CanvasBox(top, bottom, ratio); }),
"top_left_corner", &omath::hud::CanvasBox::top_left_corner, "top_right_corner", "top_left_corner", lua_field(&omath::hud::CanvasBox::top_left_corner), "top_right_corner",
&omath::hud::CanvasBox::top_right_corner, "bottom_left_corner", lua_field(&omath::hud::CanvasBox::top_right_corner), "bottom_left_corner",
&omath::hud::CanvasBox::bottom_left_corner, "bottom_right_corner", lua_field(&omath::hud::CanvasBox::bottom_left_corner), "bottom_right_corner",
&omath::hud::CanvasBox::bottom_right_corner, lua_field(&omath::hud::CanvasBox::bottom_right_corner),
"as_table", "as_table",
[](const omath::hud::CanvasBox& box, sol::this_state s) -> sol::table [](const omath::hud::CanvasBox& box, sol::this_state s) -> sol::table