X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=plugins%2Fentity%2Fdoom3group.cpp;h=bab1bbe813010bee85dc0910b613653bb749773e;hb=074614f03092ddf3ddaae4d945f4570a4435130d;hp=b53017c55d59b05c734714305da1d11b113ab9a1;hpb=2d8381a1be1e00bfcc0bad5b53371875f8dd4956;p=xonotic%2Fnetradiant.git diff --git a/plugins/entity/doom3group.cpp b/plugins/entity/doom3group.cpp index b53017c5..bab1bbe8 100644 --- a/plugins/entity/doom3group.cpp +++ b/plugins/entity/doom3group.cpp @@ -423,17 +423,6 @@ void transformChanged(){ typedef MemberCaller TransformChangedCaller; }; -class ControlPointAddBounds -{ -AABB& m_bounds; -public: -ControlPointAddBounds( AABB& bounds ) : m_bounds( bounds ){ -} -void operator()( const Vector3& point ) const { - aabb_extend_by_point_safe( m_bounds, point ); -} -}; - class Doom3GroupInstance : public TargetableInstance, public TransformModifier, @@ -555,8 +544,12 @@ void transformComponents( const Matrix4& matrix ){ const AABB& getSelectedComponentsBounds() const { m_aabb_component = AABB(); - m_curveNURBS.forEachSelected( ControlPointAddBounds( m_aabb_component ) ); - m_curveCatmullRom.forEachSelected( ControlPointAddBounds( m_aabb_component ) ); + m_curveNURBS.forEachSelected([&](const Vector3 &point) { + aabb_extend_by_point_safe(m_aabb_component, point); + }); + m_curveCatmullRom.forEachSelected([&](const Vector3 &point) { + aabb_extend_by_point_safe(m_aabb_component, point); + }); return m_aabb_component; }