Introduce Rectf::grown(Vector) for growing rectangle by different amounts in X and Y direction / use method in Climbable

Author: tobbi

src/math/rectf.hpp

@@ -147,6 +147,11 @@ class Rectf final
     return glm::distance(v1, v2);
   }
 
+  /**
+   * Returns a new Rectf that is grown / shrunk by the specified amount
+   * @param border The amount of pixels that the Rectangle should be
+   * grown (for positive values) or shrunk (for negative values)
+   */
   Rectf grown(float border) const
   {
     // If the size would be shrunk below 0, do not resize.
@@ -157,6 +162,22 @@ class Rectf final
                  get_right() + border, get_bottom() + border);
   }
 
+  /**
+   * Returns a new Rectf instance that is grown / shrunk by the amounts specified by the vector.
+   * 
+   * @param border The passed vector contains the horizontal amount as first component and the vertical amount
+   * as the second component.
+   */
+  Rectf grown(Vector border) const
+  {
+    // If the size would be shrunk below 0, do not resize.
+    if (m_size.width + border.x * 2 < 0.f || m_size.height + border.y * 2 < 0.f)
+      return *this;
+
+    return Rectf(m_p1.x - border.x, m_p1.y - border.y,
+                 get_right() + border.x, get_bottom() + border.y);
+  }
+
   // leave these two public to save the headaches of set/get functions for such
   // simple things :)
 

src/trigger/climbable.cpp

@@ -84,11 +84,16 @@ Climbable::update(float dt_sec)
   {
     if (it2->m_activate_try_timer->started())
     {
+      auto bbox_with_grace = m_col.m_bbox.grown(Vector(GRACE_DX, GRACE_DY));
       // The "-20" to y velocity prevents Tux from walking in place on the ground for horizonal adjustments.
-      if (it2->m_player->get_bbox().get_left() < m_col.m_bbox.get_left() - GRACE_DX) it2->m_player->add_velocity(Vector(POSITION_FIX_AX,-20));
-      if (it2->m_player->get_bbox().get_right() > m_col.m_bbox.get_right() + GRACE_DX) it2->m_player->add_velocity(Vector(-POSITION_FIX_AX,-20));
-      if (it2->m_player->get_bbox().get_top() < m_col.m_bbox.get_top() - GRACE_DY) it2->m_player->add_velocity(Vector(0,POSITION_FIX_AY));
-      if (it2->m_player->get_bbox().get_bottom() > m_col.m_bbox.get_bottom() + GRACE_DY) it2->m_player->add_velocity(Vector(0,-POSITION_FIX_AY));
+      if (it2->m_player->get_bbox().get_left() < bbox_with_grace.get_left())
+        it2->m_player->add_velocity(Vector(POSITION_FIX_AX, -20));
+      if (it2->m_player->get_bbox().get_right() > bbox_with_grace.get_right())
+        it2->m_player->add_velocity(Vector(-POSITION_FIX_AX, -20));
+      if (it2->m_player->get_bbox().get_top() < bbox_with_grace.get_top())
+        it2->m_player->add_velocity(Vector(0, POSITION_FIX_AY));
+      if (it2->m_player->get_bbox().get_bottom() > bbox_with_grace.get_bottom())
+        it2->m_player->add_velocity(Vector(0, -POSITION_FIX_AY));
     }
     if (may_climb(*(it2->m_player)))
     {